]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/amdgpu: Remove drm_fb_helper_{add,remove}_one_connector calls
authorPankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Thu, 5 Mar 2020 12:04:30 +0000 (17:34 +0530)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 6 Mar 2020 13:19:57 +0000 (14:19 +0100)
drm_fb_helper_{add,remove}_one_connector() are dummy functions now
and serve no purpose. Hence remove their calls.

This is the preparatory step for removing the
drm_fb_helper_{add,remove}_one_connector() functions from
drm_fb_helper.h

Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200305120434.111091-4-pankaj.laxminarayan.bharadiya@intel.com
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

index 0ef0eeb167785fb5d212cfca69711131971ac2ca..0c4faba8ed28b3ccd74f7589914f1ef7c78d5b5b 100644 (file)
@@ -440,9 +440,6 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
 static void dm_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
                                        struct drm_connector *connector)
 {
-       struct amdgpu_dm_connector *master = container_of(mgr, struct amdgpu_dm_connector, mst_mgr);
-       struct drm_device *dev = master->base.dev;
-       struct amdgpu_device *adev = dev->dev_private;
        struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
 
        DRM_INFO("DM_MST: Disabling connector: %p [id: %d] [master: %p]\n",
@@ -457,21 +454,11 @@ static void dm_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
        }
 
        drm_connector_unregister(connector);
-       if (adev->mode_info.rfbdev)
-               drm_fb_helper_remove_one_connector(&adev->mode_info.rfbdev->helper, connector);
        drm_connector_put(connector);
 }
 
 static void dm_dp_mst_register_connector(struct drm_connector *connector)
 {
-       struct drm_device *dev = connector->dev;
-       struct amdgpu_device *adev = dev->dev_private;
-
-       if (adev->mode_info.rfbdev)
-               drm_fb_helper_add_one_connector(&adev->mode_info.rfbdev->helper, connector);
-       else
-               DRM_ERROR("adev->mode_info.rfbdev is NULL\n");
-
        drm_connector_register(connector);
 }