[PATCH 2/3] drm/msm/dp: simplify dp_connector_get_modes()

[Kuogee Hsieh]

On 3/23/2022 3:35 AM, Dmitry Baryshkov wrote:
> Since dp_panel_get_modes() handling for dp_mode was removed,
> dp_display_get_modes also doesn't change the passed dp_mode, drop the
> unused dp_mode variable being allocated unused and then freed.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
> ---
Reviewed-by: Kuogee Hsieh <quic_khsieh at quicinc.com>
>   drivers/gpu/drm/msm/dp/dp_display.c |  8 ++------
>   drivers/gpu/drm/msm/dp/dp_display.h |  3 +--
>   drivers/gpu/drm/msm/dp/dp_drm.c     | 29 +----------------------------
>   3 files changed, 4 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
> index 3dd790083cf7..be1e9c558fda 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -999,8 +999,7 @@ int dp_display_validate_mode(struct msm_dp *dp, u32 mode_pclk_khz)
>   	return MODE_OK;
>   }
>   
> -int dp_display_get_modes(struct msm_dp *dp,
> -				struct dp_display_mode *dp_mode)
> +int dp_display_get_modes(struct msm_dp *dp)
>   {
>   	struct dp_display_private *dp_display;
>   	int ret = 0;
> @@ -1012,11 +1011,8 @@ int dp_display_get_modes(struct msm_dp *dp,
>   
>   	dp_display = container_of(dp, struct dp_display_private, dp_display);
>   
> -	ret = dp_panel_get_modes(dp_display->panel,
> +	return dp_panel_get_modes(dp_display->panel,
>   		dp->connector);
> -	if (dp_mode->drm_mode.clock)
> -		dp->max_pclk_khz = dp_mode->drm_mode.clock;
> -	return ret;
>   }
>   
>   bool dp_display_check_video_test(struct msm_dp *dp)
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h
> index 7af2b186d2d9..6efb5c853c89 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.h
> +++ b/drivers/gpu/drm/msm/dp/dp_display.h
> @@ -33,8 +33,7 @@ struct msm_dp {
>   int dp_display_set_plugged_cb(struct msm_dp *dp_display,
>   		hdmi_codec_plugged_cb fn, struct device *codec_dev);
>   int dp_display_validate_mode(struct msm_dp *dp_display, u32 mode_pclk_khz);
> -int dp_display_get_modes(struct msm_dp *dp_display,
> -		struct dp_display_mode *dp_mode);
> +int dp_display_get_modes(struct msm_dp *dp_display);
>   int dp_display_request_irq(struct msm_dp *dp_display);
>   bool dp_display_check_video_test(struct msm_dp *dp_display);
>   int dp_display_get_test_bpp(struct msm_dp *dp_display);
> diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
> index 80f59cf99089..af5f1b001192 100644
> --- a/drivers/gpu/drm/msm/dp/dp_drm.c
> +++ b/drivers/gpu/drm/msm/dp/dp_drm.c
> @@ -55,49 +55,22 @@ static int dp_connector_get_modes(struct drm_connector *connector)
>   {
>   	int rc = 0;
>   	struct msm_dp *dp;
> -	struct dp_display_mode *dp_mode = NULL;
> -	struct drm_display_mode *m, drm_mode;
>   
>   	if (!connector)
>   		return 0;
>   
>   	dp = to_dp_connector(connector)->dp_display;
>   
> -	dp_mode = kzalloc(sizeof(*dp_mode),  GFP_KERNEL);
> -	if (!dp_mode)
> -		return 0;
> -
>   	/* pluggable case assumes EDID is read when HPD */
>   	if (dp->is_connected) {
> -		/*
> -		 *The get_modes() function might return one mode that is stored
> -		 * in dp_mode when compliance test is in progress. If not, the
> -		 * return value is equal to the total number of modes supported
> -		 * by the sink
> -		 */
> -		rc = dp_display_get_modes(dp, dp_mode);
> +		rc = dp_display_get_modes(dp);
>   		if (rc <= 0) {
>   			DRM_ERROR("failed to get DP sink modes, rc=%d\n", rc);
> -			kfree(dp_mode);
>   			return rc;
>   		}
> -		if (dp_mode->drm_mode.clock) { /* valid DP mode */
> -			memset(&drm_mode, 0x0, sizeof(drm_mode));
> -			drm_mode_copy(&drm_mode, &dp_mode->drm_mode);
> -			m = drm_mode_duplicate(connector->dev, &drm_mode);
> -			if (!m) {
> -				DRM_ERROR("failed to add mode %ux%u\n",
> -				       drm_mode.hdisplay,
> -				       drm_mode.vdisplay);
> -				kfree(dp_mode);
> -				return 0;
> -			}
> -			drm_mode_probed_add(connector, m);
> -		}
>   	} else {
>   		DRM_DEBUG_DP("No sink connected\n");
>   	}
> -	kfree(dp_mode);
>   	return rc;
>   }
>