[Intel-gfx] [PATCH v3 2/7] drm/i915: Add CRTC output format YCBCR 4:4:4

[Sharma, Shashank]

Regards

Shashank


On 1/17/2018 11:57 PM, Ville Syrjälä wrote:
> On Fri, Jan 05, 2018 at 03:15:30PM +0530, Shashank Sharma wrote:
>> 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
>>
>> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
>> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
>> Signed-off-by: Shashank Sharma <shashank.sharma at intel.com>
>> ---
>>   drivers/gpu/drm/i915/intel_color.c   |  3 ++-
>>   drivers/gpu/drm/i915/intel_display.c | 13 +++++++++----
>>   drivers/gpu/drm/i915/intel_drv.h     |  1 +
>>   drivers/gpu/drm/i915/intel_hdmi.c    |  2 ++
>>   4 files changed, 14 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/intel_color.c
>> index 99e32cb..5b76de6 100644
>> --- a/drivers/gpu/drm/i915/intel_color.c
>> +++ b/drivers/gpu/drm/i915/intel_color.c
>> @@ -141,7 +141,8 @@ static void i9xx_load_csc_matrix(struct drm_crtc_state *crtc_state)
>>   	uint16_t coeffs[9] = { 0, };
>>   	struct intel_crtc_state *intel_crtc_state = to_intel_crtc_state(crtc_state);
>>   
>> -	if (intel_crtc_state->output_format == CRTC_OUTPUT_YCBCR420) {
>> +	if (intel_crtc_state->output_format == CRTC_OUTPUT_YCBCR420 ||
>> +	    intel_crtc_state->output_format == CRTC_OUTPUT_YCBCR444) {
>>   		i9xx_load_ycbcr_conversion_matrix(intel_crtc);
>>   		return;
>>   	} else if (crtc_state->ctm) {
>> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>> index 69b0aa3..6ac5ca6 100644
>> --- a/drivers/gpu/drm/i915/intel_display.c
>> +++ b/drivers/gpu/drm/i915/intel_display.c
>> @@ -6357,8 +6357,9 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,
>>   		return -EINVAL;
>>   	}
>>   
>> -	if (pipe_config->output_format == CRTC_OUTPUT_YCBCR420 &&
>> -	    pipe_config->base.ctm) {
>> +	if ((pipe_config->output_format == CRTC_OUTPUT_YCBCR420 ||
>> +	     pipe_config->output_format == CRTC_OUTPUT_YCBCR444) &&
>> +	     pipe_config->base.ctm) {
>>   		/*
>>   		 * There is only one pipe CSC unit per pipe, and we need that
>>   		 * for output conversion from RGB->YCBCR. So if CTM is already
>> @@ -8179,11 +8180,12 @@ static void haswell_set_pipemisc(struct drm_crtc *crtc)
>>   		if (intel_crtc->config->dither)
>>   			val |= PIPEMISC_DITHER_ENABLE | PIPEMISC_DITHER_TYPE_SP;
>>   
>> -		if (config->output_format == CRTC_OUTPUT_YCBCR420) {
>> +		if (config->output_format > CRTC_OUTPUT_RGB)
> The '>' looks weird. For best clarity I would just use
> 'x == YCBCR444 || x == YCBCR420'
I knew I would get this comment, still gave a try :-), was just trying 
to reduce one if condition, and dint want
to add (x == YCBCR444 || x == YCBCR420) to all the places. Will do the 
changes.

- Shashank
>>   			val |= PIPEMISC_OUTPUT_COLORSPACE_YUV;
>> +
>> +		if (config->output_format == CRTC_OUTPUT_YCBCR420)
>>   			val |= PIPEMISC_YUV420_ENABLE |
>>   			       PIPEMISC_YUV420_MODE_FULL_BLEND;
>> -		}
>>   
>>   		I915_WRITE(PIPEMISC(intel_crtc->pipe), val);
>>   	}
>> @@ -9161,6 +9163,7 @@ static void haswell_get_ddi_port_state(struct intel_crtc *crtc,
>>   static const char * const output_format_str[] = {
>>   	"Invalid",
>>   	"RGB",
>> +	"YCBCR4:4:4",
>>   	"YCBCR4:2:0",
>>   };
>>   
>> @@ -9226,6 +9229,8 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,
>>   					output_format = CRTC_OUTPUT_INVALID;
>>   				else
>>   					output_format = CRTC_OUTPUT_YCBCR420;
>> +			} else {
>> +				output_format = CRTC_OUTPUT_YCBCR444;
>>   			}
>>   
>>   		}
>> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>> index 79662650..a393342 100644
>> --- a/drivers/gpu/drm/i915/intel_drv.h
>> +++ b/drivers/gpu/drm/i915/intel_drv.h
>> @@ -612,6 +612,7 @@ struct intel_crtc_wm_state {
>>   enum crtc_output_format {
>>   	CRTC_OUTPUT_INVALID = -1,
>>   	CRTC_OUTPUT_RGB,
>> +	CRTC_OUTPUT_YCBCR444,
>>   	CRTC_OUTPUT_YCBCR420,
>>   };
>>   
>> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
>> index b266a7f..258bb51 100644
>> --- a/drivers/gpu/drm/i915/intel_hdmi.c
>> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
>> @@ -480,6 +480,8 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,
>>   
>>   	if (crtc_state->output_format == CRTC_OUTPUT_YCBCR420)
>>   		frame.avi.colorspace = HDMI_COLORSPACE_YUV420;
>> +	else if (crtc_state->output_format == CRTC_OUTPUT_YCBCR444)
>> +		frame.avi.colorspace = HDMI_COLORSPACE_YUV444;
>>   	else
>>   		frame.avi.colorspace = HDMI_COLORSPACE_RGB;
>>   
>> -- 
>> 2.7.4