[Intel-gfx] [PATCH 12/12] drm/i915: Drop supports_tv from device info

[José Roberto de Souza]

Only four platforms ever support this feature so we can elimitate
this from device info and use platform checks instead.

Signed-off-by: José Roberto de Souza <jose.so...@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h          | 3 ++-
 drivers/gpu/drm/i915/i915_pci.c          | 4 ----
 drivers/gpu/drm/i915/intel_device_info.h | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d866287c663a2..3c5980d174f81 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1286,7 +1286,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
  */
 #define HAS_128_BYTE_Y_TILING(dev_priv) (GRAPHICS_VER(dev_priv) != 2 && \
                                         !(IS_I915G(dev_priv) || 
IS_I915GM(dev_priv)))
-#define SUPPORTS_TV(dev_priv)          
(INTEL_INFO(dev_priv)->display.supports_tv)
+#define SUPPORTS_TV(dev_priv)          (IS_I915GM(dev_priv) || 
IS_I945GM(dev_priv) || \
+                                        IS_I965GM(dev_priv) || 
IS_GM45(dev_priv))
 #define I915_HAS_HOTPLUG(dev_priv)     
(INTEL_INFO(dev_priv)->display.has_hotplug)
 
 #define HAS_FW_BLC(dev_priv)   (DISPLAY_VER(dev_priv) > 2)
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index c6e99305e24d0..184a1eb6e2fce 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -259,7 +259,6 @@ static const struct intel_device_info i915gm_info = {
        .display.cursor_needs_physical = 1,
        .display.has_overlay = 1,
        .display.overlay_needs_physical = 1,
-       .display.supports_tv = 1,
        .display.fbc_mask = BIT(INTEL_FBC_A),
        .hws_needs_physical = 1,
        .unfenced_needs_alignment = 1,
@@ -284,7 +283,6 @@ static const struct intel_device_info i945gm_info = {
        .display.cursor_needs_physical = 1,
        .display.has_overlay = 1,
        .display.overlay_needs_physical = 1,
-       .display.supports_tv = 1,
        .display.fbc_mask = BIT(INTEL_FBC_A),
        .hws_needs_physical = 1,
        .unfenced_needs_alignment = 1,
@@ -346,7 +344,6 @@ static const struct intel_device_info i965gm_info = {
        .is_mobile = 1,
        .display.fbc_mask = BIT(INTEL_FBC_A),
        .display.has_overlay = 1,
-       .display.supports_tv = 1,
        .hws_needs_physical = 1,
        .has_snoop = false,
 };
@@ -363,7 +360,6 @@ static const struct intel_device_info gm45_info = {
        PLATFORM(INTEL_GM45),
        .is_mobile = 1,
        .display.fbc_mask = BIT(INTEL_FBC_A),
-       .display.supports_tv = 1,
        .platform_engine_mask = BIT(RCS0) | BIT(VCS0),
        .gpu_reset_clobbers_display = false,
 };
diff --git a/drivers/gpu/drm/i915/intel_device_info.h 
b/drivers/gpu/drm/i915/intel_device_info.h
index bea9f92e2264c..a1d111fc83346 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -174,8 +174,7 @@ enum intel_ppgtt_type {
        func(has_hti); \
        func(has_modular_fia); \
        func(has_overlay); \
-       func(overlay_needs_physical); \
-       func(supports_tv);
+       func(overlay_needs_physical);
 
 struct ip_version {
        u8 ver;
-- 
2.36.0