[AMD Official Use Only - General]
Reviewed-by: Roman Li <roman.li@xxxxxxx>
> -----Original Message-----
> From: SHANMUGAM, SRINIVASAN <SRINIVASAN.SHANMUGAM@xxxxxxx>
> Sent: Saturday, November 11, 2023 11:01 PM
> To: Pillai, Aurabindo <Aurabindo.Pillai@xxxxxxx>; Siqueira, Rodrigo
> <Rodrigo.Siqueira@xxxxxxx>; Li, Roman <Roman.Li@xxxxxxx>; Deucher,
> Alexander <Alexander.Deucher@xxxxxxx>; Wentland, Harry
> <Harry.Wentland@xxxxxxx>; Mahfooz, Hamza
> <Hamza.Mahfooz@xxxxxxx>
> Cc: amd-gfx@xxxxxxxxxxxxxxxxxxxxx; SHANMUGAM, SRINIVASAN
> <SRINIVASAN.SHANMUGAM@xxxxxxx>
> Subject: [PATCH] drm/amd/display: Remove redundant DRM device struct in
> amdgpu_dm_, mst_types.c
>
> Declaration of 'struct drm_device *dev' is redundant, as 'connector->dev' &
> 'dev_get_drvdata(kdev)' can be directly passed to 'drm_to_adev', without
> intermediate DRM device 'dev' variable
>
> Cc: Roman Li <roman.li@xxxxxxx>
> Cc: Hamza Mahfooz <hamza.mahfooz@xxxxxxx>
> Cc: Harry Wentland <harry.wentland@xxxxxxx>
> Cc: Rodrigo Siqueira <Rodrigo.Siqueira@xxxxxxx>
> Cc: Aurabindo Pillai <aurabindo.pillai@xxxxxxx>
> Cc: Alex Deucher <alexander.deucher@xxxxxxx>
> Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@xxxxxxx>
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +++------
> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 +--
> 2 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index adbeb2c897b5..39c73e5321c3 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -893,8 +893,7 @@ static int dm_early_init(void *handle);
> /* Allocate memory for FBC compressed data */ static void
> amdgpu_dm_fbc_init(struct drm_connector *connector) {
> - struct drm_device *dev = connector->dev;
> - struct amdgpu_device *adev = drm_to_adev(dev);
> + struct amdgpu_device *adev = drm_to_adev(connector->dev);
> struct dm_compressor_info *compressor = &adev->dm.compressor;
> struct amdgpu_dm_connector *aconn =
> to_amdgpu_dm_connector(connector);
> struct drm_display_mode *mode;
> @@ -988,8 +987,7 @@ static int
> amdgpu_dm_audio_component_bind(struct device *kdev, static void
> amdgpu_dm_audio_component_unbind(struct device *kdev,
> struct device *hda_kdev, void *data)
> {
> - struct drm_device *dev = dev_get_drvdata(kdev);
> - struct amdgpu_device *adev = drm_to_adev(dev);
> + struct amdgpu_device *adev = drm_to_adev(dev_get_drvdata(kdev));
> struct drm_audio_component *acomp = data;
>
> acomp->ops = NULL;
> @@ -10766,8 +10764,7 @@ void amdgpu_dm_update_freesync_caps(struct
> drm_connector *connector,
> struct dm_connector_state *dm_con_state = NULL;
> struct dc_sink *sink;
>
> - struct drm_device *dev = connector->dev;
> - struct amdgpu_device *adev = drm_to_adev(dev);
> + struct amdgpu_device *adev = drm_to_adev(connector->dev);
> struct amdgpu_hdmi_vsdb_info vsdb_info = {0};
> bool freesync_capable = false;
> enum adaptive_sync_type as_type = ADAPTIVE_SYNC_TYPE_NONE;
> diff --git
> a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> index d3b13d362eda..e4dd0037bcb7 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> @@ -424,8 +424,7 @@ dm_mst_atomic_best_encoder(struct
> drm_connector *connector, {
> struct drm_connector_state *connector_state =
> drm_atomic_get_new_connector_state(state,
>
> connector);
> - struct drm_device *dev = connector->dev;
> - struct amdgpu_device *adev = drm_to_adev(dev);
> + struct amdgpu_device *adev = drm_to_adev(connector->dev);
> struct amdgpu_crtc *acrtc = to_amdgpu_crtc(connector_state->crtc);
>
> return &adev->dm.mst_encoders[acrtc->crtc_id].base;
> --
> 2.34.1
