Skip to content

Commit

Permalink
drm/i915/display: Remove some redundancy around CAN_PSR()
Browse files Browse the repository at this point in the history
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
  • Loading branch information
José Roberto de Souza committed Feb 22, 2021
1 parent 774ab4f commit 3816139
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
5 changes: 2 additions & 3 deletions drivers/gpu/drm/i915/display/intel_display_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/display/intel_dp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/display/intel_psr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 3816139

Please sign in to comment.