Merge "drm/msm: add YUV422 format support" (1044c4c5) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/drm_edid.c

+17 −17

Original line number	Diff line number	Diff line
		@@ -1174,72 +1174,72 @@ static const struct drm_display_mode edid_cea_modes[] = {
		{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4896,
		4984, 5280, 0, 2160, 2168, 2178, 2250, 0,
		DRM_MODE_FLAG_PHSYNC \| DRM_MODE_FLAG_PVSYNC),
		.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},
		.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
		/* 95 - 3840x2160p@30Hz 16:9 */
		{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,
		4104, 4400, 0, 2160, 2168, 2178, 2250, 0,
		DRM_MODE_FLAG_PHSYNC \| DRM_MODE_FLAG_PVSYNC),
		.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},
		.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
		/* 96 - 3840x2160p@50Hz 16:9 */
		{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4896,
		4984, 5280, 0, 2160, 2168, 2178, 2250, 0,
		DRM_MODE_FLAG_PHSYNC \| DRM_MODE_FLAG_PVSYNC),
		.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},
		.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
		/* 97 - 3840x2160p@60Hz 16:9 */
		{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4016,
		4104, 4400, 0, 2160, 2168, 2178, 2250, 0,
		DRM_MODE_FLAG_PHSYNC \| DRM_MODE_FLAG_PVSYNC),
		.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},
		.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
		/* 98 - 4096x2160p@24Hz 256:135 */
		{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 5116,
		5204, 5500, 0, 2160, 2168, 2178, 2250, 0,
		DRM_MODE_FLAG_PHSYNC \| DRM_MODE_FLAG_PVSYNC),
		.vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},
		.vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },
		/* 99 - 4096x2160p@25Hz 256:135 */
		{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 5064,
		5152, 5280, 0, 2160, 2168, 2178, 2250, 0,
		DRM_MODE_FLAG_PHSYNC \| DRM_MODE_FLAG_PVSYNC),
		.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},
		.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },
		/* 100 - 4096x2160p@30Hz 256:135 */
		{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 4184,
		4272, 4400, 0, 2160, 2168, 2178, 2250, 0,
		DRM_MODE_FLAG_PHSYNC \| DRM_MODE_FLAG_PVSYNC),
		.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},
		.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },
		/* 101 - 4096x2160p@50Hz 256:135 */
		{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 594000, 4096, 5064,
		5152, 5280, 0, 2160, 2168, 2178, 2250, 0,
		DRM_MODE_FLAG_PHSYNC \| DRM_MODE_FLAG_PVSYNC),
		.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},
		.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },
		/* 102 - 4096x2160p@60Hz 256:135 */
		{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 594000, 4096, 4184,
		4272, 4400, 0, 2160, 2168, 2178, 2250, 0,
		DRM_MODE_FLAG_PHSYNC \| DRM_MODE_FLAG_PVSYNC),
		.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},
		.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },
		/* 103 - 3840x2160p@24Hz 64:27 */
		{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 5116,
		5204, 5500, 0, 2160, 2168, 2178, 2250, 0,
		DRM_MODE_FLAG_PHSYNC \| DRM_MODE_FLAG_PVSYNC),
		.vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},
		.vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
		/* 104 - 3840x2160p@25Hz 64:27 */
		{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,
		4104, 4400, 0, 2160, 2168, 2178, 2250, 0,
		DRM_MODE_FLAG_PHSYNC \| DRM_MODE_FLAG_PVSYNC),
		.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},
		.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
		/* 105 - 3840x2160p@30Hz 64:27 */
		{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,
		4104, 4400, 0, 2160, 2168, 2178, 2250, 0,
		DRM_MODE_FLAG_PHSYNC \| DRM_MODE_FLAG_PVSYNC),
		.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},
		.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
		/* 106 - 3840x2160p@50Hz 64:27 */
		{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4896,
		4984, 5280, 0, 2160, 2168, 2178, 2250, 0,
		DRM_MODE_FLAG_PHSYNC \| DRM_MODE_FLAG_PVSYNC),
		.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},
		.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
		/* 107 - 3840x2160p@60Hz 64:27 */
		{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4016,
		4104, 4400, 0, 2160, 2168, 2178, 2250, 0,
		DRM_MODE_FLAG_PHSYNC \| DRM_MODE_FLAG_PVSYNC),
		.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},
		.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
		};

		/*
		@@ -4313,11 +4313,11 @@ static void drm_parse_hdmi_deep_color_info(struct drm_connector *connector,
		* modes and forbids YCRCB422 support for all video modes per
		* HDMI 1.3 spec.
		*/
		info->color_formats = DRM_COLOR_FORMAT_RGB444;
		info->color_formats \|= DRM_COLOR_FORMAT_DC_RGB444;

		/* YCRCB444 is optional according to spec. */
		if (hdmi[6] & DRM_EDID_HDMI_DC_Y444) {
		info->color_formats \|= DRM_COLOR_FORMAT_YCRCB444;
		info->color_formats \|= DRM_COLOR_FORMAT_DC_YCRCB444;
		DRM_DEBUG("%s: HDMI sink does YCRCB444 in deep color.\n",
		connector->name);
		}

drivers/gpu/drm/drm_modes.c

+43 −0

Original line number	Diff line number	Diff line
		@@ -997,6 +997,7 @@ bool drm_mode_equal_no_clocks_no_stereo(const struct drm_display_mode *mode1,
		mode1->vsync_end == mode2->vsync_end &&
		mode1->vtotal == mode2->vtotal &&
		mode1->vscan == mode2->vscan &&
		mode1->picture_aspect_ratio == mode2->picture_aspect_ratio &&
		(mode1->flags & ~DRM_MODE_FLAG_3D_MASK) ==
		(mode2->flags & ~DRM_MODE_FLAG_3D_MASK))
		return true;
		@@ -1506,6 +1507,27 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out,
		out->vrefresh = in->vrefresh;
		out->flags = in->flags;
		out->type = in->type;
		out->flags &= ~DRM_MODE_FLAG_PIC_AR_MASK;

		switch (in->picture_aspect_ratio) {
		case HDMI_PICTURE_ASPECT_4_3:
		out->flags \|= DRM_MODE_FLAG_PIC_AR_4_3;
		break;
		case HDMI_PICTURE_ASPECT_16_9:
		out->flags \|= DRM_MODE_FLAG_PIC_AR_16_9;
		break;
		case HDMI_PICTURE_ASPECT_64_27:
		out->flags \|= DRM_MODE_FLAG_PIC_AR_64_27;
		break;
		case DRM_MODE_PICTURE_ASPECT_256_135:
		out->flags \|= DRM_MODE_FLAG_PIC_AR_256_135;
		break;
		case HDMI_PICTURE_ASPECT_RESERVED:
		default:
		out->flags \|= DRM_MODE_FLAG_PIC_AR_NONE;
		break;
		}

		strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN);
		out->name[DRM_DISPLAY_MODE_LEN-1] = 0;
		}
		@@ -1551,6 +1573,27 @@ int drm_mode_convert_umode(struct drm_display_mode *out,
		strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN);
		out->name[DRM_DISPLAY_MODE_LEN-1] = 0;

		/* Clearing picture aspect ratio bits from out flags */
		out->flags &= ~DRM_MODE_FLAG_PIC_AR_MASK;

		switch (in->flags & DRM_MODE_FLAG_PIC_AR_MASK) {
		case DRM_MODE_FLAG_PIC_AR_4_3:
		out->picture_aspect_ratio \|= HDMI_PICTURE_ASPECT_4_3;
		break;
		case DRM_MODE_FLAG_PIC_AR_16_9:
		out->picture_aspect_ratio \|= HDMI_PICTURE_ASPECT_16_9;
		break;
		case DRM_MODE_FLAG_PIC_AR_64_27:
		out->picture_aspect_ratio \|= HDMI_PICTURE_ASPECT_64_27;
		break;
		case DRM_MODE_FLAG_PIC_AR_256_135:
		out->picture_aspect_ratio \|= HDMI_PICTURE_ASPECT_256_135;
		break;
		default:
		out->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE;
		break;
		}

		out->status = drm_mode_validate_basic(out);
		if (out->status != MODE_OK)
		goto out;

drivers/gpu/drm/msm/msm_kms.h

+7 −3

Original line number	Diff line number	Diff line
		@@ -53,12 +53,16 @@
		*/
		/* Enable RGB444 30 bit deep color */
		#define MSM_MODE_FLAG_RGB444_DC_ENABLE (1<<5)
		/* Enable YUV422 30 bit deep color */
		#define MSM_MODE_FLAG_YUV422_DC_ENABLE (1<<6)
		/* Enable YUV420 30 bit deep color */
		#define MSM_MODE_FLAG_YUV420_DC_ENABLE (1<<6)
		#define MSM_MODE_FLAG_YUV420_DC_ENABLE (1<<7)
		/* Choose RGB444 format to display */
		#define MSM_MODE_FLAG_COLOR_FORMAT_RGB444 (1<<7)
		#define MSM_MODE_FLAG_COLOR_FORMAT_RGB444 (1<<8)
		/* Choose YUV422 format to display */
		#define MSM_MODE_FLAG_COLOR_FORMAT_YCBCR422 (1<<9)
		/* Choose YUV420 format to display */
		#define MSM_MODE_FLAG_COLOR_FORMAT_YCBCR420 (1<<8)
		#define MSM_MODE_FLAG_COLOR_FORMAT_YCBCR420 (1<<10)

		/* As there are different display controller blocks depending on the
		* snapdragon version, the kms support is split out and the appropriate

drivers/gpu/drm/msm/sde/sde_encoder.c

+15 −3

Original line number	Diff line number	Diff line
		@@ -199,6 +199,18 @@ static struct sde_csc_cfg sde_csc_10bit_convert[SDE_MAX_CSC] = {
		{ 0x0040, 0x03ac, 0x0040, 0x03c0, 0x0040, 0x03c0,},
		},

		[SDE_CSC_RGB2YUV_709FR] = {
		{
		TO_S15D16(0x006d), TO_S15D16(0x016e), TO_S15D16(0x0025),
		TO_S15D16(0xffc5), TO_S15D16(0xff3b), TO_S15D16(0x0100),
		TO_S15D16(0x0100), TO_S15D16(0xff17), TO_S15D16(0xffe9),
		},
		{ 0x0, 0x0, 0x0,},
		{ 0x0040, 0x0200, 0x0200,},
		{ 0x0, 0x3ff, 0x0, 0x3ff, 0x0, 0x3ff,},
		{ 0x0, 0x3ff, 0x0, 0x3ff, 0x0, 0x3ff,},
		},

		[SDE_CSC_RGB2YUV_2020L] = {
		{
		TO_S15D16(0x0073), TO_S15D16(0x0129), TO_S15D16(0x001a),
		@@ -5318,12 +5330,12 @@ void sde_encoder_phys_setup_cdm(struct sde_encoder_phys *phys_enc,

		if (output_type == CDM_CDWN_OUTPUT_HDMI) {
		if (connector && connector->yuv_qs)
		csc_type = SDE_CSC_RGB2YUV_601FR;
		csc_type = SDE_CSC_RGB2YUV_709FR;
		else if (connector &&
		sde_connector_mode_needs_full_range(connector))
		csc_type = SDE_CSC_RGB2YUV_601FR;
		csc_type = SDE_CSC_RGB2YUV_709FR;
		else
		csc_type = SDE_CSC_RGB2YUV_601L;
		csc_type = SDE_CSC_RGB2YUV_709L;
		} else if (output_type == CDM_CDWN_OUTPUT_WB) {
		csc_type = SDE_CSC_RGB2YUV_601L;
		}

drivers/gpu/drm/msm/sde/sde_encoder_phys_vid.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -792,6 +792,8 @@ static void sde_encoder_phys_vid_enable(struct sde_encoder_phys *phys_enc)

		if (mode.private_flags & MSM_MODE_FLAG_COLOR_FORMAT_YCBCR420)
		fmt = sde_get_sde_format(DRM_FORMAT_YUV420);
		else if (mode.private_flags & MSM_MODE_FLAG_COLOR_FORMAT_YCBCR422)
		fmt = sde_get_sde_format(DRM_FORMAT_NV61);

		if (fmt) {
		struct sde_rect hdmi_roi;