* [PATCH] drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI
@ 2016-04-08 14:59 Jani Nikula
2016-04-08 15:55 ` ✗ Fi.CI.BAT: failure for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jani Nikula @ 2016-04-08 14:59 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
The whole file is ignored on CONFIG_ACPI=n.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_opregion.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index c15718b4862a..d5a4cb80273e 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -246,7 +246,6 @@ struct opregion_asle_ext {
#define MAX_DSLP 1500
-#ifdef CONFIG_ACPI
static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out)
{
struct drm_i915_private *dev_priv = dev->dev_private;
@@ -905,9 +904,6 @@ static void swsci_setup(struct drm_device *dev)
opregion->swsci_gbda_sub_functions,
opregion->swsci_sbcb_sub_functions);
}
-#else /* CONFIG_ACPI */
-static inline void swsci_setup(struct drm_device *dev) {}
-#endif /* CONFIG_ACPI */
static int intel_no_opregion_vbt_callback(const struct dmi_system_id *id)
{
@@ -950,9 +946,7 @@ int intel_opregion_setup(struct drm_device *dev)
return -ENOTSUPP;
}
-#ifdef CONFIG_ACPI
INIT_WORK(&opregion->asle_work, asle_work);
-#endif
base = memremap(asls, OPREGION_SIZE, MEMREMAP_WB);
if (!base)
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* ✗ Fi.CI.BAT: failure for drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI
2016-04-08 14:59 [PATCH] drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI Jani Nikula
@ 2016-04-08 15:55 ` Patchwork
2016-04-12 10:33 ` [PATCH] " Ander Conselvan De Oliveira
2016-04-12 10:36 ` Chris Wilson
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2016-04-08 15:55 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI
URL : https://patchwork.freedesktop.org/series/5462/
State : failure
== Summary ==
Series 5462v1 drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI
http://patchwork.freedesktop.org/api/1.0/series/5462/revisions/1/mbox/
Test gem_exec_basic:
Subgroup basic-bsd:
dmesg-warn -> PASS (bsw-nuc-2)
Test gem_exec_suspend:
Subgroup basic-s3:
dmesg-warn -> PASS (bsw-nuc-2)
Test gem_sync:
Subgroup basic-bsd:
dmesg-warn -> PASS (bsw-nuc-2)
Test kms_flip:
Subgroup basic-flip-vs-dpms:
pass -> DMESG-WARN (ilk-hp8440p) UNSTABLE
Test pm_rpm:
Subgroup basic-rte:
dmesg-warn -> PASS (bsw-nuc-2)
bdw-nuci7 total:196 pass:184 dwarn:0 dfail:0 fail:0 skip:12
bdw-ultra total:196 pass:175 dwarn:0 dfail:0 fail:0 skip:21
bsw-nuc-2 total:196 pass:159 dwarn:0 dfail:0 fail:0 skip:37
byt-nuc total:196 pass:161 dwarn:0 dfail:0 fail:0 skip:35
hsw-brixbox total:196 pass:174 dwarn:0 dfail:0 fail:0 skip:22
ilk-hp8440p total:196 pass:131 dwarn:1 dfail:0 fail:0 skip:64
ivb-t430s total:196 pass:171 dwarn:0 dfail:0 fail:0 skip:25
skl-i7k-2 total:196 pass:173 dwarn:0 dfail:0 fail:0 skip:23
skl-nuci5 total:196 pass:185 dwarn:0 dfail:0 fail:0 skip:11
snb-dellxps total:196 pass:162 dwarn:0 dfail:0 fail:0 skip:34
snb-x220t total:196 pass:162 dwarn:0 dfail:0 fail:1 skip:33
BOOT FAILED for hsw-gt2
Results at /archive/results/CI_IGT_test/Patchwork_1847/
949884a57b51aa158e3ae9afe1f08130cdb7a3ef drm-intel-nightly: 2016y-04m-08d-10h-45m-28s UTC integration manifest
0b3264d006064f3bf9705fac57204494b3a9c980 drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI
2016-04-08 14:59 [PATCH] drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI Jani Nikula
2016-04-08 15:55 ` ✗ Fi.CI.BAT: failure for " Patchwork
@ 2016-04-12 10:33 ` Ander Conselvan De Oliveira
2016-04-12 10:36 ` Chris Wilson
2 siblings, 0 replies; 6+ messages in thread
From: Ander Conselvan De Oliveira @ 2016-04-12 10:33 UTC (permalink / raw)
To: Jani Nikula, intel-gfx
On Fri, 2016-04-08 at 17:59 +0300, Jani Nikula wrote:
> The whole file is ignored on CONFIG_ACPI=n.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
> ---
> drivers/gpu/drm/i915/intel_opregion.c | 6 ------
> 1 file changed, 6 deletions(-)
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c
> b/drivers/gpu/drm/i915/intel_opregion.c
> index c15718b4862a..d5a4cb80273e 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -246,7 +246,6 @@ struct opregion_asle_ext {
>
> #define MAX_DSLP 1500
>
> -#ifdef CONFIG_ACPI
> static int swsci(struct drm_device *dev, u32 function, u32 parm, u32
> *parm_out)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> @@ -905,9 +904,6 @@ static void swsci_setup(struct drm_device *dev)
> opregion->swsci_gbda_sub_functions,
> opregion->swsci_sbcb_sub_functions);
> }
> -#else /* CONFIG_ACPI */
> -static inline void swsci_setup(struct drm_device *dev) {}
> -#endif /* CONFIG_ACPI */
>
> static int intel_no_opregion_vbt_callback(const struct dmi_system_id *id)
> {
> @@ -950,9 +946,7 @@ int intel_opregion_setup(struct drm_device *dev)
> return -ENOTSUPP;
> }
>
> -#ifdef CONFIG_ACPI
> INIT_WORK(&opregion->asle_work, asle_work);
> -#endif
>
> base = memremap(asls, OPREGION_SIZE, MEMREMAP_WB);
> if (!base)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI
2016-04-08 14:59 [PATCH] drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI Jani Nikula
2016-04-08 15:55 ` ✗ Fi.CI.BAT: failure for " Patchwork
2016-04-12 10:33 ` [PATCH] " Ander Conselvan De Oliveira
@ 2016-04-12 10:36 ` Chris Wilson
2016-04-12 12:20 ` Jani Nikula
2 siblings, 1 reply; 6+ messages in thread
From: Chris Wilson @ 2016-04-12 10:36 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Fri, Apr 08, 2016 at 05:59:49PM +0300, Jani Nikula wrote:
> The whole file is ignored on CONFIG_ACPI=n.
That's an issue as we can't then acquire the opregion->vbt (which itself
is not acpi dependent). Shrug no modern system can boot without acpi (at
least not if you want more than cpu etc), so I guess we also don't care
that much?
-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] 6+ messages in thread
* Re: [PATCH] drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI
2016-04-12 10:36 ` Chris Wilson
@ 2016-04-12 12:20 ` Jani Nikula
2016-04-13 13:01 ` Jani Nikula
0 siblings, 1 reply; 6+ messages in thread
From: Jani Nikula @ 2016-04-12 12:20 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Tue, 12 Apr 2016, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Fri, Apr 08, 2016 at 05:59:49PM +0300, Jani Nikula wrote:
>> The whole file is ignored on CONFIG_ACPI=n.
>
> That's an issue as we can't then acquire the opregion->vbt (which itself
> is not acpi dependent). Shrug no modern system can boot without acpi (at
> least not if you want more than cpu etc), so I guess we also don't care
> that much?
Interesting, I thought we shouldn't touch ACPI OpRegion for
CONFIG_ACPI=n, but seems that this was changed only in
commit 27d50c82714f6477ac690034b37d202f76eb4f70
Author: Lv Zheng <lv.zheng@intel.com>
Date: Fri Dec 6 16:52:05 2013 +0800
ACPI / i915: Fix incorrect <acpi/acpi.h> inclusions via <linux/acpi_io.h>
So this patch here doesn't change the fact, and since there hasn't been
complaints after the above commit, I wouldn't worry too much.
BR,
Jani.
--
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] 6+ messages in thread* Re: [PATCH] drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI
2016-04-12 12:20 ` Jani Nikula
@ 2016-04-13 13:01 ` Jani Nikula
0 siblings, 0 replies; 6+ messages in thread
From: Jani Nikula @ 2016-04-13 13:01 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Tue, 12 Apr 2016, Jani Nikula <jani.nikula@intel.com> wrote:
> On Tue, 12 Apr 2016, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>> On Fri, Apr 08, 2016 at 05:59:49PM +0300, Jani Nikula wrote:
>>> The whole file is ignored on CONFIG_ACPI=n.
>>
>> That's an issue as we can't then acquire the opregion->vbt (which itself
>> is not acpi dependent). Shrug no modern system can boot without acpi (at
>> least not if you want more than cpu etc), so I guess we also don't care
>> that much?
>
> Interesting, I thought we shouldn't touch ACPI OpRegion for
> CONFIG_ACPI=n, but seems that this was changed only in
>
> commit 27d50c82714f6477ac690034b37d202f76eb4f70
> Author: Lv Zheng <lv.zheng@intel.com>
> Date: Fri Dec 6 16:52:05 2013 +0800
>
> ACPI / i915: Fix incorrect <acpi/acpi.h> inclusions via <linux/acpi_io.h>
>
> So this patch here doesn't change the fact, and since there hasn't been
> complaints after the above commit, I wouldn't worry too much.
No further complaints, so pushed to drm-intel-next-queued. Thanks for
the review.
BR,
Jani.
--
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] 6+ messages in thread
end of thread, other threads:[~2016-04-13 13:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-08 14:59 [PATCH] drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI Jani Nikula
2016-04-08 15:55 ` ✗ Fi.CI.BAT: failure for " Patchwork
2016-04-12 10:33 ` [PATCH] " Ander Conselvan De Oliveira
2016-04-12 10:36 ` Chris Wilson
2016-04-12 12:20 ` Jani Nikula
2016-04-13 13:01 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox