drm/i915/mst: simplify mst_connector_get_hw_state()

Use a variable for the encoder to simplify.

Reviewed-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/eb8595ae36c6330cce1615059bd2c89a7db79668.1732106557.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 56b2db02893dcb0b30e3f33e74e3a5ae08c6643b..b5e8db579e204faba305498d0a6b10faf99ba39b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -1605,13 +1605,14 @@ static const struct drm_encoder_funcs mst_stream_encoder_funcs = {
 
 static bool mst_connector_get_hw_state(struct intel_connector *connector)
 {
-       if (intel_attached_encoder(connector) && connector->base.state->crtc) {
-               enum pipe pipe;
-               if (!intel_attached_encoder(connector)->get_hw_state(intel_attached_encoder(connector), &pipe))
-                       return false;
-               return true;
-       }
-       return false;
+       /* This is the MST stream encoder set in ->pre_enable, if any */
+       struct intel_encoder *encoder = intel_attached_encoder(connector);
+       enum pipe pipe;
+
+       if (!encoder || !connector->base.state->crtc)
+               return false;
+
+       return encoder->get_hw_state(encoder, &pipe);
 }
 
 static int intel_dp_mst_add_properties(struct intel_dp *intel_dp,