[PATCH 1/7] Revert "drm/i915: Drop has_psr from device info"

[Tvrtko Ursulin]

From: Tvrtko Ursulin <tvrtko.ursu...@intel.com>

This reverts commit b15a7357a84f091fde8ce35bf2fd494150ad4bd0.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahti...@linux.intel.com>
Acked-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h          | 2 +-
 drivers/gpu/drm/i915/i915_pci.c          | 3 +++
 drivers/gpu/drm/i915/intel_device_info.h | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 10f273800645..f4d070d2803c 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1303,7 +1303,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
                                          IS_HASWELL(dev_priv))
 #define HAS_DP_MST(dev_priv)            (HAS_DDI(dev_priv))
 #define HAS_FPGA_DBG_UNCLAIMED(dev_priv) 
(INTEL_INFO(dev_priv)->display.has_fpga_dbg)
-#define HAS_PSR(dev_priv)               (DISPLAY_VER(dev_priv) >= 9)
+#define HAS_PSR(dev_priv)               (INTEL_INFO(dev_priv)->display.has_psr)
 #define HAS_PSR_HW_TRACKING(dev_priv) \
        (INTEL_INFO(dev_priv)->display.has_psr_hw_tracking)
 #define HAS_PSR2_SEL_FETCH(dev_priv)    (DISPLAY_VER(dev_priv) >= 12)
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index d8d893bafa51..b00f2ddb5de6 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -635,6 +635,7 @@ static const struct intel_device_info chv_info = {
        .display.has_dmc = 1, \
        .display.has_hdcp = 1, \
        .display.has_ipc = 1, \
+       .display.has_psr = 1, \
        .display.has_psr_hw_tracking = 1, \
        .dbuf.size = 896 - 4, /* 4 blocks for bypass path allocation */ \
        .dbuf.slice_mask = BIT(DBUF_S1)
@@ -683,6 +684,7 @@ static const struct intel_device_info skl_gt4_info = {
        .display.has_fpga_dbg = 1, \
        .display.fbc_mask = BIT(INTEL_FBC_A), \
        .display.has_hdcp = 1, \
+       .display.has_psr = 1, \
        .display.has_psr_hw_tracking = 1, \
        .has_runtime_pm = 1, \
        .display.has_dmc = 1, \
@@ -934,6 +936,7 @@ static const struct intel_device_info adl_s_info = {
        .display.has_hdcp = 1,                                                  
\
        .display.has_hotplug = 1,                                               
\
        .display.has_ipc = 1,                                                   
\
+       .display.has_psr = 1,                                                   
\
        .display.ver = 13,                                                      
\
        .display.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | 
BIT(PIPE_D),     \
        .pipe_offsets = {                                                       
\
diff --git a/drivers/gpu/drm/i915/intel_device_info.h 
b/drivers/gpu/drm/i915/intel_device_info.h
index 60fc35ae81df..f698e7b18640 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -178,6 +178,7 @@ enum intel_ppgtt_type {
        func(has_ipc); \
        func(has_modular_fia); \
        func(has_overlay); \
+       func(has_psr); \
        func(has_psr_hw_tracking); \
        func(overlay_needs_physical); \
        func(supports_tv);
-- 
2.32.0