Misc cleanups and fixes for vmwgfx
Subsystems (3)
v3 cover Misc cleanups and fixes for vmwgfx
This is the same set I've sent earlier in the week. CI found a warning and I wanted to give the systems a chance to compile/run the fixed version before submitting it.
Roland Scheidegger (1):
drm/vmwgfx: add Zack Rusin as maintainer
Zack Rusin (7):
drm/vmwgfx: Remove stealth mode
drm/vmwgfx: Switch to a managed drm device drm/vmwgfx: Cleanup fifo mmio handling
drm/vmwgfx: Cleanup pci resource allocation drm/vmwgfx: Remove the throttling code
drm/vmwgfx: Cleanup the cmd/fifo split
drm/vmwgfx: Fix display register usage for some older configs
MAINTAINERS | 1 +
drivers/gpu/drm/vmwgfx/Makefile | 6 +-
drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 52 ++---
.../vmwgfx/{vmwgfx_fifo.c => vmwgfx_cmd.c} | 127 +++++-----
drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 22 +-
drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 40 ++--
drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 12 +-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 220 +++++++++---------
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 92 +++-----
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 22 +-
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 12 +-
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 28 +--
drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 8 +-
drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 15 +-
drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 10 +-
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 74 +++---
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 9 +-
drivers/gpu/drm/vmwgfx/vmwgfx_marker.c | 155 ------------
drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 16 +-
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 8 +-
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 28 +--
drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 24 +-
drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 8 +-
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 32 +--
drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c | 8 +-
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 40 ++--
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 6 +-
28 files changed, 434 insertions(+), 645 deletions(-)
rename drivers/gpu/drm/vmwgfx/{vmwgfx_fifo.c => vmwgfx_cmd.c} (82%)
delete mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_marker.cSignature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 1/8 drm/vmwgfx: add Zack Rusin as maintainer
From: Roland Scheidegger <[email protected]>
--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
@@ -5784,6 +5784,7 @@ F: drivers/gpu/drm/vboxvideo/ DRM DRIVER FOR VMWARE VIRTUAL GPU M: "VMware Graphics" <[email protected]> M: Roland Scheidegger <[email protected]> +M: Zack Rusin <[email protected]> L: [email protected] S: Supported T: git git://people.freedesktop.org/~sroland/linux
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 2/8 drm/vmwgfx: Remove stealth mode
In reply to Zack RusinBefore drm got helpers for removing conflicting pci framebuffer devices we implemented something known as "stealth" mode which allowed vmwgfx to run even if it couldn't reserve pci resources. We can just switch to regular drm helpers instead of keeping the stealth mode alive as it makes our code a lot cleaner.
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 31 ++++++++++------------------- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 5 ----- 2 files changed, 10 insertions(+), 26 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +10 -21
@@ -32,6 +32,7 @@#include <linux/mem_encrypt.h> #include <drm/drm_drv.h> +#include <drm/drm_fb_helper.h> #include <drm/drm_ioctl.h> #include <drm/drm_sysfs.h> #include <drm/ttm/ttm_bo_driver.h>
@@ -841,19 +842,9 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) dev->dev_private = dev_priv; ret =pci_request_regions (pdev,"vmwgfx probe" ); - dev_priv->stealth = (ret !=0 ); -if (dev_priv->stealth) { -/** -* Request at least the mmio PCI resource. -*/ - -DRM_INFO ("It appears like vesafb is loaded. " -"Ignore above error if any.\n" ); - ret =pci_request_region (pdev,2 ,"vmwgfx stealth probe" ); -if (unlikely (ret !=0 )) { -DRM_ERROR ("Failed reserving the SVGA MMIO resource.\n" ); - goto out_no_device; - } +if (ret) { +DRM_ERROR ("Failed reserving PCI regions.\n" ); + goto out_no_device; }if (dev_priv->capabilities &SVGA_CAP_IRQMASK ) {
@@ -1002,10 +993,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)if (dev_priv->capabilities &SVGA_CAP_IRQMASK )vmw_irq_uninstall (dev_priv->dev); out_no_irq: -if (dev_priv->stealth) -pci_release_region (pdev,2 ); -else -pci_release_regions (pdev); +pci_release_regions (pdev); out_no_device:ttm_object_device_release (&dev_priv->tdev); out_err4:
@@ -1054,10 +1042,7 @@ static void vmw_driver_unload(struct drm_device *dev)vmw_fence_manager_takedown (dev_priv->fman);if (dev_priv->capabilities &SVGA_CAP_IRQMASK )vmw_irq_uninstall (dev_priv->dev); -if (dev_priv->stealth) -pci_release_region (pdev,2 ); -else -pci_release_regions (pdev); +pci_release_regions (pdev);ttm_object_device_release (&dev_priv->tdev);memunmap (dev_priv->mmio_virt);
@@ -1511,6 +1496,10 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent)struct drm_device *dev;int ret; + ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,"svgadrmfb" ); +if (ret) +return ret; + ret =pci_enable_device (pdev);if (ret)return ret;
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +0 -5
@@ -590,11 +590,6 @@ struct vmw_private {struct mutex cmdbuf_mutex;struct mutex binding_mutex; -/** -* Operating mode. -*/ - -bool stealth;bool enable_fb;spinlock_t svga_lock;
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 3/8 drm/vmwgfx: Switch to a managed drm device
In reply to Zack RusinTo 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.
--- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 8 +-- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 74 +++++++++------------- 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 | 6 +- 10 files changed, 68 insertions(+), 84 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->dev, size, + man->map =dma_alloc_coherent (dev_priv->drm.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->dev, + dev_priv->drm.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->dev, + dev_priv->drm.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->dev, +dma_free_coherent (man->dev_priv->drm.dev, man->size, man->map, man->handle); } }
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +29 -45
182 lines not on this page · raw message
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +1 -1
@@ -489,11 +489,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->dev; +struct device *device = vmw_priv->drm.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;
@@ -891,7 +891,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;
@@ -1003,11 +1003,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; }
@@ -1036,7 +1036,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; }
@@ -1213,7 +1213,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;
@@ -1319,7 +1319,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);
@@ -1780,7 +1780,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 );
@@ -1791,7 +1791,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);
@@ -1823,7 +1823,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);
@@ -1934,7 +1934,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;
@@ -2366,7 +2366,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;
@@ -2568,8 +2568,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 ;
@@ -2577,7 +2577,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;
@@ -2611,7 +2611,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; }
@@ -2631,7 +2631,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 +3 -3
@@ -309,7 +309,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;
@@ -330,7 +330,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 ); }
@@ -385,7 +385,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);
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 4/8 drm/vmwgfx: Cleanup fifo mmio handling
In reply to Zack RusinGoing forward the svga device might reuse mmio for general register accesses, in order to prepare for that we need to cleanup our naming and handling of fifo specific mmio reads and writes. As part of this work lets switch to managed mapping of the fifo mmio to make the error handling cleaner.
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 37 ++++++------ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 31 +++++----- drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 24 ++++---- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 83 +++++++++++++-------------- drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 13 ++--- drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 9 +-- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 14 ++--- 7 files changed, 98 insertions(+), 113 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +18 -19
@@ -683,7 +683,7 @@ static int vmw_driver_load(struct vmw_private *dev_priv, unsigned long chipset) dev_priv->io_start =pci_resource_start (pdev,0 ); dev_priv->vram_start =pci_resource_start (pdev,1 ); - dev_priv->mmio_start =pci_resource_start (pdev,2 ); + dev_priv->fifo_mem_start =pci_resource_start (pdev,2 ); dev_priv->assume_16bpp = !!vmw_assume_16bpp;
@@ -713,7 +713,7 @@ static int vmw_driver_load(struct vmw_private *dev_priv, unsigned long chipset) } dev_priv->vram_size =vmw_read (dev_priv,SVGA_REG_VRAM_SIZE ); - dev_priv->mmio_size =vmw_read (dev_priv,SVGA_REG_MEM_SIZE ); + dev_priv->fifo_mem_size =vmw_read (dev_priv,SVGA_REG_MEM_SIZE ); dev_priv->fb_max_width =vmw_read (dev_priv,SVGA_REG_MAX_WIDTH ); dev_priv->fb_max_height =vmw_read (dev_priv,SVGA_REG_MAX_HEIGHT );
@@ -797,19 +797,21 @@ static int vmw_driver_load(struct vmw_private *dev_priv, unsigned long chipset)DRM_INFO ("Max dedicated hypervisor surface memory is %u kiB\n" , (unsigned )dev_priv->memory_size /1024 ); } -DRM_INFO ("Maximum display memory size is %u kiB\n" , - dev_priv->prim_bb_mem /1024 ); -DRM_INFO ("VRAM at 0x%08x size is %u kiB\n" , - dev_priv->vram_start, dev_priv->vram_size /1024 ); -DRM_INFO ("MMIO at 0x%08x size is %u kiB\n" , - dev_priv->mmio_start, dev_priv->mmio_size /1024 ); - - dev_priv->mmio_virt =memremap (dev_priv->mmio_start, - dev_priv->mmio_size,MEMREMAP_WB ); - -if (unlikely (dev_priv->mmio_virt ==NULL )) { +DRM_INFO ("Maximum display memory size is %llu kiB\n" , + (uint64_t )dev_priv->prim_bb_mem /1024 ); +DRM_INFO ("VRAM at %pa size is %llu kiB\n" , + &dev_priv->vram_start, (uint64_t )dev_priv->vram_size /1024 ); +DRM_INFO ("MMIO at %pa size is %llu kiB\n" , + &dev_priv->fifo_mem_start, (uint64_t )dev_priv->fifo_mem_size /1024 ); + + dev_priv->fifo_mem =devm_memremap (dev_priv->drm.dev, + dev_priv->fifo_mem_start, + dev_priv->fifo_mem_size, +MEMREMAP_WB ); + +if (unlikely (dev_priv->fifo_mem ==NULL )) { ret = -ENOMEM ; -DRM_ERROR ("Failed mapping MMIO.\n" ); +DRM_ERROR ("Failed mapping the FIFO MMIO.\n" ); goto out_err0; }
@@ -819,7 +821,7 @@ static int vmw_driver_load(struct vmw_private *dev_priv, unsigned long chipset) !vmw_fifo_have_pitchlock(dev_priv)) { ret = -ENOSYS ;DRM_ERROR ("Hardware has no pitchlock\n" ); - goto out_err4; + goto out_err0; } dev_priv->tdev = ttm_object_device_init(&ttm_mem_glob, 12,
@@ -828,7 +830,7 @@ static int vmw_driver_load(struct vmw_private *dev_priv, unsigned long chipset)if (unlikely (dev_priv->tdev ==NULL )) {DRM_ERROR ("Unable to initialize TTM object management.\n" ); ret = -ENOMEM ; - goto out_err4; + goto out_err0; } dev_priv->drm.dev_private = dev_priv;
@@ -988,8 +990,6 @@ static int vmw_driver_load(struct vmw_private *dev_priv, unsigned long chipset)pci_release_regions (pdev); out_no_device:ttm_object_device_release (&dev_priv->tdev); -out_err4: -memunmap (dev_priv->mmio_virt); out_err0:for (i = vmw_res_context; i < vmw_res_max; ++i)idr_destroy (&dev_priv->res_idr[i]);
@@ -1037,7 +1037,6 @@ static void vmw_driver_unload(struct drm_device *dev)pci_release_regions (pdev);ttm_object_device_release (&dev_priv->tdev); -memunmap (dev_priv->mmio_virt);if (dev_priv->ctx.staged_bindings)vmw_binding_state_free (dev_priv->ctx.staged_bindings);
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +16 -15
@@ -496,12 +496,13 @@ struct vmw_private {struct drm_vma_offset_manager vma_manager;unsigned long vmw_chipset; -unsigned int io_start; -uint32_t vram_start; -uint32_t vram_size; -uint32_t prim_bb_mem; -uint32_t mmio_start; -uint32_t mmio_size; +resource_size_t io_start; +resource_size_t vram_start; +resource_size_t vram_size; +resource_size_t prim_bb_mem; +u32 *fifo_mem; +resource_size_t fifo_mem_start; +resource_size_t fifo_mem_size;uint32_t fb_max_width;uint32_t fb_max_height;uint32_t texture_max_width;
@@ -510,7 +511,6 @@ struct vmw_private {uint32_t stdu_max_height;uint32_t initial_width;uint32_t initial_height; -u32 *mmio_virt;uint32_t capabilities;uint32_t capabilities2;uint32_t max_gmr_ids;
@@ -1575,28 +1575,29 @@ static inline void vmw_fifo_resource_dec(struct vmw_private *dev_priv) }/** -* vmw_mmio_read - Perform a MMIO read from volatile memory +* vmw_fifo_mem_read - Perform a MMIO read from the fifo memory * -* @addr: The address to read from +* @fifo_reg: The fifo register to read from * * This function is intended to be equivalent to ioread32() on * memremap'd memory, but without byteswapping. */ -static inline u32 vmw_mmio_read (u32 *addr) +static inline u32 vmw_fifo_mem_read (struct vmw_private *vmw,uint32 fifo_reg) { -return READ_ONCE (*addr); +return READ_ONCE (*(vmw->fifo_mem + fifo_reg)); }/** -* vmw_mmio_write - Perform a MMIO write to volatile memory +* vmw_fifo_mem_write - Perform a MMIO write to volatile memory * -* @addr: The address to write to +* @addr: The fifo register to write to * * This function is intended to be equivalent to iowrite32 on * memremap'd memory, but without byteswapping. */ -static inline void vmw_mmio_write (u32 value,u32 *addr) +static inline void vmw_fifo_mem_write (struct vmw_private *vmw,u32 fifo_reg, +u32 value) { -WRITE_ONCE (*addr, value); +WRITE_ONCE (*(vmw->fifo_mem + fifo_reg), value); }#endif
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +10 -14
@@ -141,8 +141,7 @@ static bool vmw_fence_enable_signaling(struct dma_fence *f)struct vmw_fence_manager *fman =fman_from_fence (fence);struct vmw_private *dev_priv = fman->dev_priv; -u32 *fifo_mem = dev_priv->mmio_virt; -u32 seqno =vmw_mmio_read (fifo_mem +SVGA_FIFO_FENCE ); +u32 seqno =vmw_fifo_mem_read (dev_priv,SVGA_FIFO_FENCE );if (seqno - fence->base.seqno <VMW_FENCE_WRAP )return false;
@@ -401,14 +400,12 @@ static bool vmw_fence_goal_new_locked(struct vmw_fence_manager *fman, u32 passed_seqno) {u32 goal_seqno; -u32 *fifo_mem;struct vmw_fence_obj *fence;if (likely (!fman->seqno_valid))return false; - fifo_mem = fman->dev_priv->mmio_virt; - goal_seqno =vmw_mmio_read (fifo_mem +SVGA_FIFO_FENCE_GOAL ); + goal_seqno =vmw_fifo_mem_read (fman->dev_priv,SVGA_FIFO_FENCE_GOAL );if (likely (passed_seqno - goal_seqno >=VMW_FENCE_WRAP ))return false;
@@ -416,8 +413,9 @@ static bool vmw_fence_goal_new_locked(struct vmw_fence_manager *fman,list_for_each_entry (fence, &fman->fence_list, head) {if (!list_empty (&fence->seq_passed_actions)) { fman->seqno_valid = true; -vmw_mmio_write (fence->base.seqno, - fifo_mem +SVGA_FIFO_FENCE_GOAL ); +vmw_fifo_mem_write (fman->dev_priv, +SVGA_FIFO_FENCE_GOAL , + fence->base.seqno);break ; } }
@@ -445,18 +443,17 @@ static bool vmw_fence_goal_check_locked(struct vmw_fence_obj *fence) {struct vmw_fence_manager *fman =fman_from_fence (fence);u32 goal_seqno; -u32 *fifo_mem;if (dma_fence_is_signaled_locked (&fence->base))return false; - fifo_mem = fman->dev_priv->mmio_virt; - goal_seqno =vmw_mmio_read (fifo_mem +SVGA_FIFO_FENCE_GOAL ); + goal_seqno =vmw_fifo_mem_read (fman->dev_priv,SVGA_FIFO_FENCE_GOAL );if (likely (fman->seqno_valid && goal_seqno - fence->base.seqno <VMW_FENCE_WRAP ))return false; -vmw_mmio_write (fence->base.seqno, fifo_mem +SVGA_FIFO_FENCE_GOAL ); +vmw_fifo_mem_write (fman->dev_priv,SVGA_FIFO_FENCE_GOAL , + fence->base.seqno); fman->seqno_valid = true;return true;
@@ -468,9 +465,8 @@ static void __vmw_fences_update(struct vmw_fence_manager *fman)struct list_head action_list;bool needs_rerun;uint32_t seqno, new_seqno; -u32 *fifo_mem = fman->dev_priv->mmio_virt; - seqno =vmw_mmio_read (fifo_mem +SVGA_FIFO_FENCE ); + seqno =vmw_fifo_mem_read (fman->dev_priv,SVGA_FIFO_FENCE ); rerun:list_for_each_entry_safe (fence, next_fence, &fman->fence_list, head) {if (seqno - fence->base.seqno <VMW_FENCE_WRAP ) {
@@ -492,7 +488,7 @@ static void __vmw_fences_update(struct vmw_fence_manager *fman) needs_rerun =vmw_fence_goal_new_locked (fman, seqno);if (unlikely (needs_rerun)) { - new_seqno =vmw_mmio_read (fifo_mem +SVGA_FIFO_FENCE ); + new_seqno =vmw_fifo_mem_read (fman->dev_priv,SVGA_FIFO_FENCE );if (new_seqno != seqno) { seqno = new_seqno; goto rerun;
drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +39 -44
232 lines not on this page · raw message
drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c +6 -7
@@ -67,7 +67,6 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data,break ;case DRM_VMW_PARAM_FIFO_HW_VERSION : { -u32 *fifo_mem = dev_priv->mmio_virt;const struct vmw_fifo_state *fifo = &dev_priv->fifo;if ((dev_priv->capabilities &SVGA_CAP_GBOBJECTS )) {
@@ -76,11 +75,11 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data, } param->value = -vmw_mmio_read (fifo_mem + - ((fifo->capabilities & -SVGA_FIFO_CAP_3D_HWVERSION_REVISED ) ? -SVGA_FIFO_3D_HWVERSION_REVISED : -SVGA_FIFO_3D_HWVERSION )); +vmw_fifo_mem_read (dev_priv, + ((fifo->capabilities & +SVGA_FIFO_CAP_3D_HWVERSION_REVISED ) ? +SVGA_FIFO_3D_HWVERSION_REVISED : +SVGA_FIFO_3D_HWVERSION ));break ; }case DRM_VMW_PARAM_MAX_SURF_MEMORY :
@@ -235,7 +234,7 @@ int vmw_get_cap_3d_ioctl(struct drm_device *dev, void *data,if (unlikely (ret !=0 )) goto out_err; }else { - fifo_mem = dev_priv->mmio_virt; + fifo_mem = dev_priv->fifo_mem;memcpy (bounce, &fifo_mem[SVGA_FIFO_3D_CAPS ], size); }
drivers/gpu/drm/vmwgfx/vmwgfx_irq.c +3 -6
@@ -117,8 +117,7 @@ static bool vmw_fifo_idle(struct vmw_private *dev_priv, uint32_t seqno)void vmw_update_seqno (struct vmw_private *dev_priv,struct vmw_fifo_state *fifo_state) { -u32 *fifo_mem = dev_priv->mmio_virt; -uint32_t seqno =vmw_mmio_read (fifo_mem +SVGA_FIFO_FENCE ); +uint32_t seqno =vmw_fifo_mem_read (dev_priv,SVGA_FIFO_FENCE );if (dev_priv->last_read_seqno != seqno) { dev_priv->last_read_seqno = seqno;
@@ -222,11 +221,9 @@ int vmw_fallback_wait(struct vmw_private *dev_priv, } }finish_wait (&dev_priv->fence_queue, &__wait); -if (ret ==0 && fifo_idle) { -u32 *fifo_mem = dev_priv->mmio_virt; +if (ret ==0 && fifo_idle) +vmw_fifo_mem_write (dev_priv,SVGA_FIFO_FENCE , signal_seq); -vmw_mmio_write (signal_seq, fifo_mem +SVGA_FIFO_FENCE ); - }wake_up_all (&dev_priv->fence_queue); out_err:if (fifo_idle)
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +6 -8
@@ -128,15 +128,14 @@ static int vmw_cursor_update_bo(struct vmw_private *dev_priv,static void vmw_cursor_update_position (struct vmw_private *dev_priv,bool show,int x,int y) { -u32 *fifo_mem = dev_priv->mmio_virt;uint32_t count;spin_lock (&dev_priv->cursor_lock); -vmw_mmio_write (show ?1 :0 , fifo_mem +SVGA_FIFO_CURSOR_ON ); -vmw_mmio_write (x, fifo_mem +SVGA_FIFO_CURSOR_X ); -vmw_mmio_write (y, fifo_mem +SVGA_FIFO_CURSOR_Y ); - count =vmw_mmio_read (fifo_mem +SVGA_FIFO_CURSOR_COUNT ); -vmw_mmio_write (++count, fifo_mem +SVGA_FIFO_CURSOR_COUNT ); +vmw_fifo_mem_write (dev_priv,SVGA_FIFO_CURSOR_ON , show ?1 :0 ); +vmw_fifo_mem_write (dev_priv,SVGA_FIFO_CURSOR_X , x); +vmw_fifo_mem_write (dev_priv,SVGA_FIFO_CURSOR_Y , y); + count =vmw_fifo_mem_read (dev_priv,SVGA_FIFO_CURSOR_COUNT ); +vmw_fifo_mem_write (dev_priv,SVGA_FIFO_CURSOR_COUNT , ++count);spin_unlock (&dev_priv->cursor_lock); }
@@ -1876,8 +1875,7 @@ int vmw_kms_write_svga(struct vmw_private *vmw_priv,if (vmw_priv->capabilities &SVGA_CAP_PITCHLOCK )vmw_write (vmw_priv,SVGA_REG_PITCHLOCK , pitch);else if (vmw_fifo_have_pitchlock (vmw_priv)) -vmw_mmio_write (pitch, vmw_priv->mmio_virt + -SVGA_FIFO_PITCHLOCK ); +vmw_fifo_mem_write (vmw_priv,SVGA_FIFO_PITCHLOCK , pitch);vmw_write (vmw_priv,SVGA_REG_WIDTH , width);vmw_write (vmw_priv,SVGA_REG_HEIGHT , height);vmw_write (vmw_priv,SVGA_REG_BITS_PER_PIXEL , bpp);
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 5/8 drm/vmwgfx: Cleanup pci resource allocation
In reply to Zack RusinInstead of doing it in multiple spots lets centralize the code to handle pci resources. This also cleans up the error handling a bit and will make it a lot easier to add additional svga versions to the driver.
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 113 +++++++++++++++++----------- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 5 +- 2 files changed, 73 insertions(+), 45 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +70 -43
@@ -43,8 +43,6 @@#include "vmwgfx_drv.h" #define VMWGFX_DRIVER_DESC "Linux drm driver for VMware graphics devices" -#define VMWGFX_CHIP_SVGAII 0 -#define VMW_FB_RESERVATION 0#define VMW_MIN_INITIAL_WIDTH 800#define VMW_MIN_INITIAL_HEIGHT 600
@@ -253,8 +251,8 @@ static const struct drm_ioctl_desc vmw_ioctls[] = { };static const struct pci_device_id vmw_pci_id_list[] = { - {0x15ad ,0x0405 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,VMWGFX_CHIP_SVGAII }, - {0 ,0 ,0 } + {PCI_DEVICE (0x15ad ,VMWGFX_PCI_ID_SVGA2 ) }, + { } };MODULE_DEVICE_TABLE (pci, vmw_pci_id_list);
@@ -644,19 +642,83 @@ static void vmw_vram_manager_fini(struct vmw_private *dev_priv)#endif } -static int vmw_driver_load (struct vmw_private *dev_priv,unsigned long chipset) +static int vmw_setup_pci_resources (struct vmw_private *dev, +unsigned long pci_id) { +resource_size_t fifo_start; +resource_size_t fifo_size;int ret; +struct pci_dev *pdev =to_pci_dev (dev->drm.dev); + +pci_set_master (pdev); + + ret =pci_request_regions (pdev,"vmwgfx probe" ); +if (ret) +return ret; + + dev->io_start =pci_resource_start (pdev,0 ); + dev->vram_start =pci_resource_start (pdev,1 ); + dev->vram_size =pci_resource_len (pdev,1 ); + fifo_start =pci_resource_start (pdev,2 ); + fifo_size =pci_resource_len (pdev,2 ); + +DRM_INFO ("FIFO at %pa size is %llu kiB\n" , + &fifo_start, (uint64_t )fifo_size /1024 ); + dev->fifo_mem =devm_memremap (dev->drm.dev, + fifo_start, + fifo_size, +MEMREMAP_WB ); + +if (unlikely (dev->fifo_mem ==NULL )) { +DRM_ERROR ("Failed mapping FIFO memory.\n" ); +return -ENOMEM ; + } + +/* +* This is approximate size of the vram, the exact size will only +* be known after we read SVGA_REG_VRAM_SIZE. The PCI resource +* size will be equal to or bigger than the size reported by +* SVGA_REG_VRAM_SIZE. +*/ +DRM_INFO ("VRAM at %pa size is %llu kiB\n" , + &dev->vram_start, (uint64_t )dev->vram_size /1024 ); + +return 0 ; +} + +static int vmw_detect_version (struct vmw_private *dev) +{uint32_t svga_id; + +vmw_write (dev,SVGA_REG_ID ,SVGA_ID_2 ); + svga_id =vmw_read (dev,SVGA_REG_ID ); +if (svga_id !=SVGA_ID_2 ) { +DRM_ERROR ("Unsupported SVGA ID 0x%x on chipset 0x%x\n" , + svga_id, dev->vmw_chipset); +return -ENOSYS ; + } +return 0 ; +} + +static int vmw_driver_load (struct vmw_private *dev_priv,u32 pci_id) +{ +int ret;enum vmw_res_type i;bool refuse_dma = false;char host_log[100 ] = {0 };struct pci_dev *pdev =to_pci_dev (dev_priv->drm.dev); -pci_set_master (pdev); - - dev_priv->vmw_chipset = chipset; + dev_priv->vmw_chipset = pci_id; dev_priv->last_read_seqno = (uint32_t )-100 ; + dev_priv->drm.dev_private = dev_priv; + + ret =vmw_setup_pci_resources (dev_priv, pci_id); +if (ret) +return ret; + ret =vmw_detect_version (dev_priv); +if (ret) +return ret; +mutex_init (&dev_priv->cmdbuf_mutex);mutex_init (&dev_priv->release_mutex);mutex_init (&dev_priv->binding_mutex);
@@ -681,21 +743,10 @@ static int vmw_driver_load(struct vmw_private *dev_priv, unsigned long chipset) dev_priv->used_memory_size =0 ; - dev_priv->io_start =pci_resource_start (pdev,0 ); - dev_priv->vram_start =pci_resource_start (pdev,1 ); - dev_priv->fifo_mem_start =pci_resource_start (pdev,2 ); - dev_priv->assume_16bpp = !!vmw_assume_16bpp; dev_priv->enable_fb = enable_fbdev; -vmw_write (dev_priv,SVGA_REG_ID ,SVGA_ID_2 ); - svga_id =vmw_read (dev_priv,SVGA_REG_ID ); -if (svga_id !=SVGA_ID_2 ) { - ret = -ENOSYS ; -DRM_ERROR ("Unsupported SVGA ID 0x%x\n" , svga_id); - goto out_err0; - } dev_priv->capabilities =vmw_read (dev_priv,SVGA_REG_CAPABILITIES );
@@ -799,21 +850,6 @@ static int vmw_driver_load(struct vmw_private *dev_priv, unsigned long chipset) }DRM_INFO ("Maximum display memory size is %llu kiB\n" , (uint64_t )dev_priv->prim_bb_mem /1024 ); -DRM_INFO ("VRAM at %pa size is %llu kiB\n" , - &dev_priv->vram_start, (uint64_t )dev_priv->vram_size /1024 ); -DRM_INFO ("MMIO at %pa size is %llu kiB\n" , - &dev_priv->fifo_mem_start, (uint64_t )dev_priv->fifo_mem_size /1024 ); - - dev_priv->fifo_mem =devm_memremap (dev_priv->drm.dev, - dev_priv->fifo_mem_start, - dev_priv->fifo_mem_size, -MEMREMAP_WB ); - -if (unlikely (dev_priv->fifo_mem ==NULL )) { - ret = -ENOMEM ; -DRM_ERROR ("Failed mapping the FIFO MMIO.\n" ); - goto out_err0; - }/* Need mmio memory to check for fifo pitchlock cap. */ if (!(dev_priv->capabilities & SVGA_CAP_DISPLAY_TOPOLOGY) &&
@@ -833,14 +869,6 @@ static int vmw_driver_load(struct vmw_private *dev_priv, unsigned long chipset) goto out_err0; } - dev_priv->drm.dev_private = dev_priv; - - ret =pci_request_regions (pdev,"vmwgfx probe" ); -if (ret) { -DRM_ERROR ("Failed reserving PCI regions.\n" ); - goto out_no_device; - } -if (dev_priv->capabilities &SVGA_CAP_IRQMASK ) { ret =vmw_irq_install (&dev_priv->drm, pdev->irq);if (ret !=0 ) {
@@ -988,7 +1016,6 @@ static int vmw_driver_load(struct vmw_private *dev_priv, unsigned long chipset)vmw_irq_uninstall (&dev_priv->drm); out_no_irq:pci_release_regions (pdev); -out_no_device:ttm_object_device_release (&dev_priv->tdev); out_err0:for (i = vmw_res_context; i < vmw_res_max; ++i)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +3 -2
@@ -66,6 +66,8 @@#define VMWGFX_CMD_BOUNCE_INIT_SIZE 32768#define VMWGFX_ENABLE_SCREEN_TARGET_OTABLE 1 +#define VMWGFX_PCI_ID_SVGA2 0x0405 +/* * Perhaps we should have sysfs entries for these. */
@@ -495,13 +497,12 @@ struct vmw_private {struct vmw_fifo_state fifo;struct drm_vma_offset_manager vma_manager; -unsigned long vmw_chipset; +u32 vmw_chipset;resource_size_t io_start;resource_size_t vram_start;resource_size_t vram_size;resource_size_t prim_bb_mem;u32 *fifo_mem; -resource_size_t fifo_mem_start;resource_size_t fifo_mem_size;uint32_t fb_max_width;uint32_t fb_max_height;
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 6/8 drm/vmwgfx: Remove the throttling code
In reply to Zack RusinThrottling was used before fencing to implement early vsync support in the xorg state tracker a long time ago. The xorg state tracker has been removed years ago and no one else has ever used throttling. It's time to remove this code, it hasn't been used or tested in years.
--- drivers/gpu/drm/vmwgfx/Makefile | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 21 ---- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 4 - drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 1 - drivers/gpu/drm/vmwgfx/vmwgfx_marker.c | 155 ------------------------ 6 files changed, 3 insertions(+), 188 deletions(-) delete mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
drivers/gpu/drm/vmwgfx/Makefile +2 -2
@@ -2,8 +2,8 @@ vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \ vmwgfx_fb.o vmwgfx_ioctl.o vmwgfx_resource.o vmwgfx_ttm_buffer.o \ vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \ - vmwgfx_overlay.o vmwgfx_marker.o vmwgfx_gmrid_manager.o \ - vmwgfx_fence.o vmwgfx_bo.o vmwgfx_scrn.o vmwgfx_context.o \ + vmwgfx_overlay.o vmwgfx_gmrid_manager.o vmwgfx_fence.o \ + vmwgfx_bo.o vmwgfx_scrn.o vmwgfx_context.o \ vmwgfx_surface.o vmwgfx_prime.o vmwgfx_mob.o vmwgfx_shader.o \ vmwgfx_cmdbuf_res.o vmwgfx_cmdbuf.o vmwgfx_stdu.o \ vmwgfx_cotable.o vmwgfx_so.o vmwgfx_binding.o vmwgfx_msg.o \
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +0 -21
@@ -276,13 +276,6 @@ struct vmw_surface {struct list_head view_list; }; -struct vmw_marker_queue { -struct list_head head; -u64 lag; -u64 lag_time; -spinlock_t lock; -}; -struct vmw_fifo_state {unsigned long reserved_size;u32 *dynamic_buffer;
@@ -292,7 +285,6 @@ struct vmw_fifo_state {uint32_t capabilities;struct mutex fifo_mutex;struct rw_semaphore rwsem; -struct vmw_marker_queue marker_queue;bool dx; };
@@ -1120,19 +1112,6 @@ extern void vmw_generic_waiter_add(struct vmw_private *dev_priv, u32 flag,extern void vmw_generic_waiter_remove (struct vmw_private *dev_priv,u32 flag,int *waiter_count); -/** -* Rudimentary fence-like objects currently used only for throttling - -* vmwgfx_marker.c -*/ - -extern void vmw_marker_queue_init (struct vmw_marker_queue *queue); -extern void vmw_marker_queue_takedown (struct vmw_marker_queue *queue); -extern int vmw_marker_push (struct vmw_marker_queue *queue, -uint32_t seqno); -extern int vmw_marker_pull (struct vmw_marker_queue *queue, -uint32_t signaled_seqno); -extern int vmw_wait_lag (struct vmw_private *dev_priv, -struct vmw_marker_queue *queue,uint32_t us);/** * Kernel framebuffer - vmwgfx_fb.c
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +1 -5
@@ -4046,11 +4046,7 @@ int vmw_execbuf_process(struct drm_file *file_priv, }if (throttle_us) { - ret =vmw_wait_lag (dev_priv, &dev_priv->fifo.marker_queue, - throttle_us); - -if (ret) - goto out_free_fence_fd; +VMW_DEBUG_USER ("Throttling is no longer supported.\n" ); } kernel_commands = vmw_execbuf_cmdbuf(dev_priv, user_commands,
drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +0 -4
@@ -157,7 +157,6 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)atomic_set (&dev_priv->marker_seq, dev_priv->last_read_seqno);vmw_fifo_mem_write (dev_priv,SVGA_FIFO_FENCE , dev_priv->last_read_seqno); -vmw_marker_queue_init (&fifo->marker_queue);return 0 ; }
@@ -185,8 +184,6 @@ void vmw_fifo_release(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)vmw_write (dev_priv,SVGA_REG_TRACES , dev_priv->traces_state); -vmw_marker_queue_takedown (&fifo->marker_queue); -if (likely (fifo->static_buffer !=NULL )) {vfree (fifo->static_buffer); fifo->static_buffer =NULL ;
@@ -563,7 +560,6 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno) cmd_fence = (struct svga_fifo_cmd_fence *) fm; cmd_fence->fence = *seqno;vmw_fifo_commit_flush (dev_priv, bytes); - (void )vmw_marker_push (&fifo_state->marker_queue, *seqno);vmw_update_seqno (dev_priv, fifo_state); out_err:
drivers/gpu/drm/vmwgfx/vmwgfx_irq.c +0 -1
@@ -121,7 +121,6 @@ void vmw_update_seqno(struct vmw_private *dev_priv,if (dev_priv->last_read_seqno != seqno) { dev_priv->last_read_seqno = seqno; -vmw_marker_pull (&fifo_state->marker_queue, seqno);vmw_fences_update (dev_priv->fman); } }
drivers/gpu/drm/vmwgfx/vmwgfx_marker.c deleted +0 -155
155 lines not on this page · raw message
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 7/8 drm/vmwgfx: Cleanup the cmd/fifo split
In reply to Zack RusinLets try to cleanup the usage of the term FIFO which we used for both our MMIO based cmd queue processing and for general command processing which could have been using command buffers interface. We're going to rename the functions which are processing commands (and work either via MMIO or command buffers) as _cmd_ and functions which operate on the MMIO based commands as FIFO to match the SVGA device naming.
---
drivers/gpu/drm/vmwgfx/Makefile | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 52 +++++++++----------
.../vmwgfx/{vmwgfx_fifo.c => vmwgfx_cmd.c} | 40 +++++++-------
drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 14 ++---
drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 40 +++++++-------
drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 12 ++---
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 3 +-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 30 +++++------
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 16 +++---
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 8 +--
drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 21 ++++----
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 16 +++---
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 8 +--
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 24 ++++-----
drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 24 ++++-----
drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 8 +--
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 28 +++++-----
drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c | 8 +--
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 40 +++++++-------
23 files changed, 199 insertions(+), 207 deletions(-)
rename drivers/gpu/drm/vmwgfx/{vmwgfx_fifo.c => vmwgfx_cmd.c} (94%)drivers/gpu/drm/vmwgfx/Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \ vmwgfx_fb.o vmwgfx_ioctl.o vmwgfx_resource.o vmwgfx_ttm_buffer.o \ - vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \ + vmwgfx_cmd.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \ vmwgfx_overlay.o vmwgfx_gmrid_manager.o vmwgfx_fence.o \ vmwgfx_bo.o vmwgfx_scrn.o vmwgfx_context.o \ vmwgfx_surface.o vmwgfx_prime.o vmwgfx_mob.o vmwgfx_shader.o \
drivers/gpu/drm/vmwgfx/vmwgfx_binding.c +26 -26
208 lines not on this page · raw message
drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c renamed from drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +21 -19
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 OR MIT /************************************************************************** * -* Copyright 2009-2015 VMware, Inc., Palo Alto, CA., USA +* Copyright 2009-2020 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
@@ -36,7 +36,7 @@ struct vmw_temp_set_context {SVGA3dCmdDXTempSetContext body; }; -bool vmw_fifo_have_3d (struct vmw_private *dev_priv) +bool vmw_supports_3d (struct vmw_private *dev_priv) {uint32_t fifo_min, hwversion;const struct vmw_fifo_state *fifo = &dev_priv->fifo;
@@ -66,10 +66,10 @@ bool vmw_fifo_have_3d(struct vmw_private *dev_priv)return false; hwversion =vmw_fifo_mem_read (dev_priv, - ((fifo->capabilities & -SVGA_FIFO_CAP_3D_HWVERSION_REVISED ) ? -SVGA_FIFO_3D_HWVERSION_REVISED : -SVGA_FIFO_3D_HWVERSION )); + ((fifo->capabilities & +SVGA_FIFO_CAP_3D_HWVERSION_REVISED ) ? +SVGA_FIFO_3D_HWVERSION_REVISED : +SVGA_FIFO_3D_HWVERSION ));if (hwversion ==0 )return false;
@@ -126,6 +126,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)vmw_write (dev_priv,SVGA_REG_ENABLE ,SVGA_REG_ENABLE_ENABLE |SVGA_REG_ENABLE_HIDE ); +vmw_write (dev_priv,SVGA_REG_TRACES ,0 ); min =4 ;
@@ -373,7 +374,7 @@ static void *vmw_local_fifo_reserve(struct vmw_private *dev_priv,return NULL ; } -void *vmw_fifo_reserve_dx (struct vmw_private *dev_priv,uint32_t bytes, +void *vmw_cmd_ctx_reserve (struct vmw_private *dev_priv,uint32_t bytes,int ctx_id) {void *ret;
@@ -484,7 +485,7 @@ static void vmw_local_fifo_commit(struct vmw_private *dev_priv, uint32_t bytes)mutex_unlock (&fifo_state->fifo_mutex); } -void vmw_fifo_commit (struct vmw_private *dev_priv,uint32_t bytes) +void vmw_cmd_commit (struct vmw_private *dev_priv,uint32_t bytes) {if (dev_priv->cman)vmw_cmdbuf_commit (dev_priv->cman, bytes,NULL , false);
@@ -499,7 +500,7 @@ void vmw_fifo_commit(struct vmw_private *dev_priv, uint32_t bytes)* @dev_priv: Pointer to device private structure. * @bytes: Number of bytes to commit. */ -void vmw_fifo_commit_flush (struct vmw_private *dev_priv,uint32_t bytes) +void vmw_cmd_commit_flush (struct vmw_private *dev_priv,uint32_t bytes) {if (dev_priv->cman)vmw_cmdbuf_commit (dev_priv->cman, bytes,NULL , true);
@@ -514,7 +515,7 @@ void vmw_fifo_commit_flush(struct vmw_private *dev_priv, uint32_t bytes)* @dev_priv: Pointer to device private structure. * @interruptible: Whether to wait interruptible if function needs to sleep. */ -int vmw_fifo_flush (struct vmw_private *dev_priv,bool interruptible) +int vmw_cmd_flush (struct vmw_private *dev_priv,bool interruptible) {might_sleep ();
@@ -524,7 +525,7 @@ int vmw_fifo_flush(struct vmw_private *dev_priv, bool interruptible)return 0 ; } -int vmw_fifo_send_fence (struct vmw_private *dev_priv,uint32_t *seqno) +int vmw_cmd_send_fence (struct vmw_private *dev_priv,uint32_t *seqno) {struct vmw_fifo_state *fifo_state = &dev_priv->fifo;struct svga_fifo_cmd_fence *cmd_fence;
@@ -532,7 +533,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)int ret =0 ;uint32_t bytes =sizeof (u32) +sizeof (*cmd_fence); - fm =VMW_FIFO_RESERVE (dev_priv, bytes); + fm =VMW_CMD_RESERVE (dev_priv, bytes);if (unlikely (fm ==NULL )) { *seqno =atomic_read (&dev_priv->marker_seq); ret = -ENOMEM ;
@@ -552,14 +553,14 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)* waiting code in vmwgfx_irq.c will emulate this. */ -vmw_fifo_commit (dev_priv,0 ); +vmw_cmd_commit (dev_priv,0 );return 0 ; } *fm++ =SVGA_CMD_FENCE ; cmd_fence = (struct svga_fifo_cmd_fence *) fm; cmd_fence->fence = *seqno; -vmw_fifo_commit_flush (dev_priv, bytes); +vmw_cmd_commit_flush (dev_priv, bytes);vmw_update_seqno (dev_priv, fifo_state); out_err:
@@ -590,7 +591,7 @@ static int vmw_fifo_emit_dummy_legacy_query(struct vmw_private *dev_priv,SVGA3dCmdWaitForQuery body; } *cmd; - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -607,7 +608,7 @@ static int vmw_fifo_emit_dummy_legacy_query(struct vmw_private *dev_priv, cmd->body.guestResult.offset =0 ; } -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));return 0 ; }
@@ -636,7 +637,7 @@ static int vmw_fifo_emit_dummy_gb_query(struct vmw_private *dev_priv,SVGA3dCmdWaitForGBQuery body; } *cmd; - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -648,7 +649,7 @@ static int vmw_fifo_emit_dummy_gb_query(struct vmw_private *dev_priv, cmd->body.mobid = bo->mem.start; cmd->body.offset =0 ; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));return 0 ; }
@@ -672,7 +673,7 @@ static int vmw_fifo_emit_dummy_gb_query(struct vmw_private *dev_priv,* * Returns -ENOMEM on failure to reserve fifo space. */ -int vmw_fifo_emit_dummy_query (struct vmw_private *dev_priv, +int vmw_cmd_emit_dummy_query (struct vmw_private *dev_priv,uint32_t cid) {if (dev_priv->has_mob)
@@ -680,3 +681,4 @@ int vmw_fifo_emit_dummy_query(struct vmw_private *dev_priv,return vmw_fifo_emit_dummy_legacy_query (dev_priv, cid); } +
drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c +5 -9
@@ -610,7 +610,7 @@ static void vmw_cmdbuf_work_func(struct work_struct *work)/* Send a new fence in case one was removed */ if (send_fence) { -vmw_fifo_send_fence (man->dev_priv, &dummy); +vmw_cmd_send_fence (man->dev_priv, &dummy);wake_up_all (&man->idle_queue); }
@@ -1208,18 +1208,14 @@ static int vmw_cmdbuf_startstop(struct vmw_cmdbuf_man *man, u32 context,* * @man: The command buffer manager. * @size: The size of the main space pool. -* @default_size: The default size of the command buffer for small kernel -* submissions. * -* Set the size and allocate the main command buffer space pool, -* as well as the default size of the command buffer for -* small kernel submissions. If successful, this enables large command -* submissions. Note that this function requires that rudimentary command +* Set the size and allocate the main command buffer space pool. +* If successful, this enables large command submissions. +* Note that this function requires that rudimentary command * submission is already available and that the MOB memory manager is alive. * Returns 0 on success. Negative error code on failure. */ -int vmw_cmdbuf_set_pool_size (struct vmw_cmdbuf_man *man, -size_t size,size_t default_size) +int vmw_cmdbuf_set_pool_size (struct vmw_cmdbuf_man *man,size_t size) {struct vmw_private *dev_priv = man->dev_priv;bool dummy;
drivers/gpu/drm/vmwgfx/vmwgfx_context.c +20 -20
@@ -163,7 +163,7 @@ static void vmw_hw_context_destroy(struct vmw_resource *res) }vmw_execbuf_release_pinned_bo (dev_priv); - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL ))return ;
@@ -171,7 +171,7 @@ static void vmw_hw_context_destroy(struct vmw_resource *res) cmd->header.size =sizeof (cmd->body); cmd->body.cid = res->id; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));vmw_fifo_resource_dec (dev_priv); }
@@ -265,7 +265,7 @@ static int vmw_context_init(struct vmw_private *dev_priv,return -ENOMEM ; } - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL )) {vmw_resource_unreference (&res);return -ENOMEM ;
@@ -275,7 +275,7 @@ static int vmw_context_init(struct vmw_private *dev_priv, cmd->header.size =sizeof (cmd->body); cmd->body.cid = res->id; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));vmw_fifo_resource_inc (dev_priv); res->hw_destroy = vmw_hw_context_destroy;return 0 ;
@@ -316,7 +316,7 @@ static int vmw_gb_context_create(struct vmw_resource *res) goto out_no_fifo; } - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL )) { ret = -ENOMEM ; goto out_no_fifo;
@@ -325,7 +325,7 @@ static int vmw_gb_context_create(struct vmw_resource *res) cmd->header.id =SVGA_3D_CMD_DEFINE_GB_CONTEXT ; cmd->header.size =sizeof (cmd->body); cmd->body.cid = res->id; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));vmw_fifo_resource_inc (dev_priv);return 0 ;
@@ -348,7 +348,7 @@ static int vmw_gb_context_bind(struct vmw_resource *res,BUG_ON (bo->mem.mem_type !=VMW_PL_MOB ); - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -358,7 +358,7 @@ static int vmw_gb_context_bind(struct vmw_resource *res, cmd->body.mobid = bo->mem.start; cmd->body.validContents = res->backup_dirty; res->backup_dirty = false; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));return 0 ; }
@@ -392,7 +392,7 @@ static int vmw_gb_context_unbind(struct vmw_resource *res, submit_size =sizeof (*cmd2) + (readback ?sizeof (*cmd1) :0 ); - cmd =VMW_FIFO_RESERVE (dev_priv, submit_size); + cmd =VMW_CMD_RESERVE (dev_priv, submit_size);if (unlikely (cmd ==NULL )) {mutex_unlock (&dev_priv->binding_mutex);return -ENOMEM ;
@@ -411,7 +411,7 @@ static int vmw_gb_context_unbind(struct vmw_resource *res, cmd2->body.cid = res->id; cmd2->body.mobid =SVGA3D_INVALID_ID ; -vmw_fifo_commit (dev_priv, submit_size); +vmw_cmd_commit (dev_priv, submit_size);mutex_unlock (&dev_priv->binding_mutex);/*
@@ -440,14 +440,14 @@ static int vmw_gb_context_destroy(struct vmw_resource *res)if (likely (res->id ==-1 ))return 0 ; - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL ))return -ENOMEM ; cmd->header.id =SVGA_3D_CMD_DESTROY_GB_CONTEXT ; cmd->header.size =sizeof (cmd->body); cmd->body.cid = res->id; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));if (dev_priv->query_cid == res->id) dev_priv->query_cid_valid = false;vmw_resource_release_id (res);
@@ -483,7 +483,7 @@ static int vmw_dx_context_create(struct vmw_resource *res) goto out_no_fifo; } - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL )) { ret = -ENOMEM ; goto out_no_fifo;
@@ -492,7 +492,7 @@ static int vmw_dx_context_create(struct vmw_resource *res) cmd->header.id =SVGA_3D_CMD_DX_DEFINE_CONTEXT ; cmd->header.size =sizeof (cmd->body); cmd->body.cid = res->id; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));vmw_fifo_resource_inc (dev_priv);return 0 ;
@@ -515,7 +515,7 @@ static int vmw_dx_context_bind(struct vmw_resource *res,BUG_ON (bo->mem.mem_type !=VMW_PL_MOB ); - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -525,7 +525,7 @@ static int vmw_dx_context_bind(struct vmw_resource *res, cmd->body.mobid = bo->mem.start; cmd->body.validContents = res->backup_dirty; res->backup_dirty = false; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));return 0 ;
@@ -608,7 +608,7 @@ static int vmw_dx_context_unbind(struct vmw_resource *res, submit_size =sizeof (*cmd2) + (readback ?sizeof (*cmd1) :0 ); - cmd =VMW_FIFO_RESERVE (dev_priv, submit_size); + cmd =VMW_CMD_RESERVE (dev_priv, submit_size);if (unlikely (cmd ==NULL )) {mutex_unlock (&dev_priv->binding_mutex);return -ENOMEM ;
@@ -627,7 +627,7 @@ static int vmw_dx_context_unbind(struct vmw_resource *res, cmd2->body.cid = res->id; cmd2->body.mobid =SVGA3D_INVALID_ID ; -vmw_fifo_commit (dev_priv, submit_size); +vmw_cmd_commit (dev_priv, submit_size);mutex_unlock (&dev_priv->binding_mutex);/*
@@ -656,14 +656,14 @@ static int vmw_dx_context_destroy(struct vmw_resource *res)if (likely (res->id ==-1 ))return 0 ; - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL ))return -ENOMEM ; cmd->header.id =SVGA_3D_CMD_DX_DESTROY_CONTEXT ; cmd->header.size =sizeof (cmd->body); cmd->body.cid = res->id; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));if (dev_priv->query_cid == res->id) dev_priv->query_cid_valid = false;vmw_resource_release_id (res);
drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c +6 -6
@@ -175,7 +175,7 @@ static int vmw_cotable_unscrub(struct vmw_resource *res)WARN_ON_ONCE (bo->mem.mem_type !=VMW_PL_MOB );dma_resv_assert_held (bo->base.resv); - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (!cmd)return -ENOMEM ;
@@ -188,7 +188,7 @@ static int vmw_cotable_unscrub(struct vmw_resource *res) cmd->body.mobid = bo->mem.start; cmd->body.validSizeInBytes = vcotbl->size_read_back; -vmw_fifo_commit_flush (dev_priv,sizeof (*cmd)); +vmw_cmd_commit_flush (dev_priv,sizeof (*cmd)); vcotbl->scrubbed = false;return 0 ;
@@ -263,7 +263,7 @@ int vmw_cotable_scrub(struct vmw_resource *res, bool readback)if (readback) submit_size +=sizeof (*cmd0); - cmd1 =VMW_FIFO_RESERVE (dev_priv, submit_size); + cmd1 =VMW_CMD_RESERVE (dev_priv, submit_size);if (!cmd1)return -ENOMEM ;
@@ -283,7 +283,7 @@ int vmw_cotable_scrub(struct vmw_resource *res, bool readback) cmd1->body.type = vcotbl->type; cmd1->body.mobid =SVGA3D_INVALID_ID ; cmd1->body.validSizeInBytes =0 ; -vmw_fifo_commit_flush (dev_priv, submit_size); +vmw_cmd_commit_flush (dev_priv, submit_size); vcotbl->scrubbed = true;/* Trigger a create() on next validate. */
@@ -349,7 +349,7 @@ static int vmw_cotable_readback(struct vmw_resource *res)struct vmw_fence_obj *fence;if (!vcotbl->scrubbed) { - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (!cmd)return -ENOMEM ;
@@ -358,7 +358,7 @@ static int vmw_cotable_readback(struct vmw_resource *res) cmd->body.cid = vcotbl->ctx->id; cmd->body.type = vcotbl->type; vcotbl->size_read_back = res->backup_size; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd)); } (void )vmw_execbuf_fence_commands (NULL , dev_priv, &fence,NULL );
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +1 -2
@@ -423,8 +423,7 @@ static int vmw_request_device_late(struct vmw_private *dev_priv) }if (dev_priv->cman) { - ret =vmw_cmdbuf_set_pool_size (dev_priv->cman, -256 *4096 ,2 *4096 ); + ret =vmw_cmdbuf_set_pool_size (dev_priv->cman,256 *4096 );if (ret) {struct vmw_cmdbuf_man *man = dev_priv->cman;
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +14 -16
@@ -954,30 +954,29 @@ extern int vmw_fifo_init(struct vmw_private *dev_priv,extern void vmw_fifo_release (struct vmw_private *dev_priv,struct vmw_fifo_state *fifo);extern void * -vmw_fifo_reserve_dx (struct vmw_private *dev_priv,uint32_t bytes,int ctx_id); -extern void vmw_fifo_commit (struct vmw_private *dev_priv,uint32_t bytes); -extern void vmw_fifo_commit_flush (struct vmw_private *dev_priv,uint32_t bytes); -extern int vmw_fifo_send_fence (struct vmw_private *dev_priv, -uint32_t *seqno); +vmw_cmd_ctx_reserve (struct vmw_private *dev_priv,uint32_t bytes,int ctx_id); +extern void vmw_cmd_commit (struct vmw_private *dev_priv,uint32_t bytes); +extern void vmw_cmd_commit_flush (struct vmw_private *dev_priv,uint32_t bytes); +extern int vmw_cmd_send_fence (struct vmw_private *dev_priv,uint32_t *seqno); +extern bool vmw_supports_3d (struct vmw_private *dev_priv);extern void vmw_fifo_ping_host (struct vmw_private *dev_priv,uint32_t reason); -extern bool vmw_fifo_have_3d (struct vmw_private *dev_priv);extern bool vmw_fifo_have_pitchlock (struct vmw_private *dev_priv); -extern int vmw_fifo_emit_dummy_query (struct vmw_private *dev_priv, -uint32_t cid); -extern int vmw_fifo_flush (struct vmw_private *dev_priv, -bool interruptible); +extern int vmw_cmd_emit_dummy_query (struct vmw_private *dev_priv, +uint32_t cid); +extern int vmw_cmd_flush (struct vmw_private *dev_priv, +bool interruptible); -#define VMW_FIFO_RESERVE_DX (__priv, __bytes, __ctx_id) \ +#define VMW_CMD_CTX_RESERVE (__priv, __bytes, __ctx_id) \ ({ \ - vmw_fifo_reserve_dx(__priv, __bytes, __ctx_id) ? : ({ \ + vmw_cmd_ctx_reserve(__priv, __bytes, __ctx_id) ? : ({ \ DRM_ERROR("FIFO reserve failed at %s for %u bytes\n", \ __func__, (unsigned int) __bytes); \ NULL; \ }); \ }) -#define VMW_FIFO_RESERVE (__priv, __bytes) \ - VMW_FIFO_RESERVE_DX(__priv, __bytes, SVGA3D_INVALID_ID) +#define VMW_CMD_RESERVE (__priv, __bytes) \ + VMW_CMD_CTX_RESERVE(__priv, __bytes, SVGA3D_INVALID_ID)/** * TTM glue - vmwgfx_ttm_glue.c
@@ -1385,8 +1384,7 @@ struct vmw_cmdbuf_header;extern struct vmw_cmdbuf_man *vmw_cmdbuf_man_create (struct vmw_private *dev_priv); -extern int vmw_cmdbuf_set_pool_size (struct vmw_cmdbuf_man *man, -size_t size,size_t default_size); +extern int vmw_cmdbuf_set_pool_size (struct vmw_cmdbuf_man *man,size_t size);extern void vmw_cmdbuf_remove_pool (struct vmw_cmdbuf_man *man);extern void vmw_cmdbuf_man_destroy (struct vmw_cmdbuf_man *man); extern int vmw_cmdbuf_idle(struct vmw_cmdbuf_man *man, bool interruptible,
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +8 -8
@@ -724,7 +724,7 @@ static int vmw_rebind_all_dx_query(struct vmw_resource *ctx_res)if (!dx_query_mob || dx_query_mob->dx_query_ctx)return 0 ; - cmd =VMW_FIFO_RESERVE_DX (dev_priv,sizeof (*cmd), ctx_res->id); + cmd =VMW_CMD_CTX_RESERVE (dev_priv,sizeof (*cmd), ctx_res->id);if (cmd ==NULL )return -ENOMEM ;
@@ -732,7 +732,7 @@ static int vmw_rebind_all_dx_query(struct vmw_resource *ctx_res) cmd->header.size =sizeof (cmd->body); cmd->body.cid = ctx_res->id; cmd->body.mobid = dx_query_mob->base.mem.start; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));vmw_context_bind_dx_query (ctx_res, dx_query_mob);
@@ -1100,7 +1100,7 @@ static void vmw_query_bo_switch_commit(struct vmw_private *dev_priv,BUG_ON (!ctx_entry->valid); ctx = ctx_entry->res; - ret =vmw_fifo_emit_dummy_query (dev_priv, ctx->id); + ret =vmw_cmd_emit_dummy_query (dev_priv, ctx->id);if (unlikely (ret !=0 ))VMW_DEBUG_USER ("Out of fifo space for dummy query.\n" );
@@ -3762,7 +3762,7 @@ int vmw_execbuf_fence_commands(struct drm_file *file_priv,/* p_handle implies file_priv. */ BUG_ON (p_handle !=NULL && file_priv ==NULL ); - ret =vmw_fifo_send_fence (dev_priv, &sequence); + ret =vmw_cmd_send_fence (dev_priv, &sequence);if (unlikely (ret !=0 )) {VMW_DEBUG_USER ("Fence submission error. Syncing.\n" ); synced = true;
@@ -3876,10 +3876,10 @@ static int vmw_execbuf_submit_fifo(struct vmw_private *dev_priv,void *cmd;if (sw_context->dx_ctx_node) - cmd =VMW_FIFO_RESERVE_DX (dev_priv, command_size, + cmd =VMW_CMD_CTX_RESERVE (dev_priv, command_size, sw_context->dx_ctx_node->ctx->id);else - cmd =VMW_FIFO_RESERVE (dev_priv, command_size); + cmd =VMW_CMD_RESERVE (dev_priv, command_size);if (!cmd)return -ENOMEM ;
@@ -3888,7 +3888,7 @@ static int vmw_execbuf_submit_fifo(struct vmw_private *dev_priv,memcpy (cmd, kernel_commands, command_size);vmw_resource_relocations_apply (cmd, &sw_context->res_relocations);vmw_resource_relocations_free (&sw_context->res_relocations); -vmw_fifo_commit (dev_priv, command_size); +vmw_cmd_commit (dev_priv, command_size);return 0 ; }
@@ -4325,7 +4325,7 @@ void __vmw_execbuf_release_pinned_bo(struct vmw_private *dev_priv,if (dev_priv->query_cid_valid) {BUG_ON (fence !=NULL ); - ret =vmw_fifo_emit_dummy_query (dev_priv, dev_priv->query_cid); + ret =vmw_cmd_emit_dummy_query (dev_priv, dev_priv->query_cid);if (ret) goto out_no_emit; dev_priv->query_cid_valid = false;
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +1 -1
@@ -258,7 +258,7 @@ static void vmw_fb_dirty_flush(struct work_struct *work)if (w && h) {WARN_ON_ONCE (par->set_fb->funcs->dirty (cur_fb,NULL ,0 ,0 , &clip,1 )); -vmw_fifo_flush (vmw_priv, false); +vmw_cmd_flush (vmw_priv, false); } out_unlock:mutex_unlock (&par->bo_mutex);
drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c +4 -4
@@ -51,7 +51,7 @@ static int vmw_gmr2_bind(struct vmw_private *dev_priv,uint32_t cmd_size = define_size + remap_size;uint32_t i; - cmd_orig = cmd =VMW_FIFO_RESERVE (dev_priv, cmd_size); + cmd_orig = cmd =VMW_CMD_RESERVE (dev_priv, cmd_size);if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -98,7 +98,7 @@ static int vmw_gmr2_bind(struct vmw_private *dev_priv,BUG_ON (cmd != cmd_orig + cmd_size /sizeof (*cmd)); -vmw_fifo_commit (dev_priv, cmd_size); +vmw_cmd_commit (dev_priv, cmd_size);return 0 ; }
@@ -110,7 +110,7 @@ static void vmw_gmr2_unbind(struct vmw_private *dev_priv,uint32_t define_size =sizeof (define_cmd) +4 ;uint32_t *cmd; - cmd =VMW_FIFO_RESERVE (dev_priv, define_size); + cmd =VMW_CMD_RESERVE (dev_priv, define_size);if (unlikely (cmd ==NULL ))return ;
@@ -120,7 +120,7 @@ static void vmw_gmr2_unbind(struct vmw_private *dev_priv, *cmd++ =SVGA_CMD_DEFINE_GMR2 ;memcpy (cmd, &define_cmd,sizeof (define_cmd)); -vmw_fifo_commit (dev_priv, define_size); +vmw_cmd_commit (dev_priv, define_size); }
drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c +1 -1
@@ -51,7 +51,7 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data, param->value =vmw_overlay_num_free_overlays (dev_priv);break ;case DRM_VMW_PARAM_3D : - param->value =vmw_fifo_have_3d (dev_priv) ?1 :0 ; + param->value =vmw_supports_3d (dev_priv) ?1 :0 ;break ;case DRM_VMW_PARAM_HW_CAPS : param->value = dev_priv->capabilities;
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +9 -12
@@ -36,9 +36,6 @@#include "vmwgfx_kms.h" -/* Might need a hrtimer here? */ -#define VMWGFX_PRESENT_RATE ((HZ / 60 > 0) ? HZ / 60 : 1) -void vmw_du_cleanup (struct vmw_display_unit *du) {drm_plane_cleanup (&du->primary);
@@ -68,7 +65,7 @@ static int vmw_cursor_update_image(struct vmw_private *dev_priv,if (!image)return -EINVAL ; - cmd =VMW_FIFO_RESERVE (dev_priv, cmd_size); + cmd =VMW_CMD_RESERVE (dev_priv, cmd_size);if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -83,7 +80,7 @@ static int vmw_cursor_update_image(struct vmw_private *dev_priv, cmd->cursor.hotspotX = hotspotX; cmd->cursor.hotspotY = hotspotY; -vmw_fifo_commit_flush (dev_priv, cmd_size); +vmw_cmd_commit_flush (dev_priv, cmd_size);return 0 ; }
@@ -1032,7 +1029,7 @@ static int vmw_framebuffer_bo_dirty(struct drm_framebuffer *framebuffer,break ; } -vmw_fifo_flush (dev_priv, false); +vmw_cmd_flush (dev_priv, false);ttm_read_unlock (&dev_priv->reservation_sem);drm_modeset_unlock_all (&dev_priv->drm);
@@ -1767,7 +1764,7 @@ int vmw_kms_present(struct vmw_private *dev_priv,if (ret)return ret; -vmw_fifo_flush (dev_priv, false); +vmw_cmd_flush (dev_priv, false);return 0 ; }
@@ -2384,7 +2381,7 @@ int vmw_kms_helper_dirty(struct vmw_private *dev_priv, dirty->unit = unit;if (dirty->fifo_reserve_size >0 ) { - dirty->cmd =VMW_FIFO_RESERVE (dev_priv, + dirty->cmd =VMW_CMD_RESERVE (dev_priv, dirty->fifo_reserve_size);if (!dirty->cmd)return -ENOMEM ;
@@ -2518,7 +2515,7 @@ int vmw_kms_update_proxy(struct vmw_resource *res,if (!clips)return 0 ; - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd) * num_clips); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd) * num_clips);if (!cmd)return -ENOMEM ;
@@ -2547,7 +2544,7 @@ int vmw_kms_update_proxy(struct vmw_resource *res, copy_size +=sizeof (*cmd); } -vmw_fifo_commit (dev_priv, copy_size); +vmw_cmd_commit (dev_priv, copy_size);return 0 ; }
@@ -2750,7 +2747,7 @@ int vmw_du_helper_plane_update(struct vmw_du_update_plane *update) goto out_unref; reserved_size = update->calc_fifo_size (update, num_hits); - cmd_start =VMW_FIFO_RESERVE (update->dev_priv, reserved_size); + cmd_start =VMW_CMD_RESERVE (update->dev_priv, reserved_size);if (!cmd_start) { ret = -ENOMEM ; goto out_revert;
@@ -2799,7 +2796,7 @@ int vmw_du_helper_plane_update(struct vmw_du_update_plane *update)if (reserved_size < submit_size) submit_size =0 ; -vmw_fifo_commit (update->dev_priv, submit_size); +vmw_cmd_commit (update->dev_priv, submit_size);vmw_kms_helper_validation_finish (update->dev_priv,NULL , &val_ctx, update->out_fence,NULL );
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +2 -2
@@ -554,7 +554,7 @@ int vmw_kms_ldu_do_bo_dirty(struct vmw_private *dev_priv, } *cmd; fifo_size =sizeof (*cmd) * num_clips; - cmd =VMW_FIFO_RESERVE (dev_priv, fifo_size); + cmd =VMW_CMD_RESERVE (dev_priv, fifo_size);if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -567,6 +567,6 @@ int vmw_kms_ldu_do_bo_dirty(struct vmw_private *dev_priv, cmd[i].body.height = clips->y2 - clips->y1; } -vmw_fifo_commit (dev_priv, fifo_size); +vmw_cmd_commit (dev_priv, fifo_size);return 0 ; }
drivers/gpu/drm/vmwgfx/vmwgfx_mob.c +8 -8
@@ -148,7 +148,7 @@ static int vmw_setup_otable_base(struct vmw_private *dev_priv, mob->pt_level +=VMW_MOBFMT_PTDEPTH_1 -SVGA3D_MOBFMT_PTDEPTH_1 ; } - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL )) { ret = -ENOMEM ; goto out_no_fifo;
@@ -170,7 +170,7 @@ static int vmw_setup_otable_base(struct vmw_private *dev_priv,*/ BUG_ON (mob->pt_level ==VMW_MOBFMT_PTDEPTH_2 ); -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd)); otable->page_table = mob;return 0 ;
@@ -203,7 +203,7 @@ static void vmw_takedown_otable_base(struct vmw_private *dev_priv,return ; bo = otable->page_table->pt_bo; - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL ))return ;
@@ -215,7 +215,7 @@ static void vmw_takedown_otable_base(struct vmw_private *dev_priv, cmd->body.sizeInBytes =0 ; cmd->body.validSizeInBytes =0 ; cmd->body.ptDepth =SVGA3D_MOBFMT_INVALID ; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));if (bo) {int ret;
@@ -558,12 +558,12 @@ void vmw_mob_unbind(struct vmw_private *dev_priv,BUG_ON (ret !=0 ); } - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (cmd) { cmd->header.id =SVGA_3D_CMD_DESTROY_GB_MOB ; cmd->header.size =sizeof (cmd->body); cmd->body.mobid = mob->id; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd)); }if (bo) {
@@ -625,7 +625,7 @@ int vmw_mob_bind(struct vmw_private *dev_priv,vmw_fifo_resource_inc (dev_priv); - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL )) goto out_no_cmd_space;
@@ -636,7 +636,7 @@ int vmw_mob_bind(struct vmw_private *dev_priv, cmd->body.base = mob->pt_root_page >>PAGE_SHIFT ; cmd->body.sizeInBytes = num_data_pages *PAGE_SIZE ; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));return 0 ;
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c +4 -4
@@ -122,7 +122,7 @@ static int vmw_overlay_send_put(struct vmw_private *dev_priv, fifo_size =sizeof (*cmds) +sizeof (*flush) +sizeof (*items) * num_items; - cmds =VMW_FIFO_RESERVE (dev_priv, fifo_size); + cmds =VMW_CMD_RESERVE (dev_priv, fifo_size);/* hardware has hung, can't do anything here */ if (!cmds)return -ENOMEM ;
@@ -169,7 +169,7 @@ static int vmw_overlay_send_put(struct vmw_private *dev_priv,fill_flush (flush, arg->stream_id); -vmw_fifo_commit (dev_priv, fifo_size); +vmw_cmd_commit (dev_priv, fifo_size);return 0 ; }
@@ -192,7 +192,7 @@ static int vmw_overlay_send_stop(struct vmw_private *dev_priv,int ret;for (;;) { - cmds =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmds)); + cmds =VMW_CMD_RESERVE (dev_priv,sizeof (*cmds));if (cmds)break ;
@@ -211,7 +211,7 @@ static int vmw_overlay_send_stop(struct vmw_private *dev_priv, cmds->body.items[0 ].value = false;fill_flush (&cmds->flush, stream_id); -vmw_fifo_commit (dev_priv,sizeof (*cmds)); +vmw_cmd_commit (dev_priv,sizeof (*cmds));return 0 ; }
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +2 -2
@@ -827,7 +827,7 @@ int vmw_query_readback_all(struct vmw_buffer_object *dx_query_mob) dx_query_ctx = dx_query_mob->dx_query_ctx; dev_priv = dx_query_ctx->dev_priv; - cmd =VMW_FIFO_RESERVE_DX (dev_priv,sizeof (*cmd), dx_query_ctx->id); + cmd =VMW_CMD_CTX_RESERVE (dev_priv,sizeof (*cmd), dx_query_ctx->id);if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -835,7 +835,7 @@ int vmw_query_readback_all(struct vmw_buffer_object *dx_query_mob) cmd->header.size =sizeof (cmd->body); cmd->body.cid = dx_query_ctx->id; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));/* Triggers a rebind the next time affected context is bound */ dx_query_mob->dx_query_ctx =NULL ;
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +12 -12
@@ -132,7 +132,7 @@ static int vmw_sou_fifo_create(struct vmw_private *dev_priv,BUG_ON (!sou->buffer); fifo_size =sizeof (*cmd); - cmd =VMW_FIFO_RESERVE (dev_priv, fifo_size); + cmd =VMW_CMD_RESERVE (dev_priv, fifo_size);if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -153,7 +153,7 @@ static int vmw_sou_fifo_create(struct vmw_private *dev_priv,vmw_bo_get_guest_ptr (&sou->buffer->base, &cmd->obj.backingStore.ptr); cmd->obj.backingStore.pitch = mode->hdisplay *4 ; -vmw_fifo_commit (dev_priv, fifo_size); +vmw_cmd_commit (dev_priv, fifo_size); sou->defined = true;
@@ -181,7 +181,7 @@ static int vmw_sou_fifo_destroy(struct vmw_private *dev_priv,return 0 ; fifo_size =sizeof (*cmd); - cmd =VMW_FIFO_RESERVE (dev_priv, fifo_size); + cmd =VMW_CMD_RESERVE (dev_priv, fifo_size);if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -189,7 +189,7 @@ static int vmw_sou_fifo_destroy(struct vmw_private *dev_priv, cmd->header.cmdType =SVGA_CMD_DESTROY_SCREEN ; cmd->body.screenId = sou->base.unit; -vmw_fifo_commit (dev_priv, fifo_size); +vmw_cmd_commit (dev_priv, fifo_size);/* Force sync */ ret =vmw_fallback_wait (dev_priv, false, true,0 , false,3 *HZ );
@@ -992,7 +992,7 @@ static int do_bo_define_gmrfb(struct vmw_private *dev_priv,if (depth ==32 ) depth =24 ; - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (!cmd)return -ENOMEM ;
@@ -1003,7 +1003,7 @@ static int do_bo_define_gmrfb(struct vmw_private *dev_priv, cmd->body.bytesPerLine = framebuffer->base.pitches[0 ];/* Buffer is reserved in vram or GMR */ vmw_bo_get_guest_ptr (&buf->base, &cmd->body.ptr); -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));return 0 ; }
@@ -1029,7 +1029,7 @@ static void vmw_sou_surface_fifo_commit(struct vmw_kms_dirty *dirty)int i;if (!dirty->num_hits) { -vmw_fifo_commit (dirty->dev_priv,0 ); +vmw_cmd_commit (dirty->dev_priv,0 );return ; }
@@ -1061,7 +1061,7 @@ static void vmw_sou_surface_fifo_commit(struct vmw_kms_dirty *dirty) blit->bottom -= sdirty->top; } -vmw_fifo_commit (dirty->dev_priv, region_size +sizeof (*cmd)); +vmw_cmd_commit (dirty->dev_priv, region_size +sizeof (*cmd)); sdirty->left = sdirty->top =S32_MAX ; sdirty->right = sdirty->bottom =S32_MIN ;
@@ -1185,11 +1185,11 @@ int vmw_kms_sou_do_surface_dirty(struct vmw_private *dev_priv,static void vmw_sou_bo_fifo_commit (struct vmw_kms_dirty *dirty) {if (!dirty->num_hits) { -vmw_fifo_commit (dirty->dev_priv,0 ); +vmw_cmd_commit (dirty->dev_priv,0 );return ; } -vmw_fifo_commit (dirty->dev_priv, +vmw_cmd_commit (dirty->dev_priv,sizeof (struct vmw_kms_sou_bo_blit ) * dirty->num_hits); }
@@ -1295,11 +1295,11 @@ int vmw_kms_sou_do_bo_dirty(struct vmw_private *dev_priv,static void vmw_sou_readback_fifo_commit (struct vmw_kms_dirty *dirty) {if (!dirty->num_hits) { -vmw_fifo_commit (dirty->dev_priv,0 ); +vmw_cmd_commit (dirty->dev_priv,0 );return ; } -vmw_fifo_commit (dirty->dev_priv, +vmw_cmd_commit (dirty->dev_priv,sizeof (struct vmw_kms_sou_readback_blit ) * dirty->num_hits); }
drivers/gpu/drm/vmwgfx/vmwgfx_shader.c +12 -12
@@ -222,7 +222,7 @@ static int vmw_gb_shader_create(struct vmw_resource *res) goto out_no_fifo; } - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL )) { ret = -ENOMEM ; goto out_no_fifo;
@@ -233,7 +233,7 @@ static int vmw_gb_shader_create(struct vmw_resource *res) cmd->body.shid = res->id; cmd->body.type = shader->type; cmd->body.sizeInBytes = shader->size; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));vmw_fifo_resource_inc (dev_priv);return 0 ;
@@ -256,7 +256,7 @@ static int vmw_gb_shader_bind(struct vmw_resource *res,BUG_ON (bo->mem.mem_type !=VMW_PL_MOB ); - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -266,7 +266,7 @@ static int vmw_gb_shader_bind(struct vmw_resource *res, cmd->body.mobid = bo->mem.start; cmd->body.offsetInBytes = res->backup_offset; res->backup_dirty = false; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));return 0 ; }
@@ -284,7 +284,7 @@ static int vmw_gb_shader_unbind(struct vmw_resource *res,BUG_ON (res->backup->base.mem.mem_type !=VMW_PL_MOB ); - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -293,7 +293,7 @@ static int vmw_gb_shader_unbind(struct vmw_resource *res, cmd->body.shid = res->id; cmd->body.mobid =SVGA3D_INVALID_ID ; cmd->body.offsetInBytes =0 ; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));/* * Create a fence object and fence the backup buffer.
@@ -324,7 +324,7 @@ static int vmw_gb_shader_destroy(struct vmw_resource *res)mutex_lock (&dev_priv->binding_mutex);vmw_binding_res_list_scrub (&res->binding_head); - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL )) {mutex_unlock (&dev_priv->binding_mutex);return -ENOMEM ;
@@ -333,7 +333,7 @@ static int vmw_gb_shader_destroy(struct vmw_resource *res) cmd->header.id =SVGA_3D_CMD_DESTROY_GB_SHADER ; cmd->header.size =sizeof (cmd->body); cmd->body.shid = res->id; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));mutex_unlock (&dev_priv->binding_mutex);vmw_resource_release_id (res);vmw_fifo_resource_dec (dev_priv);
@@ -394,7 +394,7 @@ static int vmw_dx_shader_unscrub(struct vmw_resource *res)if (!list_empty (&shader->cotable_head) || !shader->committed)return 0 ; - cmd =VMW_FIFO_RESERVE_DX (dev_priv,sizeof (*cmd), shader->ctx->id); + cmd =VMW_CMD_CTX_RESERVE (dev_priv,sizeof (*cmd), shader->ctx->id);if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -404,7 +404,7 @@ static int vmw_dx_shader_unscrub(struct vmw_resource *res) cmd->body.shid = shader->id; cmd->body.mobid = res->backup->base.mem.start; cmd->body.offsetInBytes = res->backup_offset; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));vmw_cotable_add_resource (shader->cotable, &shader->cotable_head);
@@ -481,7 +481,7 @@ static int vmw_dx_shader_scrub(struct vmw_resource *res)return 0 ;WARN_ON_ONCE (!shader->committed); - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -491,7 +491,7 @@ static int vmw_dx_shader_scrub(struct vmw_resource *res) cmd->body.shid = res->id; cmd->body.mobid =SVGA3D_INVALID_ID ; cmd->body.offsetInBytes =0 ; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd)); res->id =-1 ;list_del_init (&shader->cotable_head);
drivers/gpu/drm/vmwgfx/vmwgfx_so.c +4 -4
@@ -170,7 +170,7 @@ static int vmw_view_create(struct vmw_resource *res)return 0 ; } - cmd =VMW_FIFO_RESERVE_DX (res->dev_priv, view->cmd_size, view->ctx->id); + cmd =VMW_CMD_CTX_RESERVE (res->dev_priv, view->cmd_size, view->ctx->id);if (!cmd) {mutex_unlock (&dev_priv->binding_mutex);return -ENOMEM ;
@@ -181,7 +181,7 @@ static int vmw_view_create(struct vmw_resource *res)/* Sid may have changed due to surface eviction. */ WARN_ON (view->srf->id ==SVGA3D_INVALID_ID ); cmd->body.sid = view->srf->id; -vmw_fifo_commit (res->dev_priv, view->cmd_size); +vmw_cmd_commit (res->dev_priv, view->cmd_size); res->id = view->view_id;list_add_tail (&view->srf_head, &srf->view_list);vmw_cotable_add_resource (view->cotable, &view->cotable_head);
@@ -213,14 +213,14 @@ static int vmw_view_destroy(struct vmw_resource *res)if (!view->committed || res->id ==-1 )return 0 ; - cmd =VMW_FIFO_RESERVE_DX (dev_priv,sizeof (*cmd), view->ctx->id); + cmd =VMW_CMD_CTX_RESERVE (dev_priv,sizeof (*cmd), view->ctx->id);if (!cmd)return -ENOMEM ; cmd->header.id = vmw_view_destroy_cmds[view->view_type]; cmd->header.size =sizeof (cmd->body); cmd->body.view_id = view->view_id; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd)); res->id =-1 ;list_del_init (&view->cotable_head);list_del_init (&view->srf_head);
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +14 -14
@@ -170,7 +170,7 @@ static int vmw_stdu_define_st(struct vmw_private *dev_priv,SVGA3dCmdDefineGBScreenTarget body; } *cmd; - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -188,7 +188,7 @@ static int vmw_stdu_define_st(struct vmw_private *dev_priv, stdu->base.set_gui_x = cmd->body.xRoot; stdu->base.set_gui_y = cmd->body.yRoot; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd)); stdu->defined = true; stdu->display_width = mode->hdisplay;
@@ -229,7 +229,7 @@ static int vmw_stdu_bind_st(struct vmw_private *dev_priv,memset (&image,0 ,sizeof (image)); image.sid = res ? res->id :SVGA3D_INVALID_ID ; - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -239,7 +239,7 @@ static int vmw_stdu_bind_st(struct vmw_private *dev_priv, cmd->body.stid = stdu->base.unit; cmd->body.image = image; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));return 0 ; }
@@ -293,7 +293,7 @@ static int vmw_stdu_update_st(struct vmw_private *dev_priv,return -EINVAL ; } - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -301,7 +301,7 @@ static int vmw_stdu_update_st(struct vmw_private *dev_priv,0 , stdu->display_width, 0, stdu->display_height); -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));return 0 ; }
@@ -329,7 +329,7 @@ static int vmw_stdu_destroy_st(struct vmw_private *dev_priv,if (unlikely (!stdu->defined))return 0 ; - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (cmd ==NULL ))return -ENOMEM ;
@@ -338,7 +338,7 @@ static int vmw_stdu_destroy_st(struct vmw_private *dev_priv, cmd->body.stid = stdu->base.unit; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));/* Force sync */ ret =vmw_fallback_wait (dev_priv, false, true,0 , false,3 *HZ );
@@ -499,7 +499,7 @@ static void vmw_stdu_bo_fifo_commit(struct vmw_kms_dirty *dirty)size_t blit_size =sizeof (*blit) * dirty->num_hits +sizeof (*suffix);if (!dirty->num_hits) { -vmw_fifo_commit (dirty->dev_priv,0 ); +vmw_cmd_commit (dirty->dev_priv,0 );return ; }
@@ -522,7 +522,7 @@ static void vmw_stdu_bo_fifo_commit(struct vmw_kms_dirty *dirty) ddirty->top, ddirty->bottom); } -vmw_fifo_commit (dirty->dev_priv,sizeof (*cmd) + blit_size); +vmw_cmd_commit (dirty->dev_priv,sizeof (*cmd) + blit_size); stdu->display_srf->res.res_dirty = true; ddirty->left = ddirty->top =S32_MAX ;
@@ -628,7 +628,7 @@ static void vmw_stdu_bo_cpu_commit(struct vmw_kms_dirty *dirty) dev_priv =vmw_priv (stdu->base.crtc.dev); - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (!cmd) goto out_cleanup;
@@ -636,7 +636,7 @@ static void vmw_stdu_bo_cpu_commit(struct vmw_kms_dirty *dirty) region.x1, region.x2, region.y1, region.y2); -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd)); } out_cleanup:
@@ -795,7 +795,7 @@ static void vmw_kms_stdu_surface_fifo_commit(struct vmw_kms_dirty *dirty)size_t commit_size;if (!dirty->num_hits) { -vmw_fifo_commit (dirty->dev_priv,0 ); +vmw_cmd_commit (dirty->dev_priv,0 );return ; }
@@ -817,7 +817,7 @@ static void vmw_kms_stdu_surface_fifo_commit(struct vmw_kms_dirty *dirty)vmw_stdu_populate_update (update, stdu->base.unit, sdirty->left, sdirty->right, sdirty->top, sdirty->bottom); -vmw_fifo_commit (dirty->dev_priv, commit_size); +vmw_cmd_commit (dirty->dev_priv, commit_size); sdirty->left = sdirty->top =S32_MAX ; sdirty->right = sdirty->bottom =S32_MIN ;
drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c +4 -4
@@ -99,7 +99,7 @@ static int vmw_dx_streamoutput_unscrub(struct vmw_resource *res)if (!list_empty (&so->cotable_head) || !so->committed )return 0 ; - cmd =VMW_FIFO_RESERVE_DX (dev_priv,sizeof (*cmd), so->ctx->id); + cmd =VMW_CMD_CTX_RESERVE (dev_priv,sizeof (*cmd), so->ctx->id);if (!cmd)return -ENOMEM ;
@@ -109,7 +109,7 @@ static int vmw_dx_streamoutput_unscrub(struct vmw_resource *res) cmd->body.mobid = res->backup->base.mem.start; cmd->body.offsetInBytes = res->backup_offset; cmd->body.sizeInBytes = so->size; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));vmw_cotable_add_resource (so->cotable, &so->cotable_head);
@@ -172,7 +172,7 @@ static int vmw_dx_streamoutput_scrub(struct vmw_resource *res)WARN_ON_ONCE (!so->committed); - cmd =VMW_FIFO_RESERVE_DX (dev_priv,sizeof (*cmd), so->ctx->id); + cmd =VMW_CMD_CTX_RESERVE (dev_priv,sizeof (*cmd), so->ctx->id);if (!cmd)return -ENOMEM ;
@@ -182,7 +182,7 @@ static int vmw_dx_streamoutput_scrub(struct vmw_resource *res) cmd->body.mobid =SVGA3D_INVALID_ID ; cmd->body.offsetInBytes =0 ; cmd->body.sizeInBytes = so->size; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd)); res->id =-1 ;list_del_init (&so->cotable_head);
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +20 -20
@@ -372,12 +372,12 @@ static void vmw_hw_surface_destroy(struct vmw_resource *res)if (res->id !=-1 ) { - cmd =VMW_FIFO_RESERVE (dev_priv,vmw_surface_destroy_size ()); + cmd =VMW_CMD_RESERVE (dev_priv,vmw_surface_destroy_size ());if (unlikely (!cmd))return ;vmw_surface_destroy_encode (res->id, cmd); -vmw_fifo_commit (dev_priv,vmw_surface_destroy_size ()); +vmw_cmd_commit (dev_priv,vmw_surface_destroy_size ());/* * used_memory_size_atomic, or separate lock
@@ -440,14 +440,14 @@ static int vmw_legacy_srf_create(struct vmw_resource *res)*/ submit_size =vmw_surface_define_size (srf); - cmd =VMW_FIFO_RESERVE (dev_priv, submit_size); + cmd =VMW_CMD_RESERVE (dev_priv, submit_size);if (unlikely (!cmd)) { ret = -ENOMEM ; goto out_no_fifo; }vmw_surface_define_encode (srf, cmd); -vmw_fifo_commit (dev_priv, submit_size); +vmw_cmd_commit (dev_priv, submit_size);vmw_fifo_resource_inc (dev_priv);/*
@@ -492,14 +492,14 @@ static int vmw_legacy_srf_dma(struct vmw_resource *res,BUG_ON (!val_buf->bo); submit_size =vmw_surface_dma_size (srf); - cmd =VMW_FIFO_RESERVE (dev_priv, submit_size); + cmd =VMW_CMD_RESERVE (dev_priv, submit_size);if (unlikely (!cmd))return -ENOMEM ;vmw_bo_get_guest_ptr (val_buf->bo, &ptr);vmw_surface_dma_encode (srf, cmd, &ptr, bind); -vmw_fifo_commit (dev_priv, submit_size); +vmw_cmd_commit (dev_priv, submit_size);/* * Create a fence object and fence the backup buffer.
@@ -578,12 +578,12 @@ static int vmw_legacy_srf_destroy(struct vmw_resource *res)*/ submit_size =vmw_surface_destroy_size (); - cmd =VMW_FIFO_RESERVE (dev_priv, submit_size); + cmd =VMW_CMD_RESERVE (dev_priv, submit_size);if (unlikely (!cmd))return -ENOMEM ;vmw_surface_destroy_encode (res->id, cmd); -vmw_fifo_commit (dev_priv, submit_size); +vmw_cmd_commit (dev_priv, submit_size);/* * Surface memory usage accounting.
@@ -1121,7 +1121,7 @@ static int vmw_gb_surface_create(struct vmw_resource *res) submit_len =sizeof (*cmd); } - cmd =VMW_FIFO_RESERVE (dev_priv, submit_len); + cmd =VMW_CMD_RESERVE (dev_priv, submit_len); cmd2 = (typeof (cmd2 ))cmd; cmd3 = (typeof (cmd3 ))cmd; cmd4 = (typeof (cmd4 ))cmd;
@@ -1188,7 +1188,7 @@ static int vmw_gb_surface_create(struct vmw_resource *res) cmd->body.size.depth = metadata->base_size.depth; } -vmw_fifo_commit (dev_priv, submit_len); +vmw_cmd_commit (dev_priv, submit_len);return 0 ;
@@ -1219,7 +1219,7 @@ static int vmw_gb_surface_bind(struct vmw_resource *res, submit_size =sizeof (*cmd1) + (res->backup_dirty ?sizeof (*cmd2) :0 ); - cmd1 =VMW_FIFO_RESERVE (dev_priv, submit_size); + cmd1 =VMW_CMD_RESERVE (dev_priv, submit_size);if (unlikely (!cmd1))return -ENOMEM ;
@@ -1233,7 +1233,7 @@ static int vmw_gb_surface_bind(struct vmw_resource *res, cmd2->header.size =sizeof (cmd2->body); cmd2->body.sid = res->id; } -vmw_fifo_commit (dev_priv, submit_size); +vmw_cmd_commit (dev_priv, submit_size);if (res->backup->dirty && res->backup_dirty) {/* We've just made a full upload. Cear dirty regions. */
@@ -1272,7 +1272,7 @@ static int vmw_gb_surface_unbind(struct vmw_resource *res,BUG_ON (bo->mem.mem_type !=VMW_PL_MOB ); submit_size =sizeof (*cmd3) + (readback ?sizeof (*cmd1) :sizeof (*cmd2)); - cmd =VMW_FIFO_RESERVE (dev_priv, submit_size); + cmd =VMW_CMD_RESERVE (dev_priv, submit_size);if (unlikely (!cmd))return -ENOMEM ;
@@ -1295,7 +1295,7 @@ static int vmw_gb_surface_unbind(struct vmw_resource *res, cmd3->body.sid = res->id; cmd3->body.mobid =SVGA3D_INVALID_ID ; -vmw_fifo_commit (dev_priv, submit_size); +vmw_cmd_commit (dev_priv, submit_size);/* * Create a fence object and fence the backup buffer.
@@ -1328,7 +1328,7 @@ static int vmw_gb_surface_destroy(struct vmw_resource *res)vmw_view_surface_list_destroy (dev_priv, &srf->view_list);vmw_binding_res_list_scrub (&res->binding_head); - cmd =VMW_FIFO_RESERVE (dev_priv,sizeof (*cmd)); + cmd =VMW_CMD_RESERVE (dev_priv,sizeof (*cmd));if (unlikely (!cmd)) {mutex_unlock (&dev_priv->binding_mutex);return -ENOMEM ;
@@ -1337,7 +1337,7 @@ static int vmw_gb_surface_destroy(struct vmw_resource *res) cmd->header.id =SVGA_3D_CMD_DESTROY_GB_SURFACE ; cmd->header.size =sizeof (cmd->body); cmd->body.sid = res->id; -vmw_fifo_commit (dev_priv,sizeof (*cmd)); +vmw_cmd_commit (dev_priv,sizeof (*cmd));mutex_unlock (&dev_priv->binding_mutex);vmw_resource_release_id (res);vmw_fifo_resource_dec (dev_priv);
@@ -1895,7 +1895,7 @@ static int vmw_surface_dirty_sync(struct vmw_resource *res) goto out; alloc_size = num_dirty * ((has_dx) ?sizeof (*cmd1) :sizeof (*cmd2)); - cmd =VMW_FIFO_RESERVE (dev_priv, alloc_size); + cmd =VMW_CMD_RESERVE (dev_priv, alloc_size);if (!cmd)return -ENOMEM ;
@@ -1931,7 +1931,7 @@ static int vmw_surface_dirty_sync(struct vmw_resource *res) } } -vmw_fifo_commit (dev_priv, alloc_size); +vmw_cmd_commit (dev_priv, alloc_size); out:memset (&dirty->boxes[0 ],0 ,sizeof (dirty->boxes[0 ]) * dirty->num_subres);
@@ -2031,14 +2031,14 @@ static int vmw_surface_clean(struct vmw_resource *res) } *cmd; alloc_size =sizeof (*cmd); - cmd =VMW_FIFO_RESERVE (dev_priv, alloc_size); + cmd =VMW_CMD_RESERVE (dev_priv, alloc_size);if (!cmd)return -ENOMEM ; cmd->header.id =SVGA_3D_CMD_READBACK_GB_SURFACE ; cmd->header.size =sizeof (cmd->body); cmd->body.sid = res->id; -vmw_fifo_commit (dev_priv, alloc_size); +vmw_cmd_commit (dev_priv, alloc_size);return 0 ; }
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 8/8 drm/vmwgfx: Fix display register usage for some older configs
In reply to Zack RusinWe can't be setting the display_id register to an invalid value because that makes our device reset the fb which causes nasty flicker (due to destruction and creation of a new fb). Also we can't be using the BITS_PER_PIXEL register if the 8BIT_EMULATION is not supported.
--- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 ++- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +2 -1
@@ -1875,7 +1875,8 @@ int vmw_kms_write_svga(struct vmw_private *vmw_priv,vmw_fifo_mem_write (vmw_priv,SVGA_FIFO_PITCHLOCK , pitch);vmw_write (vmw_priv,SVGA_REG_WIDTH , width);vmw_write (vmw_priv,SVGA_REG_HEIGHT , height); -vmw_write (vmw_priv,SVGA_REG_BITS_PER_PIXEL , bpp); +if ((vmw_priv->capabilities &SVGA_CAP_8BIT_EMULATION ) !=0 ) +vmw_write (vmw_priv,SVGA_REG_BITS_PER_PIXEL , bpp);if (vmw_read (vmw_priv,SVGA_REG_DEPTH ) != depth) { DRM_ERROR("Invalid depth %u for %u bpp, host expects %u\n",
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +0 -1
@@ -125,7 +125,6 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv)vmw_write (dev_priv,SVGA_REG_DISPLAY_POSITION_Y , crtc->y);vmw_write (dev_priv,SVGA_REG_DISPLAY_WIDTH , crtc->mode.hdisplay);vmw_write (dev_priv,SVGA_REG_DISPLAY_HEIGHT , crtc->mode.vdisplay); -vmw_write (dev_priv,SVGA_REG_DISPLAY_ID ,SVGA_ID_INVALID ); i++; }
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel