mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 21:02:19 +00:00
drm: bridge/dw_hdmi: use drm_hdmi_avi_infoframe_from_display_mode()
Use drm_hdmi_avi_infoframe_from_display_mode() to compose the AVI frame. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
parent
f879b38f91
commit
d4ac4cb69e
@ -918,74 +918,79 @@ static void hdmi_tx_hdcp_config(struct dw_hdmi *hdmi)
|
||||
HDMI_A_HDCPCFG1_ENCRYPTIONDISABLE_MASK, HDMI_A_HDCPCFG1);
|
||||
}
|
||||
|
||||
static void hdmi_config_AVI(struct dw_hdmi *hdmi)
|
||||
static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
|
||||
{
|
||||
u8 val, pix_fmt, under_scan;
|
||||
u8 act_ratio, coded_ratio, colorimetry, ext_colorimetry;
|
||||
bool aspect_16_9;
|
||||
struct hdmi_avi_infoframe frame;
|
||||
u8 val;
|
||||
|
||||
aspect_16_9 = false; /* FIXME */
|
||||
/* Initialise info frame from DRM mode */
|
||||
drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);
|
||||
|
||||
/* AVI Data Byte 1 */
|
||||
if (hdmi->hdmi_data.enc_out_format == YCBCR444)
|
||||
pix_fmt = HDMI_FC_AVICONF0_PIX_FMT_YCBCR444;
|
||||
frame.colorspace = HDMI_COLORSPACE_YUV444;
|
||||
else if (hdmi->hdmi_data.enc_out_format == YCBCR422_8BITS)
|
||||
pix_fmt = HDMI_FC_AVICONF0_PIX_FMT_YCBCR422;
|
||||
frame.colorspace = HDMI_COLORSPACE_YUV422;
|
||||
else
|
||||
pix_fmt = HDMI_FC_AVICONF0_PIX_FMT_RGB;
|
||||
|
||||
under_scan = HDMI_FC_AVICONF0_SCAN_INFO_NODATA;
|
||||
|
||||
/*
|
||||
* Active format identification data is present in the AVI InfoFrame.
|
||||
* Under scan info, no bar data
|
||||
*/
|
||||
val = pix_fmt | under_scan |
|
||||
HDMI_FC_AVICONF0_ACTIVE_FMT_INFO_PRESENT |
|
||||
HDMI_FC_AVICONF0_BAR_DATA_NO_DATA;
|
||||
|
||||
hdmi_writeb(hdmi, val, HDMI_FC_AVICONF0);
|
||||
|
||||
/* AVI Data Byte 2 -Set the Aspect Ratio */
|
||||
if (aspect_16_9) {
|
||||
act_ratio = HDMI_FC_AVICONF1_ACTIVE_ASPECT_RATIO_16_9;
|
||||
coded_ratio = HDMI_FC_AVICONF1_CODED_ASPECT_RATIO_16_9;
|
||||
} else {
|
||||
act_ratio = HDMI_FC_AVICONF1_ACTIVE_ASPECT_RATIO_4_3;
|
||||
coded_ratio = HDMI_FC_AVICONF1_CODED_ASPECT_RATIO_4_3;
|
||||
}
|
||||
frame.colorspace = HDMI_COLORSPACE_RGB;
|
||||
|
||||
/* Set up colorimetry */
|
||||
if (hdmi->hdmi_data.enc_out_format == XVYCC444) {
|
||||
colorimetry = HDMI_FC_AVICONF1_COLORIMETRY_EXTENDED_INFO;
|
||||
frame.colorimetry = HDMI_COLORIMETRY_EXTENDED;
|
||||
if (hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_601)
|
||||
ext_colorimetry =
|
||||
HDMI_FC_AVICONF2_EXT_COLORIMETRY_XVYCC601;
|
||||
frame.extended_colorimetry =
|
||||
HDMI_EXTENDED_COLORIMETRY_XV_YCC_601;
|
||||
else /*hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_709*/
|
||||
ext_colorimetry =
|
||||
HDMI_FC_AVICONF2_EXT_COLORIMETRY_XVYCC709;
|
||||
frame.extended_colorimetry =
|
||||
HDMI_EXTENDED_COLORIMETRY_XV_YCC_709;
|
||||
} else if (hdmi->hdmi_data.enc_out_format != RGB) {
|
||||
if (hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_601)
|
||||
colorimetry = HDMI_FC_AVICONF1_COLORIMETRY_SMPTE;
|
||||
frame.colorimetry = HDMI_COLORIMETRY_ITU_601;
|
||||
else /*hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_709*/
|
||||
colorimetry = HDMI_FC_AVICONF1_COLORIMETRY_ITUR;
|
||||
ext_colorimetry = HDMI_FC_AVICONF2_EXT_COLORIMETRY_XVYCC601;
|
||||
frame.colorimetry = HDMI_COLORIMETRY_ITU_709;
|
||||
frame.extended_colorimetry = HDMI_EXTENDED_COLORIMETRY_XV_YCC_601;
|
||||
} else { /* Carries no data */
|
||||
colorimetry = HDMI_FC_AVICONF1_COLORIMETRY_NO_DATA;
|
||||
ext_colorimetry = HDMI_FC_AVICONF2_EXT_COLORIMETRY_XVYCC601;
|
||||
frame.colorimetry = HDMI_COLORIMETRY_NONE;
|
||||
frame.extended_colorimetry = HDMI_EXTENDED_COLORIMETRY_XV_YCC_601;
|
||||
}
|
||||
|
||||
val = colorimetry | coded_ratio | act_ratio;
|
||||
frame.scan_mode = HDMI_SCAN_MODE_NONE;
|
||||
|
||||
/*
|
||||
* The Designware IP uses a different byte format from standard
|
||||
* AVI info frames, though generally the bits are in the correct
|
||||
* bytes.
|
||||
*/
|
||||
|
||||
/*
|
||||
* AVI data byte 1 differences: Colorspace in bits 4,5 rather than 5,6,
|
||||
* active aspect present in bit 6 rather than 4.
|
||||
*/
|
||||
val = (frame.colorspace & 3) << 4 | (frame.scan_mode & 0x3);
|
||||
if (frame.active_aspect & 15)
|
||||
val |= HDMI_FC_AVICONF0_ACTIVE_FMT_INFO_PRESENT;
|
||||
if (frame.top_bar || frame.bottom_bar)
|
||||
val |= HDMI_FC_AVICONF0_BAR_DATA_HORIZ_BAR;
|
||||
if (frame.left_bar || frame.right_bar)
|
||||
val |= HDMI_FC_AVICONF0_BAR_DATA_VERT_BAR;
|
||||
hdmi_writeb(hdmi, val, HDMI_FC_AVICONF0);
|
||||
|
||||
/* AVI data byte 2 differences: none */
|
||||
val = ((frame.colorimetry & 0x3) << 6) |
|
||||
((frame.picture_aspect & 0x3) << 4) |
|
||||
(frame.active_aspect & 0xf);
|
||||
hdmi_writeb(hdmi, val, HDMI_FC_AVICONF1);
|
||||
|
||||
/* AVI Data Byte 3 */
|
||||
val = HDMI_FC_AVICONF2_IT_CONTENT_NO_DATA | ext_colorimetry |
|
||||
HDMI_FC_AVICONF2_RGB_QUANT_DEFAULT |
|
||||
HDMI_FC_AVICONF2_SCALING_NONE;
|
||||
/* AVI data byte 3 differences: none */
|
||||
val = ((frame.extended_colorimetry & 0x7) << 4) |
|
||||
((frame.quantization_range & 0x3) << 2) |
|
||||
(frame.nups & 0x3);
|
||||
if (frame.itc)
|
||||
val |= HDMI_FC_AVICONF2_IT_CONTENT_VALID;
|
||||
hdmi_writeb(hdmi, val, HDMI_FC_AVICONF2);
|
||||
|
||||
/* AVI Data Byte 4 */
|
||||
hdmi_writeb(hdmi, hdmi->vic, HDMI_FC_AVIVID);
|
||||
/* AVI data byte 4 differences: none */
|
||||
val = frame.video_code & 0x7f;
|
||||
hdmi_writeb(hdmi, val, HDMI_FC_AVIVID);
|
||||
|
||||
/* AVI Data Byte 5- set up input and output pixel repetition */
|
||||
val = (((hdmi->hdmi_data.video_mode.mpixelrepetitioninput + 1) <<
|
||||
@ -996,20 +1001,23 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi)
|
||||
HDMI_FC_PRCONF_OUTPUT_PR_FACTOR_MASK);
|
||||
hdmi_writeb(hdmi, val, HDMI_FC_PRCONF);
|
||||
|
||||
/* IT Content and quantization range = don't care */
|
||||
val = HDMI_FC_AVICONF3_IT_CONTENT_TYPE_GRAPHICS |
|
||||
HDMI_FC_AVICONF3_QUANT_RANGE_LIMITED;
|
||||
/*
|
||||
* AVI data byte 5 differences: content type in 0,1 rather than 4,5,
|
||||
* ycc range in bits 2,3 rather than 6,7
|
||||
*/
|
||||
val = ((frame.ycc_quantization_range & 0x3) << 2) |
|
||||
(frame.content_type & 0x3);
|
||||
hdmi_writeb(hdmi, val, HDMI_FC_AVICONF3);
|
||||
|
||||
/* AVI Data Bytes 6-13 */
|
||||
hdmi_writeb(hdmi, 0, HDMI_FC_AVIETB0);
|
||||
hdmi_writeb(hdmi, 0, HDMI_FC_AVIETB1);
|
||||
hdmi_writeb(hdmi, 0, HDMI_FC_AVISBB0);
|
||||
hdmi_writeb(hdmi, 0, HDMI_FC_AVISBB1);
|
||||
hdmi_writeb(hdmi, 0, HDMI_FC_AVIELB0);
|
||||
hdmi_writeb(hdmi, 0, HDMI_FC_AVIELB1);
|
||||
hdmi_writeb(hdmi, 0, HDMI_FC_AVISRB0);
|
||||
hdmi_writeb(hdmi, 0, HDMI_FC_AVISRB1);
|
||||
hdmi_writeb(hdmi, frame.top_bar & 0xff, HDMI_FC_AVIETB0);
|
||||
hdmi_writeb(hdmi, (frame.top_bar >> 8) & 0xff, HDMI_FC_AVIETB1);
|
||||
hdmi_writeb(hdmi, frame.bottom_bar & 0xff, HDMI_FC_AVISBB0);
|
||||
hdmi_writeb(hdmi, (frame.bottom_bar >> 8) & 0xff, HDMI_FC_AVISBB1);
|
||||
hdmi_writeb(hdmi, frame.left_bar & 0xff, HDMI_FC_AVIELB0);
|
||||
hdmi_writeb(hdmi, (frame.left_bar >> 8) & 0xff, HDMI_FC_AVIELB1);
|
||||
hdmi_writeb(hdmi, frame.right_bar & 0xff, HDMI_FC_AVISRB0);
|
||||
hdmi_writeb(hdmi, (frame.right_bar >> 8) & 0xff, HDMI_FC_AVISRB1);
|
||||
}
|
||||
|
||||
static void hdmi_av_composer(struct dw_hdmi *hdmi,
|
||||
@ -1243,7 +1251,7 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
|
||||
hdmi_enable_audio_clk(hdmi);
|
||||
|
||||
/* HDMI Initialization Step F - Configure AVI InfoFrame */
|
||||
hdmi_config_AVI(hdmi);
|
||||
hdmi_config_AVI(hdmi, mode);
|
||||
}
|
||||
|
||||
hdmi_video_packetize(hdmi);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user