drm/i915/lspcon: do not hardcode settle timeout

Avoid hardcoding the LSPCON settle timeout because it takes a longer
time on certain chips made by certain vendors. Use the function that
already exists to determine the timeout.

Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241017075725.207384-1-giedriuswork@gmail.com
Acked-by: Simona Vetter <simona.vetter@ffwll.ch>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/display/drm_dp_dual_mode_helper.c b/drivers/gpu/drm/display/drm_dp_dual_mode_helper.c
index c491e3203bf11cca786fbff1ceb7ea0c834feb99..4c350c7f51446bc7d8ae908a4fbc12e3dc5b0094 100644 (file)
--- a/drivers/gpu/drm/display/drm_dp_dual_mode_helper.c
+++ b/drivers/gpu/drm/display/drm_dp_dual_mode_helper.c
@@ -486,16 +486,16 @@ EXPORT_SYMBOL(drm_lspcon_get_mode);
  * @dev: &drm_device to use
  * @adapter: I2C-over-aux adapter
  * @mode: required mode of operation
+ * @time_out: LSPCON mode change settle timeout
  *
  * Returns:
  * 0 on success, -error on failure/timeout
  */
 int drm_lspcon_set_mode(const struct drm_device *dev, struct i2c_adapter *adapter,
-                       enum drm_lspcon_mode mode)
+                       enum drm_lspcon_mode mode, int time_out)
 {
        u8 data = 0;
        int ret;
-       int time_out = 200;
        enum drm_lspcon_mode current_mode;
 
        if (mode == DRM_LSPCON_MODE_PCON)

diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.c b/drivers/gpu/drm/i915/display/intel_lspcon.c
index d75dd17fad32374be98643321331479d834e7654..0c8bf477c2fbb786b51943530aa248e1d7fbfe2f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_lspcon.c
+++ b/drivers/gpu/drm/i915/display/intel_lspcon.c
@@ -212,7 +212,8 @@ static int lspcon_change_mode(struct intel_lspcon *lspcon,
                return 0;
        }
 
-       err = drm_lspcon_set_mode(intel_dp->aux.drm_dev, ddc, mode);
+       err = drm_lspcon_set_mode(intel_dp->aux.drm_dev, ddc, mode,
+                                 lspcon_get_mode_settle_timeout(lspcon));
        if (err < 0) {
                drm_err(display->drm, "LSPCON mode change failed\n");
                return err;

diff --git a/include/drm/display/drm_dp_dual_mode_helper.h b/include/drm/display/drm_dp_dual_mode_helper.h
index 7ee482265087c903f0bc6ab6676a5029c89547f2..7ac6969db935f35d8bf21820b796daac2c5be9d8 100644 (file)
--- a/include/drm/display/drm_dp_dual_mode_helper.h
+++ b/include/drm/display/drm_dp_dual_mode_helper.h
@@ -117,5 +117,5 @@ const char *drm_dp_get_dual_mode_type_name(enum drm_dp_dual_mode_type type);
 int drm_lspcon_get_mode(const struct drm_device *dev, struct i2c_adapter *adapter,
                        enum drm_lspcon_mode *current_mode);
 int drm_lspcon_set_mode(const struct drm_device *dev, struct i2c_adapter *adapter,
-                       enum drm_lspcon_mode reqd_mode);
+                       enum drm_lspcon_mode reqd_mode, int time_out);
 #endif