drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI
Subsystems (2)
PATCH 1/1 drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI
The whole file is ignored on CONFIG_ACPI=n.
--- drivers/gpu/drm/i915/intel_opregion.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/gpu/drm/i915/intel_opregion.c +0 -6
@@ -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)
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI
== Series Details ==
== 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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 3 lines · Jani Nikula
The whole file is ignored on
CONFIG_ACPI=n.Signed-off-by Jani Nikula <[email protected]>
Quoted 29 lines
--- drivers/gpu/drm/i915/intel_opregion.c | 6 ------ 1 file changed, 6 deletions(-)drivers/gpu/drm/i915/intel_opregion.c +0
-1@@ -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) {drivers/gpu/drm/i915/intel_opregion.c +0
-3struct 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) {
drivers/gpu/drm/i915/intel_opregion.c int intel_opregion_setup(struct drm_device *dev) · line 952
Quoted 9 lines
drivers/gpu/drm/i915/intel_opregion.c +0
-2@@ -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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 1 line · Jani Nikula
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
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Chris Wilson
Quoted 1 line · Jani Nikula
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 <[email protected]> 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.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 12 lines · Jani Nikula
Quoted 7 lines · Chris Wilson
Quoted 1 line · Jani Nikula
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
Quoted 8 lines
commit
27d50c82714f6477ac690034b37d202f76eb4f70Author: Lv Zheng <[email protected]> Date: Fri Dec 6 16:52:05 2013 +0800ACPI / 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.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx