Commit 3816139c authored by José Roberto de Souza's avatar José Roberto de Souza
Browse files

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: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Reviewed-by: default avatarGwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210209181439.215104-3-jose.souza@intel.com
parent 774ab4ff

drivers/gpu/drm/i915/display/intel_display_types.h

+2 −3
Original line number Diff line number Diff line
@@ -1799,8 +1799,7 @@ 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 && \

#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)

drivers/gpu/drm/i915/display/intel_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/display/intel_psr.c

+2 −2
Original line number Diff line number Diff line
@@ -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);