vmwgfx updates for drm-next
Subsystems (3)
cover vmwgfx updates for drm-next
This patch series contains a number of bugfixes and brings the vmwgfx driver up-to-date with the standalone repo.
Note that the patches are against drm-fixes as of 2010-10-05, since that branch contain vmwgfx fixes that these patches depend upon.
Patch 04/11 contains a modesetting driver API change needed for 05/11, and may as such not be suitable for kernel RCs but rather for the next merge window.
Note that the suspend / hibernate refusal in patch 2/11 remains, see previous mail thread. Please let me know if this is still a problem.
PATCH 1/11 vmwgfx: Really support other depths than 32
Also add some sanity checks.
--- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 106 ++++++++++++++++++++++++++++------- 1 files changed, 85 insertions(+), 21 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +85 -21
@@ -471,16 +471,55 @@ static struct drm_framebuffer_funcs vmw_framebuffer_surface_funcs = { .create_handle = vmw_framebuffer_create_handle, }; -int vmw_kms_new_framebuffer_surface (struct vmw_private *dev_priv, -struct vmw_surface *surface, -struct vmw_framebuffer **out, -unsigned width,unsigned height) +static int vmw_kms_new_framebuffer_surface (struct vmw_private *dev_priv, +struct vmw_surface *surface, +struct vmw_framebuffer **out, +const struct drm_mode_fb_cmd + *mode_cmd) {struct drm_device *dev = dev_priv->dev;struct vmw_framebuffer_surface *vfbs; +enum SVGA3dSurfaceFormat format;int ret; +/* +* Sanity checks. +*/ + +if (unlikely (surface->mip_levels[0 ] !=1 || + surface->num_sizes !=1 || + surface->sizes[0 ].width < mode_cmd->width || + surface->sizes[0 ].height < mode_cmd->height || + surface->sizes[0 ].depth !=1 )) { +DRM_ERROR ("Incompatible surface dimensions " +"for requested mode.\n" ); +return -EINVAL ; + } + +switch (mode_cmd->depth) { +case 32 : + format =SVGA3D_A8R8G8B8 ; +break ; +case 24 : + format =SVGA3D_X8R8G8B8 ; +break ; +case 16 : + format =SVGA3D_R5G6B5 ; +break ; +case 15 : + format =SVGA3D_A1R5G5B5 ; +break ; +default : +DRM_ERROR ("Invalid color depth: %d\n" , mode_cmd->depth); +return -EINVAL ; + } + +if (unlikely (format != surface->format)) { +DRM_ERROR ("Invalid surface format for requested mode.\n" ); +return -EINVAL ; + } + vfbs =kzalloc (sizeof (*vfbs),GFP_KERNEL );if (!vfbs) { ret = -ENOMEM ;
@@ -498,11 +537,11 @@ int vmw_kms_new_framebuffer_surface(struct vmw_private *dev_priv, }/* XXX get the first 3 from the surface info */ - vfbs->base.base.bits_per_pixel =32 ; - vfbs->base.base.pitch = width *32 /4 ; - vfbs->base.base.depth =24 ; - vfbs->base.base.width = width; - vfbs->base.base.height = height; + vfbs->base.base.bits_per_pixel = mode_cmd->bpp; + vfbs->base.base.pitch = mode_cmd->pitch; + vfbs->base.base.depth = mode_cmd->depth; + vfbs->base.base.width = mode_cmd->width; + vfbs->base.base.height = mode_cmd->height; vfbs->base.pin = &vmw_surface_dmabuf_pin; vfbs->base.unpin = &vmw_surface_dmabuf_unpin; vfbs->surface = surface;
@@ -659,16 +698,25 @@ static int vmw_framebuffer_dmabuf_unpin(struct vmw_framebuffer *vfb)return vmw_dmabuf_from_vram (dev_priv, vfbd->buffer); } -int vmw_kms_new_framebuffer_dmabuf (struct vmw_private *dev_priv, -struct vmw_dma_buffer *dmabuf, -struct vmw_framebuffer **out, -unsigned width,unsigned height) +static int vmw_kms_new_framebuffer_dmabuf (struct vmw_private *dev_priv, +struct vmw_dma_buffer *dmabuf, +struct vmw_framebuffer **out, +const struct drm_mode_fb_cmd + *mode_cmd) {struct drm_device *dev = dev_priv->dev;struct vmw_framebuffer_dmabuf *vfbd; +unsigned int requested_size;int ret; + requested_size = mode_cmd->height * mode_cmd->pitch; +if (unlikely (requested_size > dmabuf->base.num_pages *PAGE_SIZE )) { +DRM_ERROR ("Screen buffer object size is too small " +"for requested mode.\n" ); +return -EINVAL ; + } + vfbd =kzalloc (sizeof (*vfbd),GFP_KERNEL );if (!vfbd) { ret = -ENOMEM ;
@@ -685,12 +733,11 @@ int vmw_kms_new_framebuffer_dmabuf(struct vmw_private *dev_priv, goto out_err3; } -/* XXX get the first 3 from the surface info */ - vfbd->base.base.bits_per_pixel =32 ; - vfbd->base.base.pitch = width * vfbd->base.base.bits_per_pixel /8 ; - vfbd->base.base.depth =24 ; - vfbd->base.base.width = width; - vfbd->base.base.height = height; + vfbd->base.base.bits_per_pixel = mode_cmd->bpp; + vfbd->base.base.pitch = mode_cmd->pitch; + vfbd->base.base.depth = mode_cmd->depth; + vfbd->base.base.width = mode_cmd->width; + vfbd->base.base.height = mode_cmd->height; vfbd->base.pin = vmw_framebuffer_dmabuf_pin; vfbd->base.unpin = vmw_framebuffer_dmabuf_unpin; vfbd->buffer = dmabuf;
@@ -719,8 +766,25 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev,struct vmw_framebuffer *vfb =NULL ;struct vmw_surface *surface =NULL ;struct vmw_dma_buffer *bo =NULL ; +unsigned int required_size;int ret; +/** +* This code should be conditioned on Screen Objects not being used. +* If screen objects are used, we can allocate a GMR to hold the +* requested framebuffer. +*/ + + required_size = mode_cmd->pitch * mode_cmd->height; +if (unlikely (required_size > dev_priv->vram_size)) { +DRM_ERROR ("VRAM size is too small for requested mode.\n" ); +return NULL ; + } + +/** +* End conditioned code. +*/ + ret =vmw_user_surface_lookup_handle (dev_priv, tfile, mode_cmd->handle, &surface);if (ret)
@@ -730,7 +794,7 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev, goto err_not_scanout; ret =vmw_kms_new_framebuffer_surface (dev_priv, surface, &vfb, - mode_cmd->width, mode_cmd->height); + mode_cmd);/* vmw_user_surface_lookup takes one ref so does new_fb */ vmw_surface_unreference (&surface);
@@ -751,7 +815,7 @@ try_dmabuf: } ret =vmw_kms_new_framebuffer_dmabuf (dev_priv, bo, &vfb, - mode_cmd->width, mode_cmd->height); + mode_cmd);/* vmw_user_dmabuf_lookup takes one ref so does new_fb */ vmw_dmabuf_unreference (&bo);
Signature · 1 line
1.6.2.5
PATCH 2/11 vmwgfx: Fix ACPI S3 & S4 functionality.
Don't suspend or hibernate when there are 3D resources active since we can't restore the device's 3D state. Instead fail with an error message.
In other cases, make sure we re-enable the fifo and unlock ttm on resume.
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 38 +++++++++++++++++++++++++++++++++- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 + 2 files changed, 37 insertions(+), 2 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +36 -2
@@ -751,15 +751,40 @@ static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val,* Buffer contents is moved to swappable memory. */ ttm_bo_swapout_all (&dev_priv->bdev); + +/** +* Release 3d reference held by fbdev and potentially +* stop fifo. +*/ + dev_priv->suspended = true; +if (dev_priv->enable_fb) +vmw_3d_resource_dec (dev_priv); +break ;case PM_POST_HIBERNATION :case PM_POST_SUSPEND : +case PM_POST_RESTORE : +if (!dev_priv->suspended) { +printk (KERN_WARNING +"[%s] Driver is not suspended at resume" +" point.\n" ,VMWGFX_DRIVER_NAME ); + +break ; + } + +/** +* Reclaim 3d reference held by fbdev and potentially +* start fifo. +*/ +if (dev_priv->enable_fb) +vmw_3d_resource_inc (dev_priv); + + dev_priv->suspended = false;ttm_suspend_unlock (&vmaster->lock); +break ;case PM_RESTORE_PREPARE :break ; -case PM_POST_RESTORE : -break ;default :break ; }
@@ -772,6 +797,15 @@ static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val,int vmw_pci_suspend (struct pci_dev *pdev,pm_message_t state) { +struct drm_device *dev =pci_get_drvdata (pdev); +struct vmw_private *dev_priv =vmw_priv (dev); + +if (dev_priv->num_3d_resources !=0 ) { +DRM_INFO ("Can't suspend or hibernate " +"while 3D resources are active.\n" ); +return -EBUSY ; + } +pci_save_state (pdev);pci_disable_device (pdev);pci_set_power_state (pdev, PCI_D3hot);
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +1 -0
@@ -286,6 +286,7 @@ struct vmw_private {struct vmw_master *active_master;struct vmw_master fbdev_master;struct notifier_block pm_nb; +bool suspended;struct mutex release_mutex;uint32_t num_3d_resources;
Signature · 1 line
1.6.2.5
PATCH 3/11 vmwgfx: Add new-style PM hooks to improve hibernation behavior
Add the new-style PM hooks prepare and complete. This allows us to power up the device again after the hibernation image has been created, and display output will thus be active until the VM is finally powered off.
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 113 ++++++++++++++++++++++++----------- 1 files changed, 79 insertions(+), 34 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +79 -34
@@ -752,34 +752,10 @@ static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val,*/ ttm_bo_swapout_all (&dev_priv->bdev); -/** -* Release 3d reference held by fbdev and potentially -* stop fifo. -*/ - dev_priv->suspended = true; -if (dev_priv->enable_fb) -vmw_3d_resource_dec (dev_priv); -break ;case PM_POST_HIBERNATION :case PM_POST_SUSPEND :case PM_POST_RESTORE : -if (!dev_priv->suspended) { -printk (KERN_WARNING -"[%s] Driver is not suspended at resume" -" point.\n" ,VMWGFX_DRIVER_NAME ); - -break ; - } - -/** -* Reclaim 3d reference held by fbdev and potentially -* start fifo. -*/ -if (dev_priv->enable_fb) -vmw_3d_resource_inc (dev_priv); - - dev_priv->suspended = false;ttm_suspend_unlock (&vmaster->lock);break ;
@@ -795,7 +771,7 @@ static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val,* These might not be needed with the virtual SVGA device. */ -int vmw_pci_suspend (struct pci_dev *pdev,pm_message_t state) +static int vmw_pci_suspend (struct pci_dev *pdev,pm_message_t state) {struct drm_device *dev =pci_get_drvdata (pdev);struct vmw_private *dev_priv =vmw_priv (dev);
@@ -812,13 +788,81 @@ int vmw_pci_suspend(struct pci_dev *pdev, pm_message_t state)return 0 ; } -int vmw_pci_resume (struct pci_dev *pdev) +static int vmw_pci_resume (struct pci_dev *pdev) {pci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev);return pci_enable_device (pdev); } +static int vmw_pm_suspend (struct device *kdev) +{ +struct pci_dev *pdev =to_pci_dev (kdev); +struct pm_message dummy; + + dummy.event =0 ; + +return vmw_pci_suspend (pdev, dummy); +} + +static int vmw_pm_resume (struct device *kdev) +{ +struct pci_dev *pdev =to_pci_dev (kdev); + +return vmw_pci_resume (pdev); +} + +static int vmw_pm_prepare (struct device *kdev) +{ +struct pci_dev *pdev =to_pci_dev (kdev); +struct drm_device *dev =pci_get_drvdata (pdev); +struct vmw_private *dev_priv =vmw_priv (dev); + +/** +* Release 3d reference held by fbdev and potentially +* stop fifo. +*/ + dev_priv->suspended = true; +if (dev_priv->enable_fb) +vmw_3d_resource_dec (dev_priv); + +if (dev_priv->num_3d_resources !=0 ) { + +DRM_INFO ("Can't suspend or hibernate " +"while 3D resources are active.\n" ); + +if (dev_priv->enable_fb) +vmw_3d_resource_inc (dev_priv); + dev_priv->suspended = false; +return -EBUSY ; + } + +return 0 ; +} + +static void vmw_pm_complete (struct device *kdev) +{ +struct pci_dev *pdev =to_pci_dev (kdev); +struct drm_device *dev =pci_get_drvdata (pdev); +struct vmw_private *dev_priv =vmw_priv (dev); + +/** +* Reclaim 3d reference held by fbdev and potentially +* start fifo. +*/ +if (dev_priv->enable_fb) +vmw_3d_resource_inc (dev_priv); + + dev_priv->suspended = false; +} + +static const struct dev_pm_ops vmw_pm_ops = { + .prepare = vmw_pm_prepare, + .complete = vmw_pm_complete, + .suspend = vmw_pm_suspend, + .resume = vmw_pm_resume, +}; +static struct drm_driver driver = { .driver_features =DRIVER_HAVE_IRQ |DRIVER_IRQ_SHARED |DRIVER_MODESET ,
@@ -854,15 +898,16 @@ static struct drm_driver driver = {#if defined(CONFIG_COMPAT ) .compat_ioctl = drm_compat_ioctl,#endif - }, + }, .pci_driver = { - .name = VMWGFX_DRIVER_NAME, - .id_table = vmw_pci_id_list, - .probe = vmw_probe, - .remove = vmw_remove, - .suspend = vmw_pci_suspend, - .resume = vmw_pci_resume - }, + .name = VMWGFX_DRIVER_NAME, + .id_table = vmw_pci_id_list, + .probe = vmw_probe, + .remove = vmw_remove, + .driver = { + .pm = &vmw_pm_ops + } + }, .name = VMWGFX_DRIVER_NAME, .desc = VMWGFX_DRIVER_DESC, .date = VMWGFX_DRIVER_DATE,
Signature · 1 line
1.6.2.5
PATCH 4/11 drm: vmwgfx: Add a struct drm_file parameter to the dirty framebuffer callback
This is needed for the callback to identify the caller and take appropriate locks if needed.
--- drivers/gpu/drm/drm_crtc.c | 3 ++- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 ++ include/drm/drm_crtc.h | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_crtc.c +2 -1
@@ -1854,7 +1854,8 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev, }if (fb->funcs->dirty) { - ret = fb->funcs->dirty (fb, flags, r->color, clips, num_clips); + ret = fb->funcs->dirty (fb, file_priv, flags, r->color, + clips, num_clips); }else { ret = -ENOSYS ; goto out_err2;
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +2 -0
@@ -392,6 +392,7 @@ out_unlock:int vmw_framebuffer_surface_dirty (struct drm_framebuffer *framebuffer, +struct drm_file *file_priv,unsigned flags,unsigned color,struct drm_clip_rect *clips,unsigned num_clips)
@@ -583,6 +584,7 @@ void vmw_framebuffer_dmabuf_destroy(struct drm_framebuffer *framebuffer) }int vmw_framebuffer_dmabuf_dirty (struct drm_framebuffer *framebuffer, +struct drm_file *file_priv,unsigned flags,unsigned color,struct drm_clip_rect *clips,unsigned num_clips)
include/drm/drm_crtc.h +2 -1
@@ -221,7 +221,8 @@ struct drm_framebuffer_funcs {* the semantics and arguments have a one to one mapping * on this function. */ -int (*dirty)(struct drm_framebuffer *framebuffer,unsigned flags, +int (*dirty)(struct drm_framebuffer *framebuffer, +struct drm_file *file_priv,unsigned flags,unsigned color,struct drm_clip_rect *clips,unsigned num_clips); };
Signature · 1 line
1.6.2.5
PATCH 5/11 vmwgfx: Take the ttm lock around the dirty ioctl
This makes sure noone accesses the fifo while it's taken down using the dirty ioctl.
Also make sure all workqueues are idled before the fifo is taken down.
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 ++- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 3 + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 84 ++++++++++++++++++++++++++++++++--- 3 files changed, 84 insertions(+), 8 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +4 -1
@@ -597,6 +597,8 @@ static void vmw_lastclose(struct drm_device *dev)static void vmw_master_init (struct vmw_master *vmaster) {ttm_lock_init (&vmaster->lock); +INIT_LIST_HEAD (&vmaster->fb_surf); +mutex_init (&vmaster->fb_surf_mutex); } static int vmw_master_create(struct drm_device *dev,
@@ -608,7 +610,7 @@ static int vmw_master_create(struct drm_device *dev,if (unlikely (vmaster ==NULL ))return -ENOMEM ; -ttm_lock_init (&vmaster->lock); +vmw_master_init (vmaster);ttm_lock_set_kill (&vmaster->lock, true,SIGTERM ); master->driver_priv = vmaster;
@@ -699,6 +701,7 @@ static void vmw_master_drop(struct drm_device *dev, vmw_fp->locked_master =drm_master_get (file_priv->master); ret =ttm_vt_lock (&vmaster->lock, false, vmw_fp->tfile); +vmw_kms_idle_workqueues (vmaster);if (unlikely ((ret !=0 ))) {DRM_ERROR ("Unable to lock TTM at VT switch.\n" );
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +3 -0
@@ -151,6 +151,8 @@ struct vmw_overlay;struct vmw_master {struct ttm_lock lock; +struct mutex fb_surf_mutex; +struct list_head fb_surf; };struct vmw_vga_topology_state {
@@ -519,6 +521,7 @@ void vmw_kms_write_svga(struct vmw_private *vmw_priv, unsigned bbp, unsigned depth);int vmw_kms_update_layout_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); +void vmw_kms_idle_workqueues (struct vmw_master *vmaster);u32 vmw_get_vblank_counter (struct drm_device *dev,int crtc);/**
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +77 -7
191 lines not on this page · raw message
Signature · 1 line
1.6.2.5
PATCH 6/11 vmwgfx: Prune modes based on available VRAM size
This needs to be reviewed once we support screen objects and don't rely on VRAM for the frame-buffer.
Also fix some integer overflow issues pointed out by Michel Daenzer.
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 3 +++ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 7 +++++++ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 11 +++++++++-- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 28 +++++++++++++++++++--------- 4 files changed, 38 insertions(+), 11 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +3 -0
@@ -522,6 +522,9 @@ void vmw_kms_write_svga(struct vmw_private *vmw_priv,int vmw_kms_update_layout_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv);void vmw_kms_idle_workqueues (struct vmw_master *vmaster); +bool vmw_kms_validate_mode_vram (struct vmw_private *dev_priv, +uint32_t pitch, +uint32_t height);u32 vmw_get_vblank_counter (struct drm_device *dev,int crtc);/**
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +7 -0
@@ -144,6 +144,13 @@ static int vmw_fb_check_var(struct fb_var_screeninfo *var,return -EINVAL ; } +if (!vmw_kms_validate_mode_vram (vmw_priv, + info->fix.line_length, + var->yoffset + var->yres)) { +DRM_ERROR ("Requested geom can not fit in framebuffer\n" ); +return -EINVAL ; + } +return 0 ; }
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +9 -2
@@ -838,7 +838,7 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev,struct vmw_framebuffer *vfb =NULL ;struct vmw_surface *surface =NULL ;struct vmw_dma_buffer *bo =NULL ; -unsigned int required_size; +u64 required_size;int ret;/**
@@ -848,7 +848,7 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev,*/ required_size = mode_cmd->pitch * mode_cmd->height; -if (unlikely (required_size > dev_priv->vram_size)) { +if (unlikely (required_size > (u64 ) dev_priv->vram_size)) {DRM_ERROR ("VRAM size is too small for requested mode.\n" );return NULL ; }
@@ -1133,6 +1133,13 @@ out_unlock:return ret; } +bool vmw_kms_validate_mode_vram (struct vmw_private *dev_priv, +uint32_t pitch, +uint32_t height) +{ +return ((u64 ) pitch * (u64 ) height) < (u64 ) dev_priv->vram_size; +} +u32 vmw_get_vblank_counter (struct drm_device *dev,int crtc) {return 0 ;
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +19 -9
@@ -427,7 +427,9 @@ static int vmw_ldu_connector_fill_modes(struct drm_connector *connector, { struct vmw_legacy_display_unit *ldu = vmw_connector_to_ldu(connector); struct drm_device *dev = connector->dev; + struct vmw_private *dev_priv = vmw_priv(dev); struct drm_display_mode *mode = NULL; + struct drm_display_mode *bmode; struct drm_display_mode prefmode = { DRM_MODE("preferred", DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -443,22 +445,30 @@ static int vmw_ldu_connector_fill_modes(struct drm_connector *connector, mode->hdisplay = ldu->pref_width; mode->vdisplay = ldu->pref_height; mode->vrefresh =drm_mode_vrefresh (mode); -drm_mode_probed_add (connector, mode); +if (vmw_kms_validate_mode_vram (dev_priv, mode->hdisplay *2 , + mode->vdisplay)) { +drm_mode_probed_add (connector, mode); -if (ldu->pref_mode) { -list_del_init (&ldu->pref_mode->head); -drm_mode_destroy (dev, ldu->pref_mode); - } +if (ldu->pref_mode) { +list_del_init (&ldu->pref_mode->head); +drm_mode_destroy (dev, ldu->pref_mode); + } - ldu->pref_mode = mode; + ldu->pref_mode = mode; + } }for (i =0 ; vmw_ldu_connector_builtin[i].type !=0 ; i++) { -if (vmw_ldu_connector_builtin[i].hdisplay > max_width || - vmw_ldu_connector_builtin[i].vdisplay > max_height) + bmode = &vmw_ldu_connector_builtin[i]; +if (bmode->hdisplay > max_width || + bmode->vdisplay > max_height) +continue ; + +if (!vmw_kms_validate_mode_vram (dev_priv, bmode->hdisplay *2 , + bmode->vdisplay))continue ; - mode =drm_mode_duplicate (dev, &vmw_ldu_connector_builtin[i]); + mode =drm_mode_duplicate (dev, bmode);if (!mode)return 0 ; mode->vrefresh =drm_mode_vrefresh (mode);
Signature · 1 line
1.6.2.5
PATCH 7/11 vmwgfx: Don't flush fb if we're in the suspended state.
--- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +3 -0
@@ -212,6 +212,9 @@ static void vmw_fb_dirty_flush(struct vmw_fb_par *par)SVGAFifoCmdUpdate body; } *cmd; +if (vmw_priv->suspended) +return ; +spin_lock_irqsave (&par->dirty.lock, flags);if (!par->dirty.active) {spin_unlock_irqrestore (&par->dirty.lock, flags);
Signature · 1 line
1.6.2.5
PATCH 8/11 vmwgfx: Add a parameter to get the max fb size
This can be used by the X server to restrict mode resolutions and size of root pixmap.
Bump minor to announce this availability.
Bump driver date.
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 3 +++ include/drm/vmwgfx_drm.h | 1 + 3 files changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +2 -2
@@ -39,9 +39,9 @@#include "ttm/ttm_execbuf_util.h" #include "ttm/ttm_module.h" -#define VMWGFX_DRIVER_DATE "20100209" +#define VMWGFX_DRIVER_DATE "20100723"#define VMWGFX_DRIVER_MAJOR 1 -#define VMWGFX_DRIVER_MINOR 2 +#define VMWGFX_DRIVER_MINOR 3#define VMWGFX_DRIVER_PATCHLEVEL 0#define VMWGFX_FILE_PAGE_OFFSET 0x00100000#define VMWGFX_FIFO_STATIC_SIZE (1024*1024)
drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c +3 -0
@@ -54,6 +54,9 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data,case DRM_VMW_PARAM_FIFO_CAPS : param->value = dev_priv->fifo.capabilities;break ; +case DRM_VMW_PARAM_MAX_FB_SIZE : + param->value = dev_priv->vram_size; +break ;default :DRM_ERROR ("Illegal vmwgfx get param request: %d\n" , param->param);
include/drm/vmwgfx_drm.h +1 -0
@@ -72,6 +72,7 @@#define DRM_VMW_PARAM_FIFO_OFFSET 3#define DRM_VMW_PARAM_HW_CAPS 4#define DRM_VMW_PARAM_FIFO_CAPS 5 +#define DRM_VMW_PARAM_MAX_FB_SIZE 6/** * struct drm_vmw_getparam_arg
Signature · 1 line
1.6.2.5
PATCH 9/11 vmwgfx: Add modinfo version
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +4 -0
@@ -944,3 +944,7 @@ module_exit(vmwgfx_exit);MODULE_AUTHOR ("VMware Inc. and others" );MODULE_DESCRIPTION ("Standalone drm driver for the VMware SVGA device" );MODULE_LICENSE ("GPL and additional rights" ); +MODULE_VERSION(__stringify(VMWGFX_DRIVER_MAJOR) "." + __stringify(VMWGFX_DRIVER_MINOR) "." + __stringify(VMWGFX_DRIVER_PATCHLEVEL) "." + "0");
Signature · 1 line
1.6.2.5
PATCH 10/11 vmwgfx: Save at least one screen layout
Save at least one screen layout during vga save to avoid odd things happening during restore.
--- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +3 -0
@@ -1025,6 +1025,9 @@ int vmw_kms_save_vga(struct vmw_private *vmw_priv) vmw_priv->num_displays =vmw_read (vmw_priv,SVGA_REG_NUM_GUEST_DISPLAYS ); +if (vmw_priv->num_displays ==0 ) + vmw_priv->num_displays =1 ; +for (i =0 ; i < vmw_priv->num_displays; ++i) { save = &vmw_priv->vga_save[i];vmw_write (vmw_priv,SVGA_REG_DISPLAY_ID , i);
Signature · 1 line
1.6.2.5
PATCH 11/11 vmwgfx: Bump minor and driver date
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +2 -2
@@ -39,9 +39,9 @@#include "ttm/ttm_execbuf_util.h" #include "ttm/ttm_module.h" -#define VMWGFX_DRIVER_DATE "20100723" +#define VMWGFX_DRIVER_DATE "20100927"#define VMWGFX_DRIVER_MAJOR 1 -#define VMWGFX_DRIVER_MINOR 3 +#define VMWGFX_DRIVER_MINOR 4#define VMWGFX_DRIVER_PATCHLEVEL 0#define VMWGFX_FILE_PAGE_OFFSET 0x00100000#define VMWGFX_FIFO_STATIC_SIZE (1024*1024)
Signature · 1 line
1.6.2.5