Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c79f844 authored by Shashank Sharma's avatar Shashank Sharma Committed by Jani Nikula
Browse files

drm/i915: Add CRTC output format YCBCR 4:4:4 



This patch adds support for YCBCR 4:4:4 CRTC output format.
To do this, this patch extends the existing YCBCR 4:2:0
framework by:
- Adding new parameter in for YCBCR 4:4:4 enum crtc_iutput_format.
- Adding case for YCBCR 4:4:4 in while setting AVI infoframes.
- Adding necessary checks in modeset sequence.

V3: Added this patch in the series
V4: Added r-b from Maarten (for v3)
    Addressed review comment from Ville:
    Do not use (config->output_format > CRTC_OUTPUT_RGB)
V5: Rebase
V6: Rebase and small change, to accommodate changes in patch 2
V7: Fixed checkpatch alignment warnings
V8: Rebase
V9: Rebase
V10: Rebase
V11: Addressed review comment from Ville
     Missing output_format_str[INTEL_OUTPUT_FORMAT_YCBCR444]
     Added Ville's R-B.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarShashank Sharma <shashank.sharma@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1539325394-20788-3-git-send-email-shashank.sharma@intel.com
parent 33b7f3ee

drivers/gpu/drm/i915/intel_color.c

+2 −1
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ static void ilk_load_csc_matrix(struct drm_crtc_state *crtc_state) 
	if (INTEL_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv))

		limited_color_range = intel_crtc_state->limited_color_range;



	if (intel_crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420) {

	if (intel_crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 ||

	    intel_crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444) {

		ilk_load_ycbcr_conversion_matrix(intel_crtc);

		return;

	} else if (crtc_state->ctm) {

drivers/gpu/drm/i915/intel_display.c

+10 −4
Original line number Diff line number Diff line
@@ -6591,7 +6591,8 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc, 
		return -EINVAL;

	}



	if (pipe_config->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&

	if ((pipe_config->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 ||

	     pipe_config->output_format == INTEL_OUTPUT_FORMAT_YCBCR444) &&

	     pipe_config->base.ctm) {

		/*

		 * There is only one pipe CSC unit per pipe, and we need that
@@ -7812,6 +7813,8 @@ static void intel_get_crtc_ycbcr_config(struct intel_crtc *crtc, 
					output = INTEL_OUTPUT_FORMAT_INVALID;

				else

					output = INTEL_OUTPUT_FORMAT_YCBCR420;

			} else {

				output = INTEL_OUTPUT_FORMAT_YCBCR444;

			}

		}

	}
@@ -8453,11 +8456,13 @@ static void haswell_set_pipemisc(const struct intel_crtc_state *crtc_state) 
		if (crtc_state->dither)

			val |= PIPEMISC_DITHER_ENABLE | PIPEMISC_DITHER_TYPE_SP;



		if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420) {

		if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 ||

		    crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444)

			val |= PIPEMISC_OUTPUT_COLORSPACE_YUV;



		if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420)

			val |= PIPEMISC_YUV420_ENABLE |

				PIPEMISC_YUV420_MODE_FULL_BLEND;

		}



		I915_WRITE(PIPEMISC(intel_crtc->pipe), val);

	}
@@ -10940,6 +10945,7 @@ static const char * const output_format_str[] = { 
	[INTEL_OUTPUT_FORMAT_INVALID] = "Invalid",

	[INTEL_OUTPUT_FORMAT_RGB] = "RGB",

	[INTEL_OUTPUT_FORMAT_YCBCR420] = "YCBCR4:2:0",

	[INTEL_OUTPUT_FORMAT_YCBCR444] = "YCBCR4:4:4",

};



static const char *output_formats(enum intel_output_format format)

drivers/gpu/drm/i915/intel_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -716,6 +716,7 @@ enum intel_output_format { 
	INTEL_OUTPUT_FORMAT_INVALID,

	INTEL_OUTPUT_FORMAT_RGB,

	INTEL_OUTPUT_FORMAT_YCBCR420,

	INTEL_OUTPUT_FORMAT_YCBCR444,

};



struct intel_crtc_state {

drivers/gpu/drm/i915/intel_hdmi.c

+2 −0
Original line number Diff line number Diff line
@@ -480,6 +480,8 @@ static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder, 


	if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420)

		frame.avi.colorspace = HDMI_COLORSPACE_YUV420;

	else if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444)

		frame.avi.colorspace = HDMI_COLORSPACE_YUV444;

	else

		frame.avi.colorspace = HDMI_COLORSPACE_RGB;