drm/i915: Reuse the aux_domain cached

intel_dp_detect() caches the aux_domain in the beginning of the
function as it is used twice, so lets also use it as the aux_domain
don't change in runtime.

v3: returning intel_dp_retrain_link() error insted of
connector_status_disconnected

Cc: Imre Deak <[email protected]>
Reviewed-by: Imre Deak <[email protected]>
Reviewed-by: Ville Syrjälä <[email protected]>
Signed-off-by: José Roberto de Souza <[email protected]>
Signed-off-by: Imre Deak <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 5258c9d654f40d1bec916742139a96699b34f983..2b090609bee24777237f635577dacd87d8f79a4e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5169,8 +5169,7 @@ intel_dp_detect(struct drm_connector *connector,
 
                ret = intel_dp_retrain_link(encoder, ctx);
                if (ret) {
-                       intel_display_power_put(dev_priv,
-                                               intel_aux_power_domain(dig_port));
+                       intel_display_power_put(dev_priv, aux_domain);
                        return ret;
                }
        }