Drop the no-op intel_gmch_vga_set_decode() and xe_display_misc.c, and build intel_gmch.c in xe instead.
Signed-off-by: Jani Nikula <[email protected]> --- drivers/gpu/drm/xe/Makefile | 2 +- drivers/gpu/drm/xe/display/xe_display_misc.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 drivers/gpu/drm/xe/display/xe_display_misc.c diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile index 7d0d4c780145..54b7dd06a802 100644 --- a/drivers/gpu/drm/xe/Makefile +++ b/drivers/gpu/drm/xe/Makefile @@ -206,7 +206,6 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \ display/intel_fb_bo.o \ display/intel_fbdev_fb.o \ display/xe_display.o \ - display/xe_display_misc.o \ display/xe_display_rpm.o \ display/xe_display_wa.o \ display/xe_dsb_buffer.o \ @@ -280,6 +279,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \ i915-display/intel_frontbuffer.o \ i915-display/intel_global_state.o \ i915-display/intel_gmbus.o \ + i915-display/intel_gmch.o \ i915-display/intel_hdcp.o \ i915-display/intel_hdcp_gsc_message.o \ i915-display/intel_hdmi.o \ diff --git a/drivers/gpu/drm/xe/display/xe_display_misc.c b/drivers/gpu/drm/xe/display/xe_display_misc.c deleted file mode 100644 index 242c2ef4ca93..000000000000 --- a/drivers/gpu/drm/xe/display/xe_display_misc.c +++ /dev/null @@ -1,16 +0,0 @@ -// SPDX-License-Identifier: MIT -/* - * Copyright © 2023 Intel Corporation - */ - -#include "intel_display_types.h" - -struct pci_dev; - -unsigned int intel_gmch_vga_set_decode(struct pci_dev *pdev, bool enable_decode); - -unsigned int intel_gmch_vga_set_decode(struct pci_dev *pdev, bool enable_decode) -{ - /* ToDo: Implement the actual handling of vga decode */ - return 0; -} -- 2.47.3
