Commit 78c67d5f authored by Jani Nikula's avatar Jani Nikula
Browse files

Revert "drm: Add missing DP DSC extended capability definitions." 



This reverts commit 797e2c3f.

Part of a series where patches were modified while applying to resolve
conflicts, leading to further conflicts between drm-misc-next and
drm-intel-next, resulting in build failures in drm-tip. To be applied
again on a baseline with drm-misc-next and drm-intel-next in sync.

Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 7fe194b2

include/drm/display/drm_dp.h

+1 −9
Original line number Diff line number Diff line
@@ -239,9 +239,6 @@ 


#define DP_DSC_SUPPORT                      0x060   /* DP 1.4 */

# define DP_DSC_DECOMPRESSION_IS_SUPPORTED  (1 << 0)

# define DP_DSC_PASS_THROUGH_IS_SUPPORTED   (1 << 1)

# define DP_DSC_DYNAMIC_PPS_UPDATE_SUPPORT_COMP_TO_COMP    (1 << 2)

# define DP_DSC_DYNAMIC_PPS_UPDATE_SUPPORT_UNCOMP_TO_COMP  (1 << 3)



#define DP_DSC_REV                          0x061

# define DP_DSC_MAJOR_MASK                  (0xf << 0)
@@ -280,15 +277,12 @@ 


#define DP_DSC_BLK_PREDICTION_SUPPORT       0x066

# define DP_DSC_BLK_PREDICTION_IS_SUPPORTED (1 << 0)

# define DP_DSC_RGB_COLOR_CONV_BYPASS_SUPPORT (1 << 1)



#define DP_DSC_MAX_BITS_PER_PIXEL_LOW       0x067   /* eDP 1.4 */



#define DP_DSC_MAX_BITS_PER_PIXEL_HI        0x068   /* eDP 1.4 */

# define DP_DSC_MAX_BITS_PER_PIXEL_HI_MASK  (0x3 << 0)

# define DP_DSC_MAX_BITS_PER_PIXEL_HI_SHIFT 8

# define DP_DSC_MAX_BPP_DELTA_VERSION_MASK  0x06

# define DP_DSC_MAX_BPP_DELTA_AVAILABILITY  0x08



#define DP_DSC_DEC_COLOR_FORMAT_CAP         0x069

# define DP_DSC_RGB                         (1 << 0)
@@ -350,13 +344,11 @@ 
# define DP_DSC_24_PER_DP_DSC_SINK          (1 << 2)



#define DP_DSC_BITS_PER_PIXEL_INC           0x06F

# define DP_DSC_RGB_YCbCr444_MAX_BPP_DELTA_MASK 0x1f

# define DP_DSC_RGB_YCbCr420_MAX_BPP_DELTA_MASK 0xe0

# define DP_DSC_BITS_PER_PIXEL_1_16         0x0

# define DP_DSC_BITS_PER_PIXEL_1_8          0x1

# define DP_DSC_BITS_PER_PIXEL_1_4          0x2

# define DP_DSC_BITS_PER_PIXEL_1_2          0x3

# define DP_DSC_BITS_PER_PIXEL_1_1          0x4

# define DP_DSC_BITS_PER_PIXEL_1            0x4



#define DP_PSR_SUPPORT                      0x070   /* XXX 1.2? */

# define DP_PSR_IS_SUPPORTED                1