| Message ID | 1423147315-23890-3-git-send-email-tvrtko.ursulin@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Feb 05, 2015 at 02:41:53PM +0000, Tvrtko Ursulin wrote: > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > > To be used from the new addfb2 extension. > > Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > --- > include/uapi/drm/i915_drm.h | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h > index 6eed16b..e4c09e2 100644 > --- a/include/uapi/drm/i915_drm.h > +++ b/include/uapi/drm/i915_drm.h > @@ -28,6 +28,7 @@ > #define _UAPI_I915_DRM_H_ > > #include <drm/drm.h> > +#include <uapi/drm/drm_fourcc.h> > > /* Please note that modifications to all structs defined here are > * subject to backwards-compatibility constraints. > @@ -1101,4 +1102,18 @@ struct drm_i915_gem_context_param { > __u64 value; > }; > > +/** @{ > + * Intel framebuffer modifiers > + * > + * Tiling modes supported by the display hardware > + * to be passed in via the DRM addfb2 ioctl. > + */ > +/** Bits reserved for tiling */ > +#define I915_FORMAT_MOD_TILING_MASK fourcc_mod_code(INTEL, 0xff) > +/** None */ > +#define I915_FORMAT_MOD_NONE fourcc_mod_code(INTEL, 0x00000000000000L) > +/** X tiling */ > +#define I915_FORMAT_MOD_X_TILED fourcc_mod_code(INTEL, 0x00000000000001L) > +/** @} */ These must be in drm_fourcc.h, adn ** @{ isn't how kerneldoc works. I've fixed this up plus add a bit of wording to make it clearer what these are. Btw for the new tiling modes I think we should fully spec out the layout, as Rob suggested. -Daniel > + > #endif /* _UAPI_I915_DRM_H_ */ > -- > 2.2.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Thu, Feb 05, 2015 at 02:41:53PM +0000, Tvrtko Ursulin wrote: > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > > To be used from the new addfb2 extension. > > Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > --- > include/uapi/drm/i915_drm.h | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h > index 6eed16b..e4c09e2 100644 > --- a/include/uapi/drm/i915_drm.h > +++ b/include/uapi/drm/i915_drm.h > @@ -28,6 +28,7 @@ > #define _UAPI_I915_DRM_H_ > > #include <drm/drm.h> > +#include <uapi/drm/drm_fourcc.h> > > /* Please note that modifications to all structs defined here are > * subject to backwards-compatibility constraints. > @@ -1101,4 +1102,18 @@ struct drm_i915_gem_context_param { > __u64 value; > }; > > +/** @{ > + * Intel framebuffer modifiers > + * > + * Tiling modes supported by the display hardware > + * to be passed in via the DRM addfb2 ioctl. > + */ > +/** Bits reserved for tiling */ > +#define I915_FORMAT_MOD_TILING_MASK fourcc_mod_code(INTEL, 0xff) > +/** None */ > +#define I915_FORMAT_MOD_NONE fourcc_mod_code(INTEL, 0x00000000000000L) And we don't need an intel specific version for untiled either. -Daniel > +/** X tiling */ > +#define I915_FORMAT_MOD_X_TILED fourcc_mod_code(INTEL, 0x00000000000001L) > +/** @} */ > + > #endif /* _UAPI_I915_DRM_H_ */ > -- > 2.2.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index 6eed16b..e4c09e2 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -28,6 +28,7 @@ #define _UAPI_I915_DRM_H_ #include <drm/drm.h> +#include <uapi/drm/drm_fourcc.h> /* Please note that modifications to all structs defined here are * subject to backwards-compatibility constraints. @@ -1101,4 +1102,18 @@ struct drm_i915_gem_context_param { __u64 value; }; +/** @{ + * Intel framebuffer modifiers + * + * Tiling modes supported by the display hardware + * to be passed in via the DRM addfb2 ioctl. + */ +/** Bits reserved for tiling */ +#define I915_FORMAT_MOD_TILING_MASK fourcc_mod_code(INTEL, 0xff) +/** None */ +#define I915_FORMAT_MOD_NONE fourcc_mod_code(INTEL, 0x00000000000000L) +/** X tiling */ +#define I915_FORMAT_MOD_X_TILED fourcc_mod_code(INTEL, 0x00000000000001L) +/** @} */ + #endif /* _UAPI_I915_DRM_H_ */