drm/vmwgfx: Switch to a managed drm device
Subsystems (3)
PATCH v2 3/8 drm/vmwgfx: Switch to a managed drm device
To cleanup some of the error handling and prepare for some other work lets switch to a managed drm device. It will let us get a better handle on some of the error paths.
Signed-off-by Zack Rusin <[email protected]>
Reviewed-by Martin Krastev <[email protected]>
Reviewed-by Roland Scheidegger <[email protected]>
--- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 85 +++++++++------------- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 10 +-- drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 36 ++++----- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 10 +-- 10 files changed, 75 insertions(+), 92 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c +4 -4
@@ -1230,7 +1230,7 @@ int vmw_cmdbuf_set_pool_size(struct vmw_cmdbuf_man *man,/* First, try to allocate a huge chunk of DMA memory */ size =PAGE_ALIGN (size); - man->map =dma_alloc_coherent (&dev_priv->dev->pdev->dev, size, + man->map =dma_alloc_coherent (&dev_priv->drm.pdev->dev, size, &man->handle,GFP_KERNEL );if (man->map) { man->using_mob = false;
@@ -1313,7 +1313,7 @@ struct vmw_cmdbuf_man *vmw_cmdbuf_man_create(struct vmw_private *dev_priv) man->num_contexts = (dev_priv->capabilities &SVGA_CAP_HP_CMD_QUEUE ) ?2 :1 ; man->headers =dma_pool_create ("vmwgfx cmdbuf" , - &dev_priv->dev->pdev->dev, + &dev_priv->drm.pdev->dev,sizeof (SVGACBHeader),64 ,PAGE_SIZE );if (!man->headers) {
@@ -1322,7 +1322,7 @@ struct vmw_cmdbuf_man *vmw_cmdbuf_man_create(struct vmw_private *dev_priv) } man->dheaders =dma_pool_create ("vmwgfx inline cmdbuf" , - &dev_priv->dev->pdev->dev, + &dev_priv->drm.pdev->dev,sizeof (struct vmw_cmdbuf_dheader ),64 ,PAGE_SIZE );if (!man->dheaders) {
@@ -1387,7 +1387,7 @@ void vmw_cmdbuf_remove_pool(struct vmw_cmdbuf_man *man)ttm_bo_put (man->cmd_space); man->cmd_space =NULL ; }else { -dma_free_coherent (&man->dev_priv->dev->pdev->dev, +dma_free_coherent (&man->dev_priv->drm.pdev->dev, man->size, man->map, man->handle); } }
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +34 -51
200 lines not on this page · raw message
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +1 -1
@@ -492,11 +492,11 @@ enum vmw_sm_type { };struct vmw_private { +struct drm_device drm;struct ttm_bo_device bdev;struct vmw_fifo_state fifo; -struct drm_device *dev;struct drm_vma_offset_manager vma_manager;unsigned long vmw_chipset;unsigned int io_start;
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +5 -5
@@ -481,7 +481,7 @@ static int vmw_fb_kms_detach(struct vmw_fb_par *par,DRM_ERROR ("Could not unset a mode.\n" );return ret; } -drm_mode_destroy (par->vmw_priv->dev, par->set_mode); +drm_mode_destroy (&par->vmw_priv->drm, par->set_mode); par->set_mode =NULL ; }
@@ -567,7 +567,7 @@ static int vmw_fb_set_par(struct fb_info *info)struct drm_display_mode *mode;int ret; - mode =drm_mode_duplicate (vmw_priv->dev, &new_mode); + mode =drm_mode_duplicate (&vmw_priv->drm, &new_mode);if (!mode) {DRM_ERROR ("Could not create new fb mode.\n" );return -ENOMEM ;
@@ -581,7 +581,7 @@ static int vmw_fb_set_par(struct fb_info *info) mode->hdisplay * DIV_ROUND_UP(var->bits_per_pixel, 8), mode->vdisplay)) { -drm_mode_destroy (vmw_priv->dev, mode); +drm_mode_destroy (&vmw_priv->drm, mode);return -EINVAL ; }
@@ -615,7 +615,7 @@ static int vmw_fb_set_par(struct fb_info *info) out_unlock:if (par->set_mode) -drm_mode_destroy (vmw_priv->dev, par->set_mode); +drm_mode_destroy (&vmw_priv->drm, par->set_mode); par->set_mode = mode;mutex_unlock (&par->bo_mutex);
@@ -638,7 +638,7 @@ static const struct fb_ops vmw_fb_ops = {int vmw_fb_init (struct vmw_private *vmw_priv) { -struct device *device = &vmw_priv->dev->pdev->dev; +struct device *device = &vmw_priv->drm.pdev->dev;struct vmw_fb_par *par;struct fb_info *info;unsigned fb_width, fb_height;
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +2 -2
@@ -1033,7 +1033,7 @@ int vmw_event_fence_action_queue(struct drm_file *file_priv, eaction->action.type =VMW_ACTION_EVENT ; eaction->fence =vmw_fence_obj_reference (fence); - eaction->dev = fman->dev_priv->dev; + eaction->dev = &fman->dev_priv->drm; eaction->tv_sec = tv_sec; eaction->tv_usec = tv_usec;
@@ -1055,7 +1055,7 @@ static int vmw_event_fence_action_create(struct drm_file *file_priv, {struct vmw_event_fence_pending *event;struct vmw_fence_manager *fman =fman_from_fence (fence); -struct drm_device *dev = fman->dev_priv->dev; +struct drm_device *dev = &fman->dev_priv->drm;int ret; event =kzalloc (sizeof (*event),GFP_KERNEL );
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +18 -18
@@ -236,7 +236,7 @@ void vmw_kms_cursor_snoop(struct vmw_surface *srf,*/ void vmw_kms_legacy_hotspot_clear (struct vmw_private *dev_priv) { -struct drm_device *dev = dev_priv->dev; +struct drm_device *dev = &dev_priv->drm;struct vmw_display_unit *du;struct drm_crtc *crtc;
@@ -252,7 +252,7 @@ void vmw_kms_legacy_hotspot_clear(struct vmw_private *dev_priv)void vmw_kms_cursor_post_execbuf (struct vmw_private *dev_priv) { -struct drm_device *dev = dev_priv->dev; +struct drm_device *dev = &dev_priv->drm;struct vmw_display_unit *du;struct drm_crtc *crtc;
@@ -889,7 +889,7 @@ static int vmw_kms_new_framebuffer_surface(struct vmw_private *dev_priv, bool is_bo_proxy) { -struct drm_device *dev = dev_priv->dev; +struct drm_device *dev = &dev_priv->drm;struct vmw_framebuffer_surface *vfbs;enum SVGA3dSurfaceFormat format;int ret;
@@ -1001,11 +1001,11 @@ static int vmw_framebuffer_bo_dirty(struct drm_framebuffer *framebuffer,struct drm_clip_rect norect;int ret, increment =1 ; -drm_modeset_lock_all (dev_priv->dev); +drm_modeset_lock_all (&dev_priv->drm); ret =ttm_read_lock (&dev_priv->reservation_sem, true);if (unlikely (ret !=0 )) { -drm_modeset_unlock_all (dev_priv->dev); +drm_modeset_unlock_all (&dev_priv->drm);return ret; }
@@ -1034,7 +1034,7 @@ static int vmw_framebuffer_bo_dirty(struct drm_framebuffer *framebuffer,vmw_fifo_flush (dev_priv, false);ttm_read_unlock (&dev_priv->reservation_sem); -drm_modeset_unlock_all (dev_priv->dev); +drm_modeset_unlock_all (&dev_priv->drm);return ret; }
@@ -1211,7 +1211,7 @@ static int vmw_kms_new_framebuffer_bo(struct vmw_private *dev_priv, *mode_cmd) { -struct drm_device *dev = dev_priv->dev; +struct drm_device *dev = &dev_priv->drm;struct vmw_framebuffer_bo *vfbd;unsigned int requested_size;struct drm_format_name_buf format_name;
@@ -1317,7 +1317,7 @@ vmw_kms_new_framebuffer(struct vmw_private *dev_priv, bo && only_2d && mode_cmd->width > 64 && /* Don't create a proxy for cursor */ dev_priv->active_display_unit == vmw_du_screen_target) { - ret =vmw_create_bo_proxy (dev_priv->dev, mode_cmd, + ret =vmw_create_bo_proxy (&dev_priv->drm, mode_cmd, bo, &surface);if (ret)return ERR_PTR (ret);
@@ -1778,7 +1778,7 @@ vmw_kms_create_hotplug_mode_update_property(struct vmw_private *dev_priv)return ; dev_priv->hotplug_mode_update_property = -drm_property_create_range (dev_priv->dev, +drm_property_create_range (&dev_priv->drm,DRM_MODE_PROP_IMMUTABLE ,"hotplug_mode_update" ,0 ,1 );
@@ -1789,7 +1789,7 @@ vmw_kms_create_hotplug_mode_update_property(struct vmw_private *dev_priv)int vmw_kms_init (struct vmw_private *dev_priv) { -struct drm_device *dev = dev_priv->dev; +struct drm_device *dev = &dev_priv->drm;int ret;drm_mode_config_init (dev);
@@ -1821,7 +1821,7 @@ int vmw_kms_close(struct vmw_private *dev_priv)* but since it destroys encoders and our destructor calls * drm_encoder_cleanup which takes the lock we deadlock. */ -drm_mode_config_cleanup (dev_priv->dev); +drm_mode_config_cleanup (&dev_priv->drm);if (dev_priv->active_display_unit == vmw_du_legacy) ret =vmw_kms_ldu_close_display (dev_priv);
@@ -1932,7 +1932,7 @@ void vmw_disable_vblank(struct drm_crtc *crtc)static int vmw_du_update_layout (struct vmw_private *dev_priv,unsigned int num_rects,struct drm_rect *rects) { -struct drm_device *dev = dev_priv->dev; +struct drm_device *dev = &dev_priv->drm;struct vmw_display_unit *du;struct drm_connector *con;struct drm_connector_list_iter conn_iter;
@@ -2364,7 +2364,7 @@ int vmw_kms_helper_dirty(struct vmw_private *dev_priv,if (dirty->crtc) { units[num_units++] =vmw_crtc_to_du (dirty->crtc); }else { -list_for_each_entry (crtc, &dev_priv->dev->mode_config.crtc_list, +list_for_each_entry (crtc, &dev_priv->drm.mode_config.crtc_list, head) {struct drm_plane *plane = crtc->primary;
@@ -2566,8 +2566,8 @@ int vmw_kms_fbdev_init_data(struct vmw_private *dev_priv,int i =0 ;int ret =0 ; -mutex_lock (&dev_priv->dev->mode_config.mutex); -list_for_each_entry (con, &dev_priv->dev->mode_config.connector_list, +mutex_lock (&dev_priv->drm.mode_config.mutex); +list_for_each_entry (con, &dev_priv->drm.mode_config.connector_list, head) {if (i == unit)break ;
@@ -2575,7 +2575,7 @@ int vmw_kms_fbdev_init_data(struct vmw_private *dev_priv, ++i; } -if (&con->head == &dev_priv->dev->mode_config.connector_list) { +if (&con->head == &dev_priv->drm.mode_config.connector_list) {DRM_ERROR ("Could not find initial display unit.\n" ); ret = -EINVAL ; goto out_unlock;
@@ -2609,7 +2609,7 @@ int vmw_kms_fbdev_init_data(struct vmw_private *dev_priv, } out_unlock: -mutex_unlock (&dev_priv->dev->mode_config.mutex); +mutex_unlock (&dev_priv->drm.mode_config.mutex);return ret; }
@@ -2629,7 +2629,7 @@ vmw_kms_create_implicit_placement_property(struct vmw_private *dev_priv)return ; dev_priv->implicit_placement_property = -drm_property_create_range (dev_priv->dev, +drm_property_create_range (&dev_priv->drm,DRM_MODE_PROP_IMMUTABLE ,"implicit_placement" ,0 ,1 ); }
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +2 -2
@@ -355,7 +355,7 @@ static const struct drm_crtc_helper_funcs vmw_ldu_crtc_helper_funcs = {static int vmw_ldu_init (struct vmw_private *dev_priv,unsigned unit) {struct vmw_legacy_display_unit *ldu; -struct drm_device *dev = dev_priv->dev; +struct drm_device *dev = &dev_priv->drm;struct drm_connector *connector;struct drm_encoder *encoder;struct drm_plane *primary, *cursor;
@@ -479,7 +479,7 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)int vmw_kms_ldu_init_display (struct vmw_private *dev_priv) { -struct drm_device *dev = dev_priv->dev; +struct drm_device *dev = &dev_priv->drm;int i, ret;if (dev_priv->ldu_priv) {
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +2 -2
@@ -829,7 +829,7 @@ static const struct drm_crtc_helper_funcs vmw_sou_crtc_helper_funcs = {static int vmw_sou_init (struct vmw_private *dev_priv,unsigned unit) {struct vmw_screen_object_unit *sou; -struct drm_device *dev = dev_priv->dev; +struct drm_device *dev = &dev_priv->drm;struct drm_connector *connector;struct drm_encoder *encoder;struct drm_plane *primary, *cursor;
@@ -946,7 +946,7 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)int vmw_kms_sou_init_display (struct vmw_private *dev_priv) { -struct drm_device *dev = dev_priv->dev; +struct drm_device *dev = &dev_priv->drm;int i, ret;if (!(dev_priv->capabilities &SVGA_CAP_SCREEN_OBJECT_2 )) {
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +2 -2
@@ -1713,7 +1713,7 @@ static const struct drm_crtc_helper_funcs vmw_stdu_crtc_helper_funcs = {static int vmw_stdu_init (struct vmw_private *dev_priv,unsigned unit) {struct vmw_screen_target_display_unit *stdu; -struct drm_device *dev = dev_priv->dev; +struct drm_device *dev = &dev_priv->drm;struct drm_connector *connector;struct drm_encoder *encoder;struct drm_plane *primary, *cursor;
@@ -1861,7 +1861,7 @@ static void vmw_stdu_destroy(struct vmw_screen_target_display_unit *stdu)*/ int vmw_kms_stdu_init_display (struct vmw_private *dev_priv) { -struct drm_device *dev = dev_priv->dev; +struct drm_device *dev = &dev_priv->drm;int i, ret;
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +5 -5
@@ -382,7 +382,7 @@ void vmw_piter_start(struct vmw_piter *viter, const struct vmw_sg_table *vsgt,*/ static void vmw_ttm_unmap_from_dma (struct vmw_ttm_tt *vmw_tt) { -struct device *dev = vmw_tt->dev_priv->dev->dev; +struct device *dev = vmw_tt->dev_priv->drm.dev;dma_unmap_sgtable (dev, &vmw_tt->sgt,DMA_BIDIRECTIONAL ,0 ); vmw_tt->sgt.nents = vmw_tt->sgt.orig_nents;
@@ -403,7 +403,7 @@ static void vmw_ttm_unmap_from_dma(struct vmw_ttm_tt *vmw_tt)*/ static int vmw_ttm_map_for_dma (struct vmw_ttm_tt *vmw_tt) { -struct device *dev = vmw_tt->dev_priv->dev->dev; +struct device *dev = vmw_tt->dev_priv->drm.dev;return dma_map_sgtable (dev, &vmw_tt->sgt,DMA_BIDIRECTIONAL ,0 ); }
@@ -458,7 +458,7 @@ static int vmw_ttm_map_dma(struct vmw_ttm_tt *vmw_tt) sg =__sg_alloc_table_from_pages (&vmw_tt->sgt, vsgt->pages, vsgt->num_pages,0 , (unsigned long ) vsgt->num_pages <<PAGE_SHIFT , -dma_get_max_seg_size (dev_priv->dev->dev), +dma_get_max_seg_size (dev_priv->drm.dev),NULL ,0 ,GFP_KERNEL );if (IS_ERR (sg)) { ret =PTR_ERR (sg);
@@ -664,7 +664,7 @@ static int vmw_ttm_populate(struct ttm_bo_device *bdev,if (unlikely (ret !=0 ))return ret; - ret =ttm_dma_populate (&vmw_tt->dma_ttm, dev_priv->dev->dev, + ret =ttm_dma_populate (&vmw_tt->dma_ttm, dev_priv->drm.dev, ctx);if (unlikely (ret !=0 ))ttm_mem_global_free (glob, size);
@@ -693,7 +693,7 @@ static void vmw_ttm_unpopulate(struct ttm_bo_device *bdev,size_t size =ttm_round_pot (ttm->num_pages *sizeof (dma_addr_t)); -ttm_dma_unpopulate (&vmw_tt->dma_ttm, dev_priv->dev->dev); +ttm_dma_unpopulate (&vmw_tt->dma_ttm, dev_priv->drm.dev);ttm_mem_global_free (glob, size); }else ttm_pool_unpopulate (ttm);
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel