|
|
@@ -20,7 +20,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
|
|
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
|
-@@ -599,6 +599,7 @@ static int vc4_hdmi_connector_atomic_che
|
|
|
+@@ -605,6 +605,7 @@ static int vc4_hdmi_connector_atomic_che
|
|
|
|
|
|
if (old_state->colorspace != new_state->colorspace ||
|
|
|
old_vc4_state->broadcast_rgb != new_vc4_state->broadcast_rgb ||
|
|
|
@@ -28,7 +28,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
|
|
|
!drm_connector_atomic_hdr_metadata_equal(old_state, new_state)) {
|
|
|
struct drm_crtc_state *crtc_state;
|
|
|
|
|
|
-@@ -625,6 +626,8 @@ static int vc4_hdmi_connector_get_proper
|
|
|
+@@ -631,6 +632,8 @@ static int vc4_hdmi_connector_get_proper
|
|
|
|
|
|
if (property == vc4_hdmi->broadcast_rgb_property) {
|
|
|
*val = vc4_conn_state->broadcast_rgb;
|
|
|
@@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
|
|
|
} else {
|
|
|
drm_dbg(drm, "Unknown property [PROP:%d:%s]\n",
|
|
|
property->base.id, property->name);
|
|
|
-@@ -648,6 +651,9 @@ static int vc4_hdmi_connector_set_proper
|
|
|
+@@ -654,6 +657,9 @@ static int vc4_hdmi_connector_set_proper
|
|
|
if (property == vc4_hdmi->broadcast_rgb_property) {
|
|
|
vc4_conn_state->broadcast_rgb = val;
|
|
|
return 0;
|
|
|
@@ -47,7 +47,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
|
|
|
}
|
|
|
|
|
|
drm_dbg(drm, "Unknown property [PROP:%d:%s]\n",
|
|
|
-@@ -692,6 +698,7 @@ vc4_hdmi_connector_duplicate_state(struc
|
|
|
+@@ -698,6 +704,7 @@ vc4_hdmi_connector_duplicate_state(struc
|
|
|
new_state->tmds_char_rate = vc4_state->tmds_char_rate;
|
|
|
new_state->output_bpc = vc4_state->output_bpc;
|
|
|
new_state->output_format = vc4_state->output_format;
|
|
|
@@ -55,7 +55,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
|
|
|
new_state->broadcast_rgb = vc4_state->broadcast_rgb;
|
|
|
__drm_atomic_helper_connector_duplicate_state(connector, &new_state->base);
|
|
|
|
|
|
-@@ -740,6 +747,33 @@ vc4_hdmi_attach_broadcast_rgb_property(s
|
|
|
+@@ -746,6 +753,33 @@ vc4_hdmi_attach_broadcast_rgb_property(s
|
|
|
VC4_HDMI_BROADCAST_RGB_AUTO);
|
|
|
}
|
|
|
|
|
|
@@ -89,7 +89,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
|
|
|
static int vc4_hdmi_connector_init(struct drm_device *dev,
|
|
|
struct vc4_hdmi *vc4_hdmi)
|
|
|
{
|
|
|
-@@ -790,6 +824,7 @@ static int vc4_hdmi_connector_init(struc
|
|
|
+@@ -796,6 +830,7 @@ static int vc4_hdmi_connector_init(struc
|
|
|
}
|
|
|
|
|
|
vc4_hdmi_attach_broadcast_rgb_property(dev, vc4_hdmi);
|
|
|
@@ -97,7 +97,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
|
|
|
|
|
|
drm_connector_attach_encoder(connector, encoder);
|
|
|
|
|
|
-@@ -1960,6 +1995,10 @@ static void vc4_hdmi_encoder_atomic_mode
|
|
|
+@@ -1966,6 +2001,10 @@ static void vc4_hdmi_encoder_atomic_mode
|
|
|
&crtc_state->adjusted_mode);
|
|
|
vc4_hdmi->output_bpc = vc4_state->output_bpc;
|
|
|
vc4_hdmi->output_format = vc4_state->output_format;
|
|
|
@@ -108,7 +108,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
|
|
|
mutex_unlock(&vc4_hdmi->mutex);
|
|
|
}
|
|
|
|
|
|
-@@ -2118,6 +2157,26 @@ vc4_hdmi_encoder_compute_format(const st
|
|
|
+@@ -2124,6 +2163,26 @@ vc4_hdmi_encoder_compute_format(const st
|
|
|
const struct drm_display_info *info = &connector->display_info;
|
|
|
unsigned int format;
|
|
|
|