Skip to content

Commit

Permalink
drm/vc4: hdmi: Limit the BCM2711 to the max without scrambling
Browse files Browse the repository at this point in the history
Unlike the previous generations, the HSM clock limitation is way above
what we can reach without scrambling, so let's move the maximum
frequency we support to the maximum clock frequency without scrambling.

Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  • Loading branch information
mripard authored and popcornmix committed Jan 7, 2021
1 parent d356fa6 commit f5f5e19
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/gpu/drm/vc4/vc4_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,8 @@ static void hdmi_codec_eld_chmap(struct vc4_hdmi *vc4_hdmi)
vc4_hdmi->audio.chmap = hdmi_codec_stereo_chmaps;
}

#define HDMI_14_MAX_TMDS_CLK (340 * 1000 * 1000)

static int vc4_hdmi_debugfs_regs(struct seq_file *m, void *unused)
{
struct drm_info_node *node = (struct drm_info_node *)m->private;
Expand Down Expand Up @@ -2544,7 +2546,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = {
.encoder_type = VC4_ENCODER_TYPE_HDMI0,
.debugfs_name = "hdmi0_regs",
.card_name = "vc4-hdmi-0",
.max_pixel_clock = 297000000,
.max_pixel_clock = HDMI_14_MAX_TMDS_CLK,
.cec_input_clock = 27000000,
.registers = vc5_hdmi_hdmi0_fields,
.num_registers = ARRAY_SIZE(vc5_hdmi_hdmi0_fields),
Expand Down Expand Up @@ -2574,7 +2576,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = {
.encoder_type = VC4_ENCODER_TYPE_HDMI1,
.debugfs_name = "hdmi1_regs",
.card_name = "vc4-hdmi-1",
.max_pixel_clock = 297000000,
.max_pixel_clock = HDMI_14_MAX_TMDS_CLK,
.cec_input_clock = 27000000,
.registers = vc5_hdmi_hdmi1_fields,
.num_registers = ARRAY_SIZE(vc5_hdmi_hdmi1_fields),
Expand Down

0 comments on commit f5f5e19

Please sign in to comment.