Re: [Mesa-dev] [PATCH v3 3/8] drm-uapi: bump headers

[Kenneth Graunke]

On Wednesday, March 21, 2018 7:12:48 AM PDT Lionel Landwerlin wrote:
> Required updates from drm-next for changes in i965.
> 
> Signed-off-by: Lionel Landwerlin 
> ---
>  include/drm-uapi/README  |   8 +--
>  include/drm-uapi/drm_mode.h  |  43 +---
>  include/drm-uapi/i915_drm.h  | 152 
> +--
>  include/drm-uapi/tegra_drm.h |  22 +--
>  4 files changed, 189 insertions(+), 36 deletions(-)

Acked-by: Kenneth Graunke 

Though, I honestly don't think acks or reviews should be required for
simply updating headers generated by the kernel.  Assuming you pull them
from drm-next, I say just go for it.


signature.asc
Description: This is a digitally signed message part.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH v3 3/8] drm-uapi: bump headers

[Lionel Landwerlin]

Required updates from drm-next for changes in i965.

Signed-off-by: Lionel Landwerlin 
---
 include/drm-uapi/README  |   8 +--
 include/drm-uapi/drm_mode.h  |  43 +---
 include/drm-uapi/i915_drm.h  | 152 +--
 include/drm-uapi/tegra_drm.h |  22 +--
 4 files changed, 189 insertions(+), 36 deletions(-)

diff --git a/include/drm-uapi/README b/include/drm-uapi/README
index 53dd711dad5..7f63fb2038b 100644
--- a/include/drm-uapi/README
+++ b/include/drm-uapi/README
@@ -13,9 +13,9 @@ $ make headers_install INSTALL_HDR_PATH=/path/to/install
 
 The last update was done at the following kernel commit :
 
-commit ca797d29cd63e7b71b4eea29aff3b1cefd1ecb59
-Merge: 2c1c55cb75a9 010d118c2061
+commit 78230c46ec0a91dd4256c9e54934b3c7095a7ee3
+Merge: b65bd4031156 037f03155b7d
 Author: Dave Airlie 
-Date:   Mon Dec 4 09:40:35 2017 +1000
+Date:   Wed Mar 21 14:07:03 2018 +1000
 
-Merge tag 'drm-intel-next-2017-11-17-1' of 
git://anongit.freedesktop.org/drm/drm-intel into drm-next
+Merge tag 'omapdrm-4.17' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next
diff --git a/include/drm-uapi/drm_mode.h b/include/drm-uapi/drm_mode.h
index 5597a87154e..50bcf4214ff 100644
--- a/include/drm-uapi/drm_mode.h
+++ b/include/drm-uapi/drm_mode.h
@@ -38,14 +38,18 @@ extern "C" {
 #define DRM_DISPLAY_MODE_LEN   32
 #define DRM_PROP_NAME_LEN  32
 
-#define DRM_MODE_TYPE_BUILTIN  (1<<0)
-#define DRM_MODE_TYPE_CLOCK_C  ((1<<1) | DRM_MODE_TYPE_BUILTIN)
-#define DRM_MODE_TYPE_CRTC_C   ((1<<2) | DRM_MODE_TYPE_BUILTIN)
+#define DRM_MODE_TYPE_BUILTIN  (1<<0) /* deprecated */
+#define DRM_MODE_TYPE_CLOCK_C  ((1<<1) | DRM_MODE_TYPE_BUILTIN) /* deprecated 
*/
+#define DRM_MODE_TYPE_CRTC_C   ((1<<2) | DRM_MODE_TYPE_BUILTIN) /* deprecated 
*/
 #define DRM_MODE_TYPE_PREFERRED(1<<3)
-#define DRM_MODE_TYPE_DEFAULT  (1<<4)
+#define DRM_MODE_TYPE_DEFAULT  (1<<4) /* deprecated */
 #define DRM_MODE_TYPE_USERDEF  (1<<5)
 #define DRM_MODE_TYPE_DRIVER   (1<<6)
 
+#define DRM_MODE_TYPE_ALL  (DRM_MODE_TYPE_PREFERRED |  \
+DRM_MODE_TYPE_USERDEF |\
+DRM_MODE_TYPE_DRIVER)
+
 /* Video mode flags */
 /* bit compatible with the xrandr RR_ definitions (bits 0-13)
  *
@@ -66,8 +70,8 @@ extern "C" {
 #define DRM_MODE_FLAG_PCSYNC   (1<<7)
 #define DRM_MODE_FLAG_NCSYNC   (1<<8)
 #define DRM_MODE_FLAG_HSKEW(1<<9) /* hskew provided */
-#define DRM_MODE_FLAG_BCAST(1<<10)
-#define DRM_MODE_FLAG_PIXMUX   (1<<11)
+#define DRM_MODE_FLAG_BCAST(1<<10) /* deprecated */
+#define DRM_MODE_FLAG_PIXMUX   (1<<11) /* deprecated */
 #define DRM_MODE_FLAG_DBLCLK   (1<<12)
 #define DRM_MODE_FLAG_CLKDIV2  (1<<13)
  /*
@@ -99,6 +103,20 @@ extern "C" {
 #define  DRM_MODE_FLAG_PIC_AR_16_9 \
(DRM_MODE_PICTURE_ASPECT_16_9<<19)
 
+#define  DRM_MODE_FLAG_ALL (DRM_MODE_FLAG_PHSYNC | \
+DRM_MODE_FLAG_NHSYNC | \
+DRM_MODE_FLAG_PVSYNC | \
+DRM_MODE_FLAG_NVSYNC | \
+DRM_MODE_FLAG_INTERLACE |  \
+DRM_MODE_FLAG_DBLSCAN |\
+DRM_MODE_FLAG_CSYNC |  \
+DRM_MODE_FLAG_PCSYNC | \
+DRM_MODE_FLAG_NCSYNC | \
+DRM_MODE_FLAG_HSKEW |  \
+DRM_MODE_FLAG_DBLCLK | \
+DRM_MODE_FLAG_CLKDIV2 |\
+DRM_MODE_FLAG_3D_MASK)
+
 /* DPMS flags */
 /* bit compatible with the xorg definitions. */
 #define DRM_MODE_DPMS_ON   0
@@ -173,6 +191,10 @@ extern "C" {
DRM_MODE_REFLECT_X | \
DRM_MODE_REFLECT_Y)
 
+/* Content Protection Flags */
+#define DRM_MODE_CONTENT_PROTECTION_UNDESIRED  0
+#define DRM_MODE_CONTENT_PROTECTION_DESIRED 1
+#define DRM_MODE_CONTENT_PROTECTION_ENABLED 2
 
 struct drm_mode_modeinfo {
__u32 clock;
@@ -341,7 +363,7 @@ struct drm_mode_get_connector {
__u32 pad;
 };
 
-#define DRM_MODE_PROP_PENDING  (1<<0)
+#define DRM_MODE_PROP_PENDING  (1<<0) /* deprecated, do not use */
 #define DRM_MODE_PROP_RANGE(1<<1)
 #define DRM_MODE_PROP_IMMUTABLE(1<<2)
 #define DRM_MODE_PROP_ENUM (1<<3) /* enumerated type with text strings */
@@ -576,8 +598,11 @@ struct drm_mode_crtc_lut {
 };
 
 struct drm_color_ctm {
-   /* Conversion matrix in S31.32 format. */
-   __s64 matrix[9];
+   /*
+* Conversion matrix in S31.32 sign-magnitude
+* (not two's complement!) format.
+