Merge tag 'amd-drm-next-6.8-2023-12-15' of https://gitlab.freedesktop.org/agd5f/linux...

amd-drm-next-6.8-2023-12-15:

amdgpu:
- Suspend fixes
- Misc code cleanups
- JPEG fix
- Add AMD specific color management (protected by AMD_PRIVATE_COLOR)
- UHBR13.5 cable fixes
- Misc display fixes
- Display WB fixes
- PSR fixes
- XGMI fix
- ACPI WBRF support for handling potential RF interference from GPU clocks
- Enable tunneling on high priority compute queues
- drm_edid.h include cleanup
- VPE DPM support
- SMU 13 fixes
- Fix possible double frees in error paths
- Misc fixes

amdkfd:
- Support import and export of dma-bufs using GEM handles
- MES shader debugger fixes
- SVM fixes

radeon:
- drm_edid.h include cleanup
- Misc code cleanups
- Fix possible memory leak in error path

drm:
- Increase max objects to accomodate new color props
- Make replace_property_blob_from_id a DRM helper
- Track color management changes per plane

platform-x86:
- Merge immutable branch from Hans for platform dependencies for WBRF to coordinate
  merge of WBRF feature across wifi, platform, and GPU

Signed-off-by: Dave Airlie <[email protected]>
# -----BEGIN PGP SIGNATURE-----
#
# iHUEABYKAB0WIQQgO5Idg2tXNTSZAr293/aFa7yZ2AUCZXygTgAKCRC93/aFa7yZ
# 2EW1AQCILfGTtDWXzgLSpUBtt9jOooHqaSrah19Cfw0HlA3QIQD+OCohXH1LLZo1
# tYHyfsLv0LsNawI198qABzB1PwptSAI=
# =M1AO
# -----END PGP SIGNATURE-----
# gpg: Signature made Sat 16 Dec 2023 04:51:58 AEST
# gpg:                using EDDSA key 203B921D836B5735349902BDBDDFF6856BBC99D8
# gpg: Can't check signature: No public key
From: Alex Deucher <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --combined include/uapi/drm/drm_mode.h
index aee3d40c96f06f7e9076408252c5d08b53503c6f,39d9ac0c0a8098f3bc8c6be4bc243766aa0200e3..7040e7ea80c79d61c4ce02534b0150eb4e4c8a8b
--- 1/include/uapi/drm/drm_mode.h
--- 2/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
@@@ -36,10 -36,10 +36,10 @@@ extern "C" 
  /**
   * DOC: overview
   *
 - * DRM exposes many UAPI and structure definition to have a consistent
 - * and standardized interface with user.
 + * DRM exposes many UAPI and structure definitions to have a consistent
 + * and standardized interface with users.
   * Userspace can refer to these structure definitions and UAPI formats
 - * to communicate to driver
 + * to communicate to drivers.
   */
  
  #define DRM_CONNECTOR_NAME_LEN        32
@@@ -540,7 -540,7 +540,7 @@@ struct drm_mode_get_connector 
  /* the PROP_ATOMIC flag is used to hide properties from userspace that
   * is not aware of atomic properties.  This is mostly to work around
   * older userspace (DDX drivers) that read/write each prop they find,
 - * witout being aware that this could be triggering a lengthy modeset.
 + * without being aware that this could be triggering a lengthy modeset.
   */
  #define DRM_MODE_PROP_ATOMIC        0x80000000
  
@@@ -664,7 -664,7 +664,7 @@@ struct drm_mode_fb_cmd 
  };
  
  #define DRM_MODE_FB_INTERLACED        (1<<0) /* for interlaced framebuffers */
 -#define DRM_MODE_FB_MODIFIERS (1<<1) /* enables ->modifer[] */
 +#define DRM_MODE_FB_MODIFIERS (1<<1) /* enables ->modifier[] */
  
  /**
   * struct drm_mode_fb_cmd2 - Frame-buffer metadata.
@@@ -846,6 -846,14 +846,14 @@@ struct drm_color_ctm 
        __u64 matrix[9];
  };
  
+ struct drm_color_ctm_3x4 {
+       /*
+        * Conversion matrix with 3x4 dimensions in S31.32 sign-magnitude
+        * (not two's complement!) format.
+        */
+       __u64 matrix[12];
+ };
+ 
  struct drm_color_lut {
        /*
         * Values are mapped linearly to 0.0 - 1.0 range, with 0x0 == 0.0 and
@@@ -881,8 -889,8 +889,8 @@@ struct hdr_metadata_infoframe 
         * These are coded as unsigned 16-bit values in units of
         * 0.00002, where 0x0000 represents zero and 0xC350
         * represents 1.0000.
 -       * @display_primaries.x: X cordinate of color primary.
 -       * @display_primaries.y: Y cordinate of color primary.
 +       * @display_primaries.x: X coordinate of color primary.
 +       * @display_primaries.y: Y coordinate of color primary.
         */
        struct {
                __u16 x, y;
@@@ -892,8 -900,8 +900,8 @@@
         * These are coded as unsigned 16-bit values in units of
         * 0.00002, where 0x0000 represents zero and 0xC350
         * represents 1.0000.
 -       * @white_point.x: X cordinate of whitepoint of color primary.
 -       * @white_point.y: Y cordinate of whitepoint of color primary.
 +       * @white_point.x: X coordinate of whitepoint of color primary.
 +       * @white_point.y: Y coordinate of whitepoint of color primary.
         */
        struct {
                __u16 x, y;