Re: [PATCH] drm/vmwgfx: Bump major and drop scanout flag compat

[Thomas Hellstrom <thomas@shipmail.org>]

Jakob Bornecrantz wrote:
> Even if this bumps the version to 1 it does not mean the driver is
> out of staging. From what we know this is the last backwards
> incompatible change to the driver.
>
> Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
> ---
>  drivers/gpu/drm/vmwgfx/vmwgfx_drv.h      |    6 +++---
>  drivers/gpu/drm/vmwgfx/vmwgfx_resource.c |   17 +----------------
>  2 files changed, 4 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
> index 9c89868..356dc93 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
> @@ -39,9 +39,9 @@
>  #include "ttm/ttm_execbuf_util.h"
>  #include "ttm/ttm_module.h"
>  
> -#define VMWGFX_DRIVER_DATE "20100118"
> -#define VMWGFX_DRIVER_MAJOR 0
> -#define VMWGFX_DRIVER_MINOR 9
> +#define VMWGFX_DRIVER_DATE "20100209"
> +#define VMWGFX_DRIVER_MAJOR 1
> +#define VMWGFX_DRIVER_MINOR 0
>  #define VMWGFX_DRIVER_PATCHLEVEL 0
>  #define VMWGFX_FILE_PAGE_OFFSET 0x00100000
>  #define VMWGFX_FIFO_STATIC_SIZE (1024*1024)
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
> index 933e90d..f8fbbc6 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
> @@ -35,11 +35,6 @@
>  #define VMW_RES_SURFACE ttm_driver_type1
>  #define VMW_RES_STREAM ttm_driver_type2
>  
> -/* XXX: This isn't a real hardware flag, but just a hack for kernel to
> - * know about primary surfaces. Find a better way to accomplish this.
> - */
> -#define SVGA3D_SURFACE_HINT_SCANOUT (1 << 9)
> -
>  struct vmw_user_context {
>  	struct ttm_base_object base;
>  	struct vmw_resource res;
> @@ -579,6 +574,7 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data,
>  
>  	srf->flags = req->flags;
>  	srf->format = req->format;
> +	srf->scanout = req->scanout;
>  	memcpy(srf->mip_levels, req->mip_levels, sizeof(srf->mip_levels));
>  	srf->num_sizes = 0;
>  	for (i = 0; i < DRM_VMW_MAX_SURFACE_FACES; ++i)
> @@ -604,17 +600,6 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data,
>  	if (unlikely(ret != 0))
>  		goto out_err1;
>  
> -	if (srf->flags & SVGA3D_SURFACE_HINT_SCANOUT) {
> -		/* we should not send this flag down to hardware since
> -		 * its not a official one
> -		 */
> -		srf->flags &= ~SVGA3D_SURFACE_HINT_SCANOUT;
> -		srf->scanout = true;
> -	} else if (req->scanout)
> -		srf->scanout = true;
> -	else
> -		srf->scanout = false;
> -
>  	if (srf->scanout &&
>  	    srf->num_sizes == 1 &&
>  	    srf->sizes[0].width == 64 &&
>   

Nack. There are some more minor pending changes before we bump. I'll 
resend shortly.

/Thomas


------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
--