[Intel-xe] [PATCH 4/9] fixup! drm/xe/display: Implement display support

Jani Nikula jani.nikula at intel.com
Wed Apr 19 12:39:42 UTC 2023


With i9xx_wm.h conditional build, this is now unnecessary.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 drivers/gpu/drm/xe/Makefile              |  1 -
 drivers/gpu/drm/xe/display/ext/i9xx_wm.c | 24 ------------------------
 drivers/gpu/drm/xe/display/ext/i9xx_wm.h | 20 --------------------
 3 files changed, 45 deletions(-)
 delete mode 100644 drivers/gpu/drm/xe/display/ext/i9xx_wm.c
 delete mode 100644 drivers/gpu/drm/xe/display/ext/i9xx_wm.h

diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index 9fa4aaad6b8f..61739cacbc5b 100644
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -120,7 +120,6 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
 	display/xe_plane_initial.o \
 	display/xe_display_rps.o \
 	display/ext/i915_irq.o \
-	display/ext/i9xx_wm.o \
 	display/ext/intel_device_info.o \
 	display/ext/intel_dram.o \
 	display/ext/intel_pch.o \
diff --git a/drivers/gpu/drm/xe/display/ext/i9xx_wm.c b/drivers/gpu/drm/xe/display/ext/i9xx_wm.c
deleted file mode 100644
index 8fae4215be20..000000000000
--- a/drivers/gpu/drm/xe/display/ext/i9xx_wm.c
+++ /dev/null
@@ -1,24 +0,0 @@
-// SPDX-License-Identifier: MIT
-/*
- * Copyright © 2023 Intel Corporation
- */
-
-#include "i9xx_wm.h"
-
-bool ilk_disable_lp_wm(struct drm_i915_private *i915)
-{
-	return false;
-}
-
-void ilk_wm_sanitize(struct drm_i915_private *i915)
-{
-}
-
-bool intel_set_memory_cxsr(struct drm_i915_private *i915, bool enable)
-{
-	return true;
-}
-
-void i9xx_wm_init(struct drm_i915_private *i915)
-{
-}
diff --git a/drivers/gpu/drm/xe/display/ext/i9xx_wm.h b/drivers/gpu/drm/xe/display/ext/i9xx_wm.h
deleted file mode 100644
index b87ae369685a..000000000000
--- a/drivers/gpu/drm/xe/display/ext/i9xx_wm.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2023 Intel Corporation
- */
-
-#ifndef __I9XX_WM_H__
-#define __I9XX_WM_H__
-
-#include <linux/types.h>
-
-struct drm_i915_private;
-struct intel_crtc_state;
-struct intel_plane_state;
-
-bool ilk_disable_lp_wm(struct drm_i915_private *i915);
-void ilk_wm_sanitize(struct drm_i915_private *i915);
-bool intel_set_memory_cxsr(struct drm_i915_private *i915, bool enable);
-void i9xx_wm_init(struct drm_i915_private *i915);
-
-#endif /* __I9XX_WM_H__ */
-- 
2.39.2



More information about the Intel-xe mailing list