UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/edid: Introduce drm_hdmi_avi_infoframe_quant_range() 

Pull the logic to populate the quantization range information
in the AVI infoframe into a small helper. We'll be adding a bit
more logic to it, and having it in a central place seems like a
good idea since it's based on the CEA-861 spec.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170111125725.8086-4-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Ville Syrjälä 2017-01-11 14:57:23 +02:00
parent c8127cf08a
commit a2ce26f815
4 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/gpu/drm/drm_edid.c
View File

@ -4292,6 +4292,32 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,
} }
EXPORT_SYMBOL(drm_hdmi_avi_infoframe_from_display_mode); EXPORT_SYMBOL(drm_hdmi_avi_infoframe_from_display_mode);
/**
* drm_hdmi_avi_infoframe_quant_range() - fill the HDMI AVI infoframe
* quantization range information
* @frame: HDMI AVI infoframe
* @rgb_quant_range: RGB quantization range (Q)
* @rgb_quant_range_selectable: Sink support selectable RGB quantization range (QS)
*/
void
drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame,
enum hdmi_quantization_range rgb_quant_range,
bool rgb_quant_range_selectable)
{
/*
* CEA-861:
* "A Source shall not send a non-zero Q value that does not correspond
* to the default RGB Quantization Range for the transmitted Picture
* unless the Sink indicates support for the Q bit in a Video
* Capabilities Data Block."
*/
if (rgb_quant_range_selectable)
frame->quantization_range = rgb_quant_range;
else
frame->quantization_range = HDMI_QUANTIZATION_RANGE_DEFAULT;
}
EXPORT_SYMBOL(drm_hdmi_avi_infoframe_quant_range);
static enum hdmi_3d_structure static enum hdmi_3d_structure
s3d_structure_from_display_mode(const struct drm_display_mode *mode) s3d_structure_from_display_mode(const struct drm_display_mode *mode)
{ {

13
drivers/gpu/drm/i915/intel_hdmi.c
View File

@ -465,14 +465,11 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,
return; return;
} }
if (intel_hdmi->rgb_quant_range_selectable) { drm_hdmi_avi_infoframe_quant_range(&frame.avi,
if (crtc_state->limited_color_range) crtc_state->limited_color_range ?
frame.avi.quantization_range = HDMI_QUANTIZATION_RANGE_LIMITED :
HDMI_QUANTIZATION_RANGE_LIMITED; HDMI_QUANTIZATION_RANGE_FULL,
else intel_hdmi->rgb_quant_range_selectable);
frame.avi.quantization_range =
HDMI_QUANTIZATION_RANGE_FULL;
}
intel_write_infoframe(encoder, crtc_state, &frame); intel_write_infoframe(encoder, crtc_state, &frame);
} }

14
drivers/gpu/drm/vc4/vc4_hdmi.c
View File

@ -356,15 +356,11 @@ static void vc4_hdmi_set_avi_infoframe(struct drm_encoder *encoder)
return; return;
} }
if (vc4_encoder->rgb_range_selectable) { drm_hdmi_avi_infoframe_quant_range(&frame.avi,
if (vc4_encoder->limited_rgb_range) { vc4_encoder->limited_rgb_range ?
frame.avi.quantization_range = HDMI_QUANTIZATION_RANGE_LIMITED :
HDMI_QUANTIZATION_RANGE_LIMITED; HDMI_QUANTIZATION_RANGE_FULL,
} else { vc4_encoder->rgb_range_selectable);
frame.avi.quantization_range =
HDMI_QUANTIZATION_RANGE_FULL;
}
}
vc4_hdmi_write_infoframe(encoder, &frame); vc4_hdmi_write_infoframe(encoder, &frame);
} }

4
include/drm/drm_edid.h
View File

@ -345,6 +345,10 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,
int int
drm_hdmi_vendor_infoframe_from_display_mode(struct hdmi_vendor_infoframe *frame, drm_hdmi_vendor_infoframe_from_display_mode(struct hdmi_vendor_infoframe *frame,
const struct drm_display_mode *mode); const struct drm_display_mode *mode);
void
drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame,
enum hdmi_quantization_range rgb_quant_range,
bool rgb_quant_range_selectable);
/** /**
* drm_eld_mnl - Get ELD monitor name length in bytes. * drm_eld_mnl - Get ELD monitor name length in bytes.