diff options
Diffstat (limited to 'drivers/gpu/host1x/drm/hdmi.c')
-rw-r--r-- | drivers/gpu/host1x/drm/hdmi.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/drivers/gpu/host1x/drm/hdmi.c b/drivers/gpu/host1x/drm/hdmi.c index 01097da09f7f..644d95c7d489 100644 --- a/drivers/gpu/host1x/drm/hdmi.c +++ b/drivers/gpu/host1x/drm/hdmi.c | |||
@@ -551,24 +551,8 @@ static void tegra_hdmi_setup_stereo_infoframe(struct tegra_hdmi *hdmi) | |||
551 | return; | 551 | return; |
552 | } | 552 | } |
553 | 553 | ||
554 | memset(&frame, 0, sizeof(frame)); | 554 | hdmi_vendor_infoframe_init(&frame); |
555 | 555 | frame.s3d_struct = HDMI_3D_STRUCTURE_FRAME_PACKING; | |
556 | frame.type = HDMI_INFOFRAME_TYPE_VENDOR; | ||
557 | frame.version = 0x01; | ||
558 | frame.length = 6; | ||
559 | |||
560 | frame.data[0] = 0x03; /* regid0 */ | ||
561 | frame.data[1] = 0x0c; /* regid1 */ | ||
562 | frame.data[2] = 0x00; /* regid2 */ | ||
563 | frame.data[3] = 0x02 << 5; /* video format */ | ||
564 | |||
565 | /* TODO: 74 MHz limit? */ | ||
566 | if (1) { | ||
567 | frame.data[4] = 0x00 << 4; /* 3D structure */ | ||
568 | } else { | ||
569 | frame.data[4] = 0x08 << 4; /* 3D structure */ | ||
570 | frame.data[5] = 0x00 << 4; /* 3D ext. data */ | ||
571 | } | ||
572 | 556 | ||
573 | err = hdmi_vendor_infoframe_pack(&frame, buffer, sizeof(buffer)); | 557 | err = hdmi_vendor_infoframe_pack(&frame, buffer, sizeof(buffer)); |
574 | if (err < 0) { | 558 | if (err < 0) { |
@@ -904,6 +888,11 @@ static int tegra_hdmi_show_regs(struct seq_file *s, void *data) | |||
904 | { | 888 | { |
905 | struct drm_info_node *node = s->private; | 889 | struct drm_info_node *node = s->private; |
906 | struct tegra_hdmi *hdmi = node->info_ent->data; | 890 | struct tegra_hdmi *hdmi = node->info_ent->data; |
891 | int err; | ||
892 | |||
893 | err = clk_enable(hdmi->clk); | ||
894 | if (err) | ||
895 | return err; | ||
907 | 896 | ||
908 | #define DUMP_REG(name) \ | 897 | #define DUMP_REG(name) \ |
909 | seq_printf(s, "%-56s %#05x %08lx\n", #name, name, \ | 898 | seq_printf(s, "%-56s %#05x %08lx\n", #name, name, \ |
@@ -1069,6 +1058,8 @@ static int tegra_hdmi_show_regs(struct seq_file *s, void *data) | |||
1069 | 1058 | ||
1070 | #undef DUMP_REG | 1059 | #undef DUMP_REG |
1071 | 1060 | ||
1061 | clk_disable(hdmi->clk); | ||
1062 | |||
1072 | return 0; | 1063 | return 0; |
1073 | } | 1064 | } |
1074 | 1065 | ||