* [PATCH] agp/intel: Move intel_fake_agp_sizes into #ifdef block
@ 2017-01-21 18:22 Chris Wilson
2017-01-21 18:54 ` ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Chris Wilson @ 2017-01-21 18:22 UTC (permalink / raw)
To: intel-gfx
Move the intel_fake_agp_sizes array into the same #ifdef block as it is
used to avoid instantiation when not used, and so triggering a compiler
warning
drivers/char/agp/intel-gtt.c:335:42: warning: ‘intel_fake_agp_sizes’
defined but not used [-Wunused-const-variable=]
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/char/agp/intel-gtt.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 9702c78f458d..7fcc2a9d1d5a 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -332,14 +332,6 @@ static void i810_write_entry(dma_addr_t addr, unsigned int entry,
writel_relaxed(addr | pte_flags, intel_private.gtt + entry);
}
-static const struct aper_size_info_fixed intel_fake_agp_sizes[] = {
- {32, 8192, 3},
- {64, 16384, 4},
- {128, 32768, 5},
- {256, 65536, 6},
- {512, 131072, 7},
-};
-
static unsigned int intel_gtt_stolen_size(void)
{
u16 gmch_ctrl;
@@ -670,6 +662,14 @@ static int intel_gtt_init(void)
}
#if IS_ENABLED(CONFIG_AGP_INTEL)
+static const struct aper_size_info_fixed intel_fake_agp_sizes[] = {
+ {32, 8192, 3},
+ {64, 16384, 4},
+ {128, 32768, 5},
+ {256, 65536, 6},
+ {512, 131072, 7},
+};
+
static int intel_fake_agp_fetch_size(void)
{
int num_sizes = ARRAY_SIZE(intel_fake_agp_sizes);
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* ✓ Fi.CI.BAT: success for agp/intel: Move intel_fake_agp_sizes into #ifdef block
2017-01-21 18:22 [PATCH] agp/intel: Move intel_fake_agp_sizes into #ifdef block Chris Wilson
@ 2017-01-21 18:54 ` Patchwork
2017-01-23 7:39 ` [PATCH] " Jani Nikula
2017-01-23 8:06 ` Joonas Lahtinen
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2017-01-21 18:54 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: agp/intel: Move intel_fake_agp_sizes into #ifdef block
URL : https://patchwork.freedesktop.org/series/18357/
State : success
== Summary ==
Series 18357v1 agp/intel: Move intel_fake_agp_sizes into #ifdef block
https://patchwork.freedesktop.org/api/1.0/series/18357/revisions/1/mbox/
Test kms_force_connector_basic:
Subgroup prune-stale-modes:
dmesg-warn -> PASS (fi-snb-2520m)
fi-bdw-5557u total:246 pass:232 dwarn:0 dfail:0 fail:0 skip:14
fi-bsw-n3050 total:246 pass:207 dwarn:0 dfail:0 fail:0 skip:39
fi-bxt-j4205 total:246 pass:224 dwarn:0 dfail:0 fail:0 skip:22
fi-bxt-t5700 total:79 pass:66 dwarn:0 dfail:0 fail:0 skip:12
fi-byt-j1900 total:246 pass:219 dwarn:0 dfail:0 fail:0 skip:27
fi-byt-n2820 total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31
fi-hsw-4770 total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19
fi-hsw-4770r total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19
fi-ivb-3520m total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21
fi-ivb-3770 total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21
fi-kbl-7500u total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21
fi-skl-6260u total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13
fi-skl-6700hq total:246 pass:226 dwarn:0 dfail:0 fail:0 skip:20
fi-skl-6700k total:246 pass:222 dwarn:3 dfail:0 fail:0 skip:21
fi-skl-6770hq total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13
fi-snb-2520m total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31
fi-snb-2600 total:246 pass:214 dwarn:0 dfail:0 fail:0 skip:32
f62d6104306f3ec835f3776434a70ca9bb6f820e drm-tip: 2017y-01m-21d-11h-28m-52s UTC integration manifest
c30d3f2 agp/intel: Move intel_fake_agp_sizes into #ifdef block
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3574/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] agp/intel: Move intel_fake_agp_sizes into #ifdef block
2017-01-21 18:22 [PATCH] agp/intel: Move intel_fake_agp_sizes into #ifdef block Chris Wilson
2017-01-21 18:54 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2017-01-23 7:39 ` Jani Nikula
2017-01-23 8:06 ` Joonas Lahtinen
2 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2017-01-23 7:39 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On Sat, 21 Jan 2017, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Move the intel_fake_agp_sizes array into the same #ifdef block as it is
> used to avoid instantiation when not used, and so triggering a compiler
> warning
>
> drivers/char/agp/intel-gtt.c:335:42: warning: ‘intel_fake_agp_sizes’
> defined but not used [-Wunused-const-variable=]
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/char/agp/intel-gtt.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
> index 9702c78f458d..7fcc2a9d1d5a 100644
> --- a/drivers/char/agp/intel-gtt.c
> +++ b/drivers/char/agp/intel-gtt.c
> @@ -332,14 +332,6 @@ static void i810_write_entry(dma_addr_t addr, unsigned int entry,
> writel_relaxed(addr | pte_flags, intel_private.gtt + entry);
> }
>
> -static const struct aper_size_info_fixed intel_fake_agp_sizes[] = {
> - {32, 8192, 3},
> - {64, 16384, 4},
> - {128, 32768, 5},
> - {256, 65536, 6},
> - {512, 131072, 7},
> -};
> -
> static unsigned int intel_gtt_stolen_size(void)
> {
> u16 gmch_ctrl;
> @@ -670,6 +662,14 @@ static int intel_gtt_init(void)
> }
>
> #if IS_ENABLED(CONFIG_AGP_INTEL)
> +static const struct aper_size_info_fixed intel_fake_agp_sizes[] = {
> + {32, 8192, 3},
> + {64, 16384, 4},
> + {128, 32768, 5},
> + {256, 65536, 6},
> + {512, 131072, 7},
> +};
> +
> static int intel_fake_agp_fetch_size(void)
> {
> int num_sizes = ARRAY_SIZE(intel_fake_agp_sizes);
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] agp/intel: Move intel_fake_agp_sizes into #ifdef block
2017-01-21 18:22 [PATCH] agp/intel: Move intel_fake_agp_sizes into #ifdef block Chris Wilson
2017-01-21 18:54 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-01-23 7:39 ` [PATCH] " Jani Nikula
@ 2017-01-23 8:06 ` Joonas Lahtinen
2017-01-23 9:18 ` Chris Wilson
2 siblings, 1 reply; 5+ messages in thread
From: Joonas Lahtinen @ 2017-01-23 8:06 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On la, 2017-01-21 at 18:22 +0000, Chris Wilson wrote:
> Move the intel_fake_agp_sizes array into the same #ifdef block as it is
> used to avoid instantiation when not used, and so triggering a compiler
> warning
>
> drivers/char/agp/intel-gtt.c:335:42: warning: ‘intel_fake_agp_sizes’
> defined but not used [-Wunused-const-variable=]
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Regards, Joonas
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] agp/intel: Move intel_fake_agp_sizes into #ifdef block
2017-01-23 8:06 ` Joonas Lahtinen
@ 2017-01-23 9:18 ` Chris Wilson
0 siblings, 0 replies; 5+ messages in thread
From: Chris Wilson @ 2017-01-23 9:18 UTC (permalink / raw)
To: Joonas Lahtinen; +Cc: intel-gfx
On Mon, Jan 23, 2017 at 10:06:15AM +0200, Joonas Lahtinen wrote:
> On la, 2017-01-21 at 18:22 +0000, Chris Wilson wrote:
> > Move the intel_fake_agp_sizes array into the same #ifdef block as it is
> > used to avoid instantiation when not used, and so triggering a compiler
> > warning
> >
> > drivers/char/agp/intel-gtt.c:335:42: warning: ‘intel_fake_agp_sizes’
> > defined but not used [-Wunused-const-variable=]
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>
> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Applied, thanks for the review.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-01-23 9:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-21 18:22 [PATCH] agp/intel: Move intel_fake_agp_sizes into #ifdef block Chris Wilson
2017-01-21 18:54 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-01-23 7:39 ` [PATCH] " Jani Nikula
2017-01-23 8:06 ` Joonas Lahtinen
2017-01-23 9:18 ` Chris Wilson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.