Message ID | 20200302125649.61443-3-pankaj.laxminarayan.bharadiya@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm: drm_fb_helper cleanup. | expand |
On Mon, Mar 2, 2020 at 8:08 AM Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote: > > 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: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/radeon/radeon_dp_mst.c | 10 ---------- > drivers/gpu/drm/radeon/radeon_fb.c | 12 ------------ > drivers/gpu/drm/radeon/radeon_mode.h | 3 --- > 3 files changed, 25 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c > index 28eef9282874..5a9fb0ad175a 100644 > --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c > +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c > @@ -303,23 +303,13 @@ static struct drm_connector *radeon_dp_add_mst_connector(struct drm_dp_mst_topol > > static void radeon_dp_register_mst_connector(struct drm_connector *connector) > { > - struct drm_device *dev = connector->dev; > - struct radeon_device *rdev = dev->dev_private; > - > - radeon_fb_add_connector(rdev, connector); > - > drm_connector_register(connector); > } > > static void radeon_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr, > struct drm_connector *connector) > { > - struct radeon_connector *master = container_of(mgr, struct radeon_connector, mst_mgr); > - struct drm_device *dev = master->base.dev; > - struct radeon_device *rdev = dev->dev_private; > - > drm_connector_unregister(connector); > - radeon_fb_remove_connector(rdev, connector); > drm_connector_cleanup(connector); > > kfree(connector); > diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c > index 85548cf2529a..1c02cd771d52 100644 > --- a/drivers/gpu/drm/radeon/radeon_fb.c > +++ b/drivers/gpu/drm/radeon/radeon_fb.c > @@ -403,15 +403,3 @@ bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj) > return true; > return false; > } > - > -void radeon_fb_add_connector(struct radeon_device *rdev, struct drm_connector *connector) > -{ > - if (rdev->mode_info.rfbdev) > - drm_fb_helper_add_one_connector(&rdev->mode_info.rfbdev->helper, connector); > -} > - > -void radeon_fb_remove_connector(struct radeon_device *rdev, struct drm_connector *connector) > -{ > - if (rdev->mode_info.rfbdev) > - drm_fb_helper_remove_one_connector(&rdev->mode_info.rfbdev->helper, connector); > -} > diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h > index 629567da29f1..c7f223743d46 100644 > --- a/drivers/gpu/drm/radeon/radeon_mode.h > +++ b/drivers/gpu/drm/radeon/radeon_mode.h > @@ -986,9 +986,6 @@ bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj) > > void radeon_crtc_handle_vblank(struct radeon_device *rdev, int crtc_id); > > -void radeon_fb_add_connector(struct radeon_device *rdev, struct drm_connector *connector); > -void radeon_fb_remove_connector(struct radeon_device *rdev, struct drm_connector *connector); > - > void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id); > > int radeon_align_pitch(struct radeon_device *rdev, int width, int bpp, bool tiled); > -- > 2.20.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c index 28eef9282874..5a9fb0ad175a 100644 --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c @@ -303,23 +303,13 @@ static struct drm_connector *radeon_dp_add_mst_connector(struct drm_dp_mst_topol static void radeon_dp_register_mst_connector(struct drm_connector *connector) { - struct drm_device *dev = connector->dev; - struct radeon_device *rdev = dev->dev_private; - - radeon_fb_add_connector(rdev, connector); - drm_connector_register(connector); } static void radeon_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr, struct drm_connector *connector) { - struct radeon_connector *master = container_of(mgr, struct radeon_connector, mst_mgr); - struct drm_device *dev = master->base.dev; - struct radeon_device *rdev = dev->dev_private; - drm_connector_unregister(connector); - radeon_fb_remove_connector(rdev, connector); drm_connector_cleanup(connector); kfree(connector); diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index 85548cf2529a..1c02cd771d52 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c @@ -403,15 +403,3 @@ bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj) return true; return false; } - -void radeon_fb_add_connector(struct radeon_device *rdev, struct drm_connector *connector) -{ - if (rdev->mode_info.rfbdev) - drm_fb_helper_add_one_connector(&rdev->mode_info.rfbdev->helper, connector); -} - -void radeon_fb_remove_connector(struct radeon_device *rdev, struct drm_connector *connector) -{ - if (rdev->mode_info.rfbdev) - drm_fb_helper_remove_one_connector(&rdev->mode_info.rfbdev->helper, connector); -} diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index 629567da29f1..c7f223743d46 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -986,9 +986,6 @@ bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj) void radeon_crtc_handle_vblank(struct radeon_device *rdev, int crtc_id); -void radeon_fb_add_connector(struct radeon_device *rdev, struct drm_connector *connector); -void radeon_fb_remove_connector(struct radeon_device *rdev, struct drm_connector *connector); - void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id); int radeon_align_pitch(struct radeon_device *rdev, int width, int bpp, bool tiled);
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> --- drivers/gpu/drm/radeon/radeon_dp_mst.c | 10 ---------- drivers/gpu/drm/radeon/radeon_fb.c | 12 ------------ drivers/gpu/drm/radeon/radeon_mode.h | 3 --- 3 files changed, 25 deletions(-)