]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915/dp: Drop redundant AUX power get/put in intel_dp_force()
authorImre Deak <imre.deak@intel.com>
Wed, 30 Aug 2023 14:04:20 +0000 (17:04 +0300)
committerImre Deak <imre.deak@intel.com>
Thu, 31 Aug 2023 10:14:23 +0000 (13:14 +0300)
intel_dp_force() takes the AUX power reference as required by the DP AUX
transactions in intel_dp_set_edid(). However the low level AUX handler
takes this reference already so the get/put in intel_dp_force() can be
dropped. This also fixes a problem where the TC port mode changed while
the AUX power well was enabled.

Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8779
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230830140421.2031111-1-imre.deak@intel.com
drivers/gpu/drm/i915/display/intel_dp.c

index 9d303caf969e01220f124e60fd5749805b19abba..16fb12d187a298f712fd03135ecccf9eb35b176b 100644 (file)
@@ -5365,9 +5365,6 @@ intel_dp_force(struct drm_connector *connector)
        struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
        struct intel_encoder *intel_encoder = &dig_port->base;
        struct drm_i915_private *dev_priv = to_i915(intel_encoder->base.dev);
-       enum intel_display_power_domain aux_domain =
-               intel_aux_power_domain(dig_port);
-       intel_wakeref_t wakeref;
 
        drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]\n",
                    connector->base.id, connector->name);
@@ -5376,11 +5373,7 @@ intel_dp_force(struct drm_connector *connector)
        if (connector->status != connector_status_connected)
                return;
 
-       wakeref = intel_display_power_get(dev_priv, aux_domain);
-
        intel_dp_set_edid(intel_dp);
-
-       intel_display_power_put(dev_priv, aux_domain, wakeref);
 }
 
 static int intel_dp_get_modes(struct drm_connector *connector)