From c543188afb7a83e66161c026dc6fd5eb38dc0b63 Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Tue, 15 May 2012 18:09:02 -0300 Subject: drm: add generic ioctls to get/set properties on any object Useless for connector properties (since they already have their own ioctls), but useful when we add properties to CRTCs, planes and other objects. Reviewed-by: Eugeni Dodonov Reviewed-by: Rob Clark Tested-by: Rob Clark Signed-off-by: Paulo Zanoni Signed-off-by: Dave Airlie --- include/drm/drm.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/drm/drm.h') diff --git a/include/drm/drm.h b/include/drm/drm.h index 64ff02d5b730..5b831df15bf1 100644 --- a/include/drm/drm.h +++ b/include/drm/drm.h @@ -730,6 +730,8 @@ struct drm_prime_handle { #define DRM_IOCTL_MODE_GETPLANE DRM_IOWR(0xB6, struct drm_mode_get_plane) #define DRM_IOCTL_MODE_SETPLANE DRM_IOWR(0xB7, struct drm_mode_set_plane) #define DRM_IOCTL_MODE_ADDFB2 DRM_IOWR(0xB8, struct drm_mode_fb_cmd2) +#define DRM_IOCTL_MODE_OBJ_GETPROPERTIES DRM_IOWR(0xB9, struct drm_mode_obj_get_properties) +#define DRM_IOCTL_MODE_OBJ_SETPROPERTY DRM_IOWR(0xBA, struct drm_mode_obj_set_property) /** * Device specific ioctls should only be in their respective headers -- cgit v1.2.3 From 4271a4090068f9dec3784205391c59540130b132 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 2 Apr 2012 14:11:50 +0100 Subject: drm/prime: expose capability flags for userspace. This lets the kernel tell userspace if the device supports prime import/export. This is useful for -modesetting at least, but would be nice for other drivers. Reviewed-by: Chris Wilson Signed-off-by: Dave Airlie --- include/drm/drm.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/drm/drm.h') diff --git a/include/drm/drm.h b/include/drm/drm.h index 5b831df15bf1..e51035a3757f 100644 --- a/include/drm/drm.h +++ b/include/drm/drm.h @@ -777,6 +777,10 @@ struct drm_event_vblank { #define DRM_CAP_VBLANK_HIGH_CRTC 0x2 #define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3 #define DRM_CAP_DUMB_PREFER_SHADOW 0x4 +#define DRM_CAP_PRIME 0x5 + +#define DRM_PRIME_CAP_IMPORT 0x1 +#define DRM_PRIME_CAP_EXPORT 0x2 /* typedef area */ #ifndef __KERNEL__ -- cgit v1.2.3