Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BCM2711 KMS YUV Support #4777

Merged
merged 14 commits into from
Dec 17, 2021
Merged

BCM2711 KMS YUV Support #4777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b811568
drm/edid: Don't clear YUV422 if using deep color
mripard Dec 13, 2021
872c848
drm/edid: Rename drm_hdmi_avi_infoframe_colorspace to _colorimetry
mripard Apr 14, 2021
6fe9091
drm/vc4: hdmi: Add full range RGB helper
mripard Jan 12, 2021
a856c29
drm/vc4: hdmi: Use full range helper in csc functions
mripard Jan 12, 2021
d7e3801
drm/vc4: hdmi: Move XBAR setup to csc_setup
mripard Jan 13, 2021
7727e1a
drm/vc4: hdmi: Replace CSC_CTL hardcoded value by defines
mripard Jan 13, 2021
89d9e32
drm/vc4: hdmi: Define colorspace matrices
mripard Jan 13, 2021
18b050a
drm/vc4: hdmi: Change CSC callback prototype
mripard Jan 18, 2021
eca5ae0
drm/vc4: hdmi: Move clock validation to its own function
mripard Dec 2, 2021
84f37bb
drm/vc4: hdmi: Move clock calculation into its own function
mripard Dec 2, 2021
04d8108
drm/vc4: hdmi: Take the sink maximum TMDS clock into account
mripard Dec 13, 2021
89e9103
drm/vc4: hdmi: Take bpp into account for the scrambler
mripard Dec 10, 2021
e794159
drm/vc4: hdmi: Always try to have the highest bpc
mripard Dec 10, 2021
7290307
drm/vc4: hdmi: Support HDMI YUV output
mripard Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions drivers/gpu/drm/drm_edid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4961,10 +4961,9 @@ static void drm_parse_hdmi_deep_color_info(struct drm_connector *connector,

/*
* Deep color support mandates RGB444 support for all video
* modes and forbids YCRCB422 support for all video modes per
* HDMI 1.3 spec.
* modes.
*/
info->color_formats = DRM_COLOR_FORMAT_RGB444;
info->color_formats |= DRM_COLOR_FORMAT_RGB444;

/* YCRCB444 is optional according to spec. */
if (hdmi[6] & DRM_EDID_HDMI_DC_Y444) {
Expand Down Expand Up @@ -5712,13 +5711,13 @@ static const u32 hdmi_colorimetry_val[] = {
#undef ACE

/**
* drm_hdmi_avi_infoframe_colorspace() - fill the HDMI AVI infoframe
* colorspace information
* drm_hdmi_avi_infoframe_colorimetry() - fill the HDMI AVI infoframe
* colorimetry information
* @frame: HDMI AVI infoframe
* @conn_state: connector state
*/
void
drm_hdmi_avi_infoframe_colorspace(struct hdmi_avi_infoframe *frame,
drm_hdmi_avi_infoframe_colorimetry(struct hdmi_avi_infoframe *frame,
const struct drm_connector_state *conn_state)
{
u32 colorimetry_val;
Expand All @@ -5737,7 +5736,7 @@ drm_hdmi_avi_infoframe_colorspace(struct hdmi_avi_infoframe *frame,
frame->extended_colorimetry = (colorimetry_val >> 2) &
EXTENDED_COLORIMETRY_MASK;
}
EXPORT_SYMBOL(drm_hdmi_avi_infoframe_colorspace);
EXPORT_SYMBOL(drm_hdmi_avi_infoframe_colorimetry);

/**
* drm_hdmi_avi_infoframe_quant_range() - fill the HDMI AVI infoframe
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/display/intel_hdmi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ intel_hdmi_compute_avi_infoframe(struct intel_encoder *encoder,
else
frame->colorspace = HDMI_COLORSPACE_RGB;

drm_hdmi_avi_infoframe_colorspace(frame, conn_state);
drm_hdmi_avi_infoframe_colorimetry(frame, conn_state);

/* nonsense combination */
drm_WARN_ON(encoder->base.dev, crtc_state->limited_color_range &&
Expand Down
Loading