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

Commit 0ca9fff7 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes 

Part of a driver stack fix that fixes surface overcommiting on single execbuf calls.
* 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Add max surface memory param
parents 7fc61f84 11e6a09f

drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data, 
				  SVGA_FIFO_3D_HWVERSION));

		break;

	}

	case DRM_VMW_PARAM_MAX_SURF_MEMORY:

		param->value = dev_priv->memory_size;

		break;

	default:

		DRM_ERROR("Illegal vmwgfx get param request: %d\n",

			  param->param);

include/uapi/drm/vmwgfx_drm.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ 
#define DRM_VMW_PARAM_FIFO_CAPS        4

#define DRM_VMW_PARAM_MAX_FB_SIZE      5

#define DRM_VMW_PARAM_FIFO_HW_VERSION  6

#define DRM_VMW_PARAM_MAX_SURF_MEMORY  7



/**

 * struct drm_vmw_getparam_arg