| Message ID | 1459347584-30566-3-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 30 March 2016 at 15:19, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > 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> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> The way it was done originally (by Paulo) with commit c543188afb7a83e66161c026dc6fd5eb38dc0b63 it seemed deliberate. At the same time the libdrm got a different treatment 8c75703df0fdf65b3851f8eb5822705638decff3. Would be swell Paulo can confirm (re: unintentional or deliberate difference), if he recalls any of this :-) Barring any objections from Paulo Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> -Emil
2016-03-30 13:07 GMT-03:00 Emil Velikov <emil.l.velikov@gmail.com>: > On 30 March 2016 at 15:19, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: >> 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> >> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > The way it was done originally (by Paulo) with commit > c543188afb7a83e66161c026dc6fd5eb38dc0b63 it seemed deliberate. At the > same time the libdrm got a different treatment > 8c75703df0fdf65b3851f8eb5822705638decff3. Would be swell Paulo can > confirm (re: unintentional or deliberate difference), if he recalls > any of this :-) > > Barring any objections from Paulo No objections from Paulo. The include/uapi directory didn't even exist at that time, and I guess I was just trying to make things work, without any specific coding philosophy in mind. > Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> > > -Emil > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Wed, Mar 30, 2016 at 02:55:17PM -0300, Paulo Zanoni wrote: > 2016-03-30 13:07 GMT-03:00 Emil Velikov <emil.l.velikov@gmail.com>: > > On 30 March 2016 at 15:19, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > >> 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> > >> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > The way it was done originally (by Paulo) with commit > > c543188afb7a83e66161c026dc6fd5eb38dc0b63 it seemed deliberate. At the > > same time the libdrm got a different treatment > > 8c75703df0fdf65b3851f8eb5822705638decff3. Would be swell Paulo can > > confirm (re: unintentional or deliberate difference), if he recalls > > any of this :-) > > > > Barring any objections from Paulo > > No objections from Paulo. The include/uapi directory didn't even exist > at that time, and I guess I was just trying to make things work, > without any specific coding philosophy in mind. Yeah, I suspect that this was actually fumbled in the uapi split-up somehow ... -Daniel
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index bc7fbb572155..8cb377c5eb93 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -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; diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index db106ab01039..8c48c0a558c0 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -318,6 +318,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;
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> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- include/drm/drm_crtc.h | 10 ---------- include/uapi/drm/drm_mode.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-)