Skip to content

Commit fef6ed6

Browse files
committed
i915: Remove intel_acpi.c
It is GPL licenced and doesn't seems to be needed. Lid events are still detected on my laptop. If part of this code is needed on some machine we will need to rewrite it correctly. Sponsored by: Beckhoff Automation GmbH & Co. KG
1 parent f310341 commit fef6ed6

File tree

5 files changed

+8
-248
lines changed

5 files changed

+8
-248
lines changed

drivers/gpu/drm/i915/display/intel_acpi.c

-247
This file was deleted.

drivers/gpu/drm/i915/display/intel_display.c

+2
Original file line numberDiff line numberDiff line change
@@ -18932,7 +18932,9 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915)
1893218932
/* poll work can call into fbdev, hence clean that up afterwards */
1893318933
intel_fbdev_fini(i915);
1893418934

18935+
#ifdef __linux__
1893518936
intel_unregister_dsm_handler();
18937+
#endif
1893618938

1893718939
intel_fbc_global_disable(i915);
1893818940

drivers/gpu/drm/i915/display/intel_opregion.c

+2
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,9 @@ static void intel_didl_outputs(struct drm_i915_private *dev_priv)
669669
max_outputs = ARRAY_SIZE(opregion->acpi->didl) +
670670
ARRAY_SIZE(opregion->acpi->did2);
671671

672+
#ifdef __linux__
672673
intel_acpi_device_id_update(dev_priv);
674+
#endif
673675

674676
drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter);
675677
for_each_intel_connector_iter(connector, &conn_iter) {

drivers/gpu/drm/i915/i915_drv.c

+4
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,9 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
738738
intel_power_domains_enable(dev_priv);
739739
intel_runtime_pm_enable(&dev_priv->runtime_pm);
740740

741+
#ifdef __linux__
741742
intel_register_dsm_handler();
743+
#endif
742744

743745
if (i915_switcheroo_register(dev_priv))
744746
drm_err(&dev_priv->drm, "Failed to register vga switcheroo!\n");
@@ -752,7 +754,9 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
752754
{
753755
i915_switcheroo_unregister(dev_priv);
754756

757+
#ifdef __linux__
755758
intel_unregister_dsm_handler();
759+
#endif
756760

757761
intel_runtime_pm_disable(&dev_priv->runtime_pm);
758762
intel_power_domains_disable(dev_priv);

i915/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ SRCS= \
3838
i915_user_extensions.c \
3939
i915_vgpu.c \
4040
i915_vma.c \
41-
intel_acpi.c \
4241
intel_atomic.c \
4342
intel_atomic_plane.c \
4443
intel_audio.c \

0 commit comments

Comments
 (0)