Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a87897ed authored by Jakob Bornecrantz's avatar Jakob Bornecrantz Committed by Dave Airlie
Browse files

drm/vmwgfx: Drop scanout flag compat and add execbuf ioctl parameter members. Bumps major. 



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: default avatarJakob Bornecrantz <jakob@vmware.com>
Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 3bef3572

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+3 −3
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/vmwgfx/vmwgfx_resource.c

+1 −16
Original line number Diff line number Diff line
@@ -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 &&

include/drm/vmwgfx_drm.h

+8 −0
Original line number Diff line number Diff line
@@ -303,15 +303,23 @@ union drm_vmw_surface_reference_arg { 
 * to the nearest kernel tick.

 * @fence_rep: User-space address of a struct drm_vmw_fence_rep cast to an

 * uint64_t.

 * @version: Allows expanding the execbuf ioctl parameters without breaking

 * backwards compatibility, since user-space will always tell the kernel

 * which version it uses.

 * @flags: Execbuf flags. None currently.

 *

 * Argument to the DRM_VMW_EXECBUF Ioctl.

 */



#define DRM_VMW_EXECBUF_VERSION 0



struct drm_vmw_execbuf_arg {

	uint64_t commands;

	uint32_t command_size;

	uint32_t throttle_us;

	uint64_t fence_rep;

	 uint32_t version;

	 uint32_t flags;

};



/**