drm/vmwgfx: Add support for CursorMob and CursorBypass 4
Subsystems (3)
PATCH 1/4 drm/vmwgfx: Add support for CursorMob and CursorBypass 4
From: Martin Krastev <[email protected]>
* Add support for CursorMob
* Add support for CursorBypass 4
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 45 +++++++++++++++- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 6 +++ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 79 +++++++++++++++++++++++++++-- 3 files changed, 125 insertions(+), 5 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +44 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 OR MIT /************************************************************************** * -* Copyright 2009-2016 VMware, Inc., Palo Alto, CA., USA +* Copyright 2009-2021 VMware, Inc., Palo Alto, CA., USA * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the
@@ -301,8 +301,12 @@ static void vmw_print_capabilities2(uint32_t capabilities2)DRM_INFO (" Grow oTable.\n" );if (capabilities2 &SVGA_CAP2_INTRA_SURFACE_COPY )DRM_INFO (" IntraSurface copy.\n" ); +if (capabilities2 &SVGA_CAP2_CURSOR_MOB ) +DRM_INFO (" Cursor Mob.\n" );if (capabilities2 &SVGA_CAP2_DX3 )DRM_INFO (" DX3.\n" ); +if (capabilities2 &SVGA_CAP2_EXTRA_REGS ) +DRM_INFO (" Extra Regs.\n" ); }static void vmw_print_capabilities (uint32_t capabilities)
@@ -505,6 +509,7 @@ static int vmw_request_device_late(struct vmw_private *dev_priv)static int vmw_request_device (struct vmw_private *dev_priv) {int ret; +size_t i; ret =vmw_device_init (dev_priv);if (unlikely (ret !=0 )) {
@@ -526,6 +531,37 @@ static int vmw_request_device(struct vmw_private *dev_priv)if (unlikely (ret !=0 )) goto out_no_query_bo; +/* Set up mobs for cursor updates */ +if (dev_priv->has_mob && dev_priv->capabilities2 &SVGA_CAP2_CURSOR_MOB ) { +const uint32_t cursor_max_dim =vmw_read (dev_priv,SVGA_REG_CURSOR_MAX_DIMENSION ); + +for (i =0 ; i <ARRAY_SIZE (dev_priv->cursor_mob); i++) { +struct ttm_buffer_object **const bo = &dev_priv->cursor_mob[i]; + + ret =vmw_bo_create_kernel (dev_priv, + cursor_max_dim * cursor_max_dim *sizeof (u32) +sizeof (SVGAGBCursorHeader), + &vmw_mob_placement, bo); + +if (ret !=0 ) { +DRM_ERROR ("Unable to create CursorMob array.\n" ); +break ; + } + +BUG_ON ((*bo)->resource->mem_type !=VMW_PL_MOB ); + +/* Fence the mob creation so we are guarateed to have the mob */ + ret =ttm_bo_reserve (*bo, false, true,NULL ); +BUG_ON (ret); + +vmw_bo_fence_single (*bo,NULL ); + +ttm_bo_unreserve (*bo); + +DRM_INFO ("Using CursorMob mobid %lu, max dimension %u\n" , + (*bo)->resource->start, cursor_max_dim); + } + } +return 0 ; out_no_query_bo:
@@ -556,6 +592,8 @@ static int vmw_request_device(struct vmw_private *dev_priv)*/ static void vmw_release_device_early (struct vmw_private *dev_priv) { +size_t i; +/* * Previous destructions should've released * the pinned bo.
@@ -570,6 +608,11 @@ static void vmw_release_device_early(struct vmw_private *dev_priv)if (dev_priv->has_mob) {struct ttm_resource_manager *man; +for (i =0 ; i <ARRAY_SIZE (dev_priv->cursor_mob); i++) { +if (dev_priv->cursor_mob[i] !=NULL ) +ttm_bo_put (dev_priv->cursor_mob[i]); + } + man =ttm_manager_type (&dev_priv->bdev,VMW_PL_MOB );ttm_resource_manager_evict_all (&dev_priv->bdev, man);vmw_otables_takedown (dev_priv);
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +6 -0
@@ -642,6 +642,12 @@ struct vmw_private {u8 mksstat_kern_top_timer[MKSSTAT_CAPACITY ];atomic_t mksstat_kern_pids[MKSSTAT_CAPACITY ];#endif + +/* +* CursorMob buffer objects +*/ +struct ttm_buffer_object *cursor_mob[2 ]; +atomic_t cursor_mob_idx; };static inline struct vmw_surface *vmw_res_to_srf (struct vmw_resource *res)
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +75 -4
118 lines not on this page · raw message
Signature · 1 line
2.30.2
PATCH 2/4 drm/vmwgfx: Switch to using DRM_IOCTL_DEF_DRV
The macro has been accounting for DRM_COMMAND_BASE for a long time now so there's no reason to still be duplicating it. Plus we were leaving the name undefined which meant that all the DRM ioctl warnings/errors were always listing "null" ioctl at the culprit.
This fixes the undefined ioctl name and removes duplicated code.
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 176 +++++++++++++--------------- 1 file changed, 84 insertions(+), 92 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +84 -92
@@ -159,110 +159,102 @@DRM_IOW (DRM_COMMAND_BASE +DRM_VMW_MKSSTAT_REMOVE , \ struct drm_vmw_mksstat_remove_arg) -/* -* The core DRM version of this macro doesn't account for -* DRM_COMMAND_BASE. - */ - -#define VMW_IOCTL_DEF (ioctl, func, flags) \ - [DRM_IOCTL_NR(DRM_IOCTL_##ioctl) - DRM_COMMAND_BASE] = {DRM_IOCTL_##ioctl, flags, func} -/* * Ioctl definitions. */static const struct drm_ioctl_desc vmw_ioctls[] = { -VMW_IOCTL_DEF (VMW_GET_PARAM , vmw_getparam_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_ALLOC_DMABUF , vmw_bo_alloc_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_UNREF_DMABUF , vmw_bo_unref_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_CURSOR_BYPASS , - vmw_kms_cursor_bypass_ioctl, -DRM_MASTER ), - -VMW_IOCTL_DEF (VMW_CONTROL_STREAM , vmw_overlay_ioctl, -DRM_MASTER ), -VMW_IOCTL_DEF (VMW_CLAIM_STREAM , vmw_stream_claim_ioctl, -DRM_MASTER ), -VMW_IOCTL_DEF (VMW_UNREF_STREAM , vmw_stream_unref_ioctl, -DRM_MASTER ), - -VMW_IOCTL_DEF (VMW_CREATE_CONTEXT , vmw_context_define_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_UNREF_CONTEXT , vmw_context_destroy_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_CREATE_SURFACE , vmw_surface_define_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_UNREF_SURFACE , vmw_surface_destroy_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_REF_SURFACE , vmw_surface_reference_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_EXECBUF , vmw_execbuf_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_FENCE_WAIT , vmw_fence_obj_wait_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_FENCE_SIGNALED , - vmw_fence_obj_signaled_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_FENCE_UNREF , vmw_fence_obj_unref_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_FENCE_EVENT , vmw_fence_event_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_GET_3D_CAP , vmw_get_cap_3d_ioctl, -DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_GET_PARAM , vmw_getparam_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_ALLOC_DMABUF , vmw_bo_alloc_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_UNREF_DMABUF , vmw_bo_unref_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_CURSOR_BYPASS , + vmw_kms_cursor_bypass_ioctl, +DRM_MASTER ), + +DRM_IOCTL_DEF_DRV (VMW_CONTROL_STREAM , vmw_overlay_ioctl, +DRM_MASTER ), +DRM_IOCTL_DEF_DRV (VMW_CLAIM_STREAM , vmw_stream_claim_ioctl, +DRM_MASTER ), +DRM_IOCTL_DEF_DRV (VMW_UNREF_STREAM , vmw_stream_unref_ioctl, +DRM_MASTER ), + +DRM_IOCTL_DEF_DRV (VMW_CREATE_CONTEXT , vmw_context_define_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_UNREF_CONTEXT , vmw_context_destroy_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_CREATE_SURFACE , vmw_surface_define_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_UNREF_SURFACE , vmw_surface_destroy_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_REF_SURFACE , vmw_surface_reference_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_EXECBUF , vmw_execbuf_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_FENCE_WAIT , vmw_fence_obj_wait_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_FENCE_SIGNALED , + vmw_fence_obj_signaled_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_FENCE_UNREF , vmw_fence_obj_unref_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_FENCE_EVENT , vmw_fence_event_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_GET_3D_CAP , vmw_get_cap_3d_ioctl, +DRM_RENDER_ALLOW ),/* these allow direct access to the framebuffers mark as master only */ -VMW_IOCTL_DEF (VMW_PRESENT , vmw_present_ioctl, -DRM_MASTER |DRM_AUTH ), -VMW_IOCTL_DEF (VMW_PRESENT_READBACK , - vmw_present_readback_ioctl, -DRM_MASTER |DRM_AUTH ), +DRM_IOCTL_DEF_DRV (VMW_PRESENT , vmw_present_ioctl, +DRM_MASTER |DRM_AUTH ), +DRM_IOCTL_DEF_DRV (VMW_PRESENT_READBACK , + vmw_present_readback_ioctl, +DRM_MASTER |DRM_AUTH ),/* * The permissions of the below ioctl are overridden in * vmw_generic_ioctl(). We require either * DRM_MASTER or capable(CAP_SYS_ADMIN). */ -VMW_IOCTL_DEF (VMW_UPDATE_LAYOUT , - vmw_kms_update_layout_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_CREATE_SHADER , - vmw_shader_define_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_UNREF_SHADER , - vmw_shader_destroy_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_GB_SURFACE_CREATE , - vmw_gb_surface_define_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_GB_SURFACE_REF , - vmw_gb_surface_reference_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_SYNCCPU , - vmw_user_bo_synccpu_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_CREATE_EXTENDED_CONTEXT , - vmw_extended_context_define_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_GB_SURFACE_CREATE_EXT , - vmw_gb_surface_define_ext_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_GB_SURFACE_REF_EXT , - vmw_gb_surface_reference_ext_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_MSG , - vmw_msg_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_MKSSTAT_RESET , - vmw_mksstat_reset_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_MKSSTAT_ADD , - vmw_mksstat_add_ioctl, -DRM_RENDER_ALLOW ), -VMW_IOCTL_DEF (VMW_MKSSTAT_REMOVE , - vmw_mksstat_remove_ioctl, -DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_UPDATE_LAYOUT , + vmw_kms_update_layout_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_CREATE_SHADER , + vmw_shader_define_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_UNREF_SHADER , + vmw_shader_destroy_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_GB_SURFACE_CREATE , + vmw_gb_surface_define_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_GB_SURFACE_REF , + vmw_gb_surface_reference_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_SYNCCPU , + vmw_user_bo_synccpu_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_CREATE_EXTENDED_CONTEXT , + vmw_extended_context_define_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_GB_SURFACE_CREATE_EXT , + vmw_gb_surface_define_ext_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_GB_SURFACE_REF_EXT , + vmw_gb_surface_reference_ext_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_MSG , + vmw_msg_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_MKSSTAT_RESET , + vmw_mksstat_reset_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_MKSSTAT_ADD , + vmw_mksstat_add_ioctl, +DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (VMW_MKSSTAT_REMOVE , + vmw_mksstat_remove_ioctl, +DRM_RENDER_ALLOW ), };static const struct pci_device_id vmw_pci_id_list[] = {
Signature · 1 line
2.30.2
PATCH 3/4 drm/vmwgfx: Be a lot more flexible with MOB limits
In reply to Zack RusinThe code was trying to keep a strict limit on the amount of mob memory that was used in the guest by making it match the host settings. There's technically no reason to do that (guests can certainly use more than the host can have resident in renderers at the same time).
In particular this is problematic because our userspace is not great at handling OOM conditions and running out of MOB space results in GL apps crashing, e.g. gnome-shell likes to allocate huge surfaces (~61MB for the desktop on 2560x1600 with two workspaces) and running out of memory there means that the gnome-shell crashes on startup taking us back to the login and resulting in a system where one can not login in graphically anymore.
Instead of letting the userspace crash we can extend available MOB space, we just don't want to use all of the RAM for graphics, so we're going to limit it to half of RAM.
With the addition of some extra logging this should make the "guest has been configured with not enough graphics memory" errors a lot easier to diagnose in cases where the automatic expansion of MOB space fails.
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 ++++- drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 36 +++++++++++++++++-- 2 files changed, 41 insertions(+), 3 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +7 -1
@@ -948,6 +948,13 @@ static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id) dev_priv->texture_max_height =8192 ; dev_priv->max_primary_mem = dev_priv->vram_size; } +DRM_INFO ("Legacy memory limits: VRAM = %llu kB, FIFO = %llu kB, surface = %u kB\n" , + (u64 )dev_priv->vram_size /1024 , + (u64 )dev_priv->fifo_mem_size /1024 , + dev_priv->memory_size /1024 ); + +DRM_INFO ("MOB limits: max mob size = %u kB, max mob pages = %u\n" , + dev_priv->max_mob_size /1024 , dev_priv->max_mob_pages);vmw_print_capabilities (dev_priv->capabilities);if (dev_priv->capabilities &SVGA_CAP_CAP2_REGISTER )
@@ -1094,7 +1101,6 @@ static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id)DRM_INFO ("SM4_1 support available.\n" );if (dev_priv->sm_type ==VMW_SM_4 )DRM_INFO ("SM4 support available.\n" ); -DRM_INFO ("Running without reservation semaphore\n" ); vmw_host_printf("vmwgfx: Module Version: %d.%d.%d (kernel: %s)", VMWGFX_DRIVER_MAJOR, VMWGFX_DRIVER_MINOR,
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +34 -2
@@ -71,8 +71,40 @@ static int vmw_gmrid_man_get_node(struct ttm_resource_manager *man,if (gman->max_gmr_pages >0 ) { gman->used_gmr_pages += (*res)->num_pages; -if (unlikely (gman->used_gmr_pages > gman->max_gmr_pages)) - goto nospace; +/* +* Because the graphics memory is a soft limit we can try to +* expand it instead of letting the userspace apps crash. +* We're just going to have a sane limit (half of RAM) +* on the number of MOB's that we create and will try to keep +* the system running until we reach that. +*/ +if (unlikely (gman->used_gmr_pages > gman->max_gmr_pages)) { +const unsigned long max_graphics_pages =totalram_pages () /2 ; +uint32_t new_max_pages =0 ; + +DRM_WARN ("vmwgfx: mob memory overflow. Consider increasing guest RAM and graphicsMemory.\n" ); +vmw_host_printf ("vmwgfx, warning: mob memory overflow. Consider increasing guest RAM and graphicsMemory.\n" ); + +if (gman->max_gmr_pages > (max_graphics_pages /2 )) { +DRM_WARN ("vmwgfx: guest requires more than half of RAM for graphics.\n" ); + new_max_pages = max_graphics_pages; + }else + new_max_pages = gman->max_gmr_pages *2 ; +if (new_max_pages > gman->max_gmr_pages && new_max_pages >= gman->used_gmr_pages) { +DRM_WARN ("vmwgfx: increasing guest mob limits to %u kB.\n" , + ((new_max_pages) << (PAGE_SHIFT -10 ))); + + gman->max_gmr_pages = new_max_pages; + }else { +char buf[256 ]; +snprintf (buf,sizeof (buf), +"vmwgfx, error: guest graphics is out of memory (mob limit at: %ukB).\n" , + ((gman->max_gmr_pages) << (PAGE_SHIFT -10 ))); +vmw_host_printf (buf); +DRM_WARN ("%s" , buf); + goto nospace; + } + } } (*res)->start = id;
Signature · 1 line
2.30.2
PATCH 4/4 drm/vmwgfx: Use 2.19 version number to recognize mks-stats ioctls
In reply to Zack RusinTo let the userspace recognize that it's running on top of a vmwgfx that supports mks-stat ioctls we need to bump the version number.
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +3 -3
@@ -54,10 +54,10 @@#define VMWGFX_DRIVER_NAME "vmwgfx" -#define VMWGFX_DRIVER_DATE "20210218" +#define VMWGFX_DRIVER_DATE "20210713"#define VMWGFX_DRIVER_MAJOR 2 -#define VMWGFX_DRIVER_MINOR 18 -#define VMWGFX_DRIVER_PATCHLEVEL 1 +#define VMWGFX_DRIVER_MINOR 19 +#define VMWGFX_DRIVER_PATCHLEVEL 0#define VMWGFX_FIFO_STATIC_SIZE (1024*1024)#define VMWGFX_MAX_RELOCATIONS 2048#define VMWGFX_MAX_VALIDATIONS 2048
Signature · 1 line
2.30.2
Thomas Zimmermann
maintainerHi
Am 14.07.21 um 06:14 schrieb Zack Rusin:
Quoted 28 lines
From: Martin Krastev <[email protected]>
* Add support for CursorMob
* Add support for CursorBypass 4Reviewed-by Zack Rusin <[email protected]>Signed-off-by Martin Krastev <[email protected]>Signed-off-by Zack Rusin <[email protected]>--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 45 +++++++++++++++- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 6 +++ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 79 +++++++++++++++++++++++++++-- 3 files changed, 125 insertions(+), 5 deletions(-)drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +1
-1@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 OR MIT /************************************************************************** * -* Copyright 2009-2016 VMware, Inc., Palo Alto, CA., USA +* Copyright 2009-2021 VMware, Inc., Palo Alto, CA., USA * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c static void vmw_print_capabilities2(uint32_t capabilities2) · line 301
Quoted 1 line
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +0
-0@@ -301,8 +301,12 @@ static void vmw_print_capabilities2(uint32_t capabilities2)DRM_INFO (" Grow oTable.\n" );
These macros have been out of fashion for a while. There's drm_info(), drm_warn(), drm_err(), etc as replacements. They also print device information. Applis here and for the rest of the patchset.
Quoted 30 lines
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +12
-0if (capabilities2 &SVGA_CAP2_INTRA_SURFACE_COPY )DRM_INFO (" IntraSurface copy.\n" ); +if (capabilities2 &SVGA_CAP2_CURSOR_MOB ) +DRM_INFO (" Cursor Mob.\n" );if (capabilities2 &SVGA_CAP2_DX3 )DRM_INFO (" DX3.\n" ); +if (capabilities2 &SVGA_CAP2_EXTRA_REGS ) +DRM_INFO (" Extra Regs.\n" ); }static void vmw_print_capabilities (uint32_t capabilities)@@ -505,6 +509,7 @@ static int vmw_request_device_late(struct vmw_private *dev_priv)static int vmw_request_device (struct vmw_private *dev_priv) {int ret; +size_t i; ret =vmw_device_init (dev_priv);if (unlikely (ret !=0 )) {@@ -526,6 +531,37 @@ static int vmw_request_device(struct vmw_private *dev_priv)if (unlikely (ret !=0 )) goto out_no_query_bo; +/* Set up mobs for cursor updates */ +if (dev_priv->has_mob && dev_priv->capabilities2 &SVGA_CAP2_CURSOR_MOB ) { +const uint32_t cursor_max_dim =vmw_read (dev_priv,SVGA_REG_CURSOR_MAX_DIMENSION ); + +for (i =0 ; i <ARRAY_SIZE (dev_priv->cursor_mob); i++) { +struct ttm_buffer_object **const bo = &dev_priv->cursor_mob[i]; +
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c static int vmw_request_device(struct vmw_private *dev_priv) · line 550
Quoted 10 lines
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +10
-0+ ret =vmw_bo_create_kernel (dev_priv, + cursor_max_dim * cursor_max_dim *sizeof (u32) +sizeof (SVGAGBCursorHeader), + &vmw_mob_placement, bo); + +if (ret !=0 ) { +DRM_ERROR ("Unable to create CursorMob array.\n" ); +break ; + } + +BUG_ON ((*bo)->resource->mem_type !=VMW_PL_MOB );
BUG_ON() crashes the kernel. The prefered way is to use drm_WARN_*() and return.
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c static int vmw_request_device(struct vmw_private *dev_priv) · line 554
Quoted 4 lines
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +4
-0+ +/* Fence the mob creation so we are guarateed to have the mob */ + ret =ttm_bo_reserve (*bo, false, true,NULL ); +BUG_ON (ret);
I'm not quite sure, but this line is probably a no-go wrt to best practices. See the comment above.
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c static int vmw_request_device(struct vmw_private *dev_priv) · line 561
Quoted 7 lines
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +7
-0+ +vmw_bo_fence_single (*bo,NULL ); + +ttm_bo_unreserve (*bo); + +DRM_INFO ("Using CursorMob mobid %lu, max dimension %u\n" , + (*bo)->resource->start, cursor_max_dim);
IIRC anything *_info() is just radom info into the log. Most of the time, no one cares. Better use one of the drm_dbg_() calls.
Quoted 32 lines
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +10
-0+ } + } +return 0 ; out_no_query_bo:@@ -556,6 +592,8 @@ static int vmw_request_device(struct vmw_private *dev_priv)*/ static void vmw_release_device_early (struct vmw_private *dev_priv) { +size_t i; +/* * Previous destructions should've released * the pinned bo. @@ -570,6 +608,11 @@ static void vmw_release_device_early(struct vmw_private *dev_priv)if (dev_priv->has_mob) {struct ttm_resource_manager *man; +for (i =0 ; i <ARRAY_SIZE (dev_priv->cursor_mob); i++) { +if (dev_priv->cursor_mob[i] !=NULL ) +ttm_bo_put (dev_priv->cursor_mob[i]); + } + man =ttm_manager_type (&dev_priv->bdev,VMW_PL_MOB );ttm_resource_manager_evict_all (&dev_priv->bdev, man);vmw_otables_takedown (dev_priv);drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +0
-0
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h struct vmw_private { · line 650
Quoted 9 lines
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +6
-0@@ -642,6 +642,12 @@ struct vmw_private {u8 mksstat_kern_top_timer[MKSSTAT_CAPACITY ];atomic_t mksstat_kern_pids[MKSSTAT_CAPACITY ];#endif + +/* +* CursorMob buffer objects +*/ +struct ttm_buffer_object *cursor_mob[2 ]; +atomic_t cursor_mob_idx;
That's something like page-flipping with alternating BO's and shadow buffering?
You really want a cursor plane to hold this information.
I briefly looked through vmwgfx and it has all these fail-able code in its atomic-update path. The patches here only make things worse. With cursor planes, you can do all the preparation in atomic_check and prepare_fb, and store the intermediate state/mappings/etc in the plane state.
The ast driver started with a design like this one here and then we moved it to cursor planes. Ast has now none of the mentioned problems. Relevant code is at [1][2].
Best regards
Thomas
[1] https://elixir.bootlin.com/linux/v5.13.1/source/drivers/gpu/drm/ast/ast_drv.h#L105
[2] https://elixir.bootlin.com/linux/v5.13.1/source/drivers/gpu/drm/ast/ast_mode.c#L652
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
Quoted 4 lines · Thomas Zimmermann
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c static void vmw_print_capabilities2(uint32_t capabilities2) · line 301
Quoted 2 lines
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +0
-0@@ -301,8 +301,12 @@ static void vmw_print_capabilities2(uint32_t capabilities2) DRM_INFO(" Grow oTable.\n");These macros have been out of fashion for a while. There's
drm_info(),drm_warn(),drm_err(), etc as replacements. They also print device information. Applis here and for the rest of the patchset.
Yea, that's messy, I'll go ahead and cleanup some of our logging in v2.
Quoted 3 lines
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c static int vmw_request_device(struct vmw_private *dev_priv) · line 550
Quoted 1 line
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +1
-0+ BUG_ON((*bo)->resource->mem_type != VMW_PL_MOB);
BUG_ON()crashes the kernel. The prefered way is to use drm_WARN_*() and return.
This one is really an assert. This should never happen, I'm not sure if it's worth even testing for this because the driver is broken if that happens.
Quoted 9 lines
That's something like page-flipping with alternating BO's and shadow buffering?
You really want a cursor plane to hold this information.
I briefly looked through vmwgfx and it has all these fail-able code in its atomic-update path. The patches here only make things worse. With cursor planes, you can do all the preparation in
atomic_checkandprepare_fb, and store the intermediate state/mappings/etc in the plane state.The ast driver started with a design like this one here and then we moved it to cursor planes. Ast has now none of the mentioned problems. Relevant code is at [1][2].
Yea, I was hoping to the the cursor mob's first and then go back and refactor the error paths for all cursor modes. I do agree that it's not the cleanest approach because it leaves us in a bit broken state until the refactor lands. I'll take out the cursor mob change from v2 of this patchset to give Martin some time to clean up the patch a bit. I'll probably send that out as a separate "cursor mob and atomic errors refactor/fixes" patchset later. Thanks for the review!
z