[PATCH] drm/i915/lspcon: do not hardcode settle timeout

Nautiyal, Ankit K ankit.k.nautiyal at intel.com
Wed Oct 16 04:46:40 UTC 2024


On 10/14/2024 3:09 PM, Giedrius Statkevičius wrote:
> 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.
>
> Signed-off-by: Giedrius Statkevičius <giedriuswork at gmail.com>
> ---
>   drivers/gpu/drm/display/drm_dp_dual_mode_helper.c | 3 +--
>   drivers/gpu/drm/i915/display/intel_lspcon.c       | 2 +-
>   include/drm/display/drm_dp_dual_mode_helper.h     | 2 +-
>   3 files changed, 3 insertions(+), 4 deletions(-)
>
> 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 14a2a8473682..ae9d6b93136b 100644
> --- a/drivers/gpu/drm/display/drm_dp_dual_mode_helper.c
> +++ b/drivers/gpu/drm/display/drm_dp_dual_mode_helper.c
> @@ -491,11 +491,10 @@ EXPORT_SYMBOL(drm_lspcon_get_mode);
>    * 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)

Add documentation for new argument 'time_out', as also reported by 
kernel test robot.

Otherwise looks good to me.

Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal at intel.com>

>   {
>   	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 f9db867fae89..764cf4898364 100644
> --- a/drivers/gpu/drm/i915/display/intel_lspcon.c
> +++ b/drivers/gpu/drm/i915/display/intel_lspcon.c
> @@ -211,7 +211,7 @@ 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 7ee482265087..7ac6969db935 100644
> --- 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


More information about the dri-devel mailing list