xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux into drm-misc-next

Browse Source 
Resync with drm-next, I have a patch which currently can't be applied
because drm-misc-next lacked the latest drm/i915 code.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
This commit is contained in:
Daniel Vetter
2017-03-23 08:15:55 +01:00
parent 1e797f556c 65d1086c44
commit 628d4c46ee
968 changed files with 37461 additions and 15471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
include/drm/drm_dp_helper.h
View File

@@ -417,6 +417,63 @@
#define DP_TEST_LANE_COUNT 0x220
#define DP_TEST_PATTERN 0x221
# define DP_NO_TEST_PATTERN 0x0
# define DP_COLOR_RAMP 0x1
# define DP_BLACK_AND_WHITE_VERTICAL_LINES 0x2
# define DP_COLOR_SQUARE 0x3
#define DP_TEST_H_TOTAL_HI 0x222
#define DP_TEST_H_TOTAL_LO 0x223
#define DP_TEST_V_TOTAL_HI 0x224
#define DP_TEST_V_TOTAL_LO 0x225
#define DP_TEST_H_START_HI 0x226
#define DP_TEST_H_START_LO 0x227
#define DP_TEST_V_START_HI 0x228
#define DP_TEST_V_START_LO 0x229
#define DP_TEST_HSYNC_HI 0x22A
# define DP_TEST_HSYNC_POLARITY (1 << 7)
# define DP_TEST_HSYNC_WIDTH_HI_MASK (127 << 0)
#define DP_TEST_HSYNC_WIDTH_LO 0x22B
#define DP_TEST_VSYNC_HI 0x22C
# define DP_TEST_VSYNC_POLARITY (1 << 7)
# define DP_TEST_VSYNC_WIDTH_HI_MASK (127 << 0)
#define DP_TEST_VSYNC_WIDTH_LO 0x22D
#define DP_TEST_H_WIDTH_HI 0x22E
#define DP_TEST_H_WIDTH_LO 0x22F
#define DP_TEST_V_HEIGHT_HI 0x230
#define DP_TEST_V_HEIGHT_LO 0x231
#define DP_TEST_MISC0 0x232
# define DP_TEST_SYNC_CLOCK (1 << 0)
# define DP_TEST_COLOR_FORMAT_MASK (3 << 1)
# define DP_TEST_COLOR_FORMAT_SHIFT 1
# define DP_COLOR_FORMAT_RGB (0 << 1)
# define DP_COLOR_FORMAT_YCbCr422 (1 << 1)
# define DP_COLOR_FORMAT_YCbCr444 (2 << 1)
# define DP_TEST_DYNAMIC_RANGE_CEA (1 << 3)
# define DP_TEST_YCBCR_COEFFICIENTS (1 << 4)
# define DP_YCBCR_COEFFICIENTS_ITU601 (0 << 4)
# define DP_YCBCR_COEFFICIENTS_ITU709 (1 << 4)
# define DP_TEST_BIT_DEPTH_MASK (7 << 5)
# define DP_TEST_BIT_DEPTH_SHIFT 5
# define DP_TEST_BIT_DEPTH_6 (0 << 5)
# define DP_TEST_BIT_DEPTH_8 (1 << 5)
# define DP_TEST_BIT_DEPTH_10 (2 << 5)
# define DP_TEST_BIT_DEPTH_12 (3 << 5)
# define DP_TEST_BIT_DEPTH_16 (4 << 5)
#define DP_TEST_MISC1 0x233
# define DP_TEST_REFRESH_DENOMINATOR (1 << 0)
# define DP_TEST_INTERLACED (1 << 1)
#define DP_TEST_REFRESH_RATE_NUMERATOR 0x234
#define DP_TEST_CRC_R_CR 0x240
#define DP_TEST_CRC_G_Y 0x242

11
include/drm/i915_pciids.h
View File

@@ -47,6 +47,14 @@
0x030000, 0xff0000, \
(unsigned long) info }
#define INTEL_I810_IDS(info) \
INTEL_VGA_DEVICE(0x7121, info), /* I810 */ \
INTEL_VGA_DEVICE(0x7123, info), /* I810_DC100 */ \
INTEL_VGA_DEVICE(0x7125, info) /* I810_E */
#define INTEL_I815_IDS(info) \
INTEL_VGA_DEVICE(0x1132, info) /* I815*/
#define INTEL_I830_IDS(info) \
INTEL_VGA_DEVICE(0x3577, info)
@@ -265,7 +273,8 @@
INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x1927, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x192B, info) /* Halo GT3 */ \
INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \
INTEL_VGA_DEVICE(0x192D, info) /* SRV GT3 */
#define INTEL_SKL_GT4_IDS(info) \
INTEL_VGA_DEVICE(0x1932, info), /* DT GT4 */ \