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

Commit 8812f381 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Move DRM_MODE_OBJECT_* to uapi headers 



These type defines are officially part of the uapi, but ended up in
the wrong headers somehow when we split them all.

Cc: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1459347584-30566-3-git-send-email-daniel.vetter@ffwll.ch
parent 0b1ccd49

include/drm/drm_crtc.h

+0 −10
Original line number Diff line number Diff line
@@ -45,16 +45,6 @@ struct drm_clip_rect; 
struct device_node;

struct fence;



#define DRM_MODE_OBJECT_CRTC 0xcccccccc

#define DRM_MODE_OBJECT_CONNECTOR 0xc0c0c0c0

#define DRM_MODE_OBJECT_ENCODER 0xe0e0e0e0

#define DRM_MODE_OBJECT_MODE 0xdededede

#define DRM_MODE_OBJECT_PROPERTY 0xb0b0b0b0

#define DRM_MODE_OBJECT_FB 0xfbfbfbfb

#define DRM_MODE_OBJECT_BLOB 0xbbbbbbbb

#define DRM_MODE_OBJECT_PLANE 0xeeeeeeee

#define DRM_MODE_OBJECT_ANY 0



struct drm_mode_object {

	uint32_t id;

	uint32_t type;

include/uapi/drm/drm_mode.h

+10 −0
Original line number Diff line number Diff line
@@ -320,6 +320,16 @@ struct drm_mode_connector_set_property { 
	__u32 connector_id;

};



#define DRM_MODE_OBJECT_CRTC 0xcccccccc

#define DRM_MODE_OBJECT_CONNECTOR 0xc0c0c0c0

#define DRM_MODE_OBJECT_ENCODER 0xe0e0e0e0

#define DRM_MODE_OBJECT_MODE 0xdededede

#define DRM_MODE_OBJECT_PROPERTY 0xb0b0b0b0

#define DRM_MODE_OBJECT_FB 0xfbfbfbfb

#define DRM_MODE_OBJECT_BLOB 0xbbbbbbbb

#define DRM_MODE_OBJECT_PLANE 0xeeeeeeee

#define DRM_MODE_OBJECT_ANY 0



struct drm_mode_obj_get_properties {

	__u64 props_ptr;

	__u64 prop_values_ptr;