drm/i915/display: Remove some redundancy around CAN_PSR()

If source_support is set the platform supports PSR so no need to check
it again at every CAN_PSR().

Also removing the intel_dp_is_edp() calls, if sink_support is set
the sink connected is for sure a eDP panel.

Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210209181439.215104-3-jose.souza@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 29663db5afcd88aa2a66f3791a6b019434160d37..900e07bb54cacab619091932322bff3716a36948 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1799,9 +1799,8 @@ dp_to_i915(struct intel_dp *intel_dp)
        return to_i915(dp_to_dig_port(intel_dp)->base.base.dev);
 }
 
-#define CAN_PSR(intel_dp)      (HAS_PSR(dp_to_i915(intel_dp)) && \
-                                (intel_dp)->psr.sink_support && \
-                                (intel_dp)->psr.source_support)
+#define CAN_PSR(intel_dp) ((intel_dp)->psr.sink_support && \
+                          (intel_dp)->psr.source_support)
 
 static inline bool intel_encoder_can_psr(struct intel_encoder *encoder)
 {

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 4f89e0de5dde3a8f781a12ca230e0cf3a791b515..0a0cc61344c41babc93783fd8dfcda934932465a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -2358,7 +2358,7 @@ bool intel_dp_initial_fastset_check(struct intel_encoder *encoder,
                return false;
        }
 
-       if (CAN_PSR(intel_dp) && intel_dp_is_edp(intel_dp)) {
+       if (CAN_PSR(intel_dp)) {
                drm_dbg_kms(&i915->drm, "Forcing full modeset to compute PSR state\n");
                crtc_state->uapi.mode_changed = true;
                return false;

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 7ce4feaf18a17c413013dc62eb69a54818b847f1..581d2e83bbee3293a8920b669f34c2dd24466f84 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1964,7 +1964,7 @@ void intel_psr_short_pulse(struct intel_dp *intel_dp)
                          DP_PSR_VSC_SDP_UNCORRECTABLE_ERROR |
                          DP_PSR_LINK_CRC_ERROR;
 
-       if (!CAN_PSR(intel_dp) || !intel_dp_is_edp(intel_dp))
+       if (!CAN_PSR(intel_dp))
                return;
 
        mutex_lock(&psr->lock);
@@ -2014,7 +2014,7 @@ bool intel_psr_enabled(struct intel_dp *intel_dp)
 {
        bool ret;
 
-       if (!CAN_PSR(intel_dp) || !intel_dp_is_edp(intel_dp))
+       if (!CAN_PSR(intel_dp))
                return false;
 
        mutex_lock(&intel_dp->psr.lock);