Skip to content

Commit d5ca987

Browse files
6by9mripard
authored andcommitted
drm/vc4: hdmi: Add HDMI format detection registers to register list
The block can detect what the incoming image timings are for debug purposes. Add them to the list of registers understood by the driver to allow easy dumping of the values. Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> Link: https://lore.kernel.org/r/20220613144800.326124-28-maxime@cerno.tech Signed-off-by: Maxime Ripard <maxime@cerno.tech>
1 parent 125076c commit d5ca987

File tree

1 file changed

+30
-0
lines changed

1 file changed

+30
-0
lines changed

drivers/gpu/drm/vc4/vc4_hdmi_regs.h

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,16 @@ enum vc4_hdmi_field {
128128
HDMI_VERTB1,
129129
HDMI_VID_CTL,
130130
HDMI_MISC_CONTROL,
131+
HDMI_FORMAT_DET_1,
132+
HDMI_FORMAT_DET_2,
133+
HDMI_FORMAT_DET_3,
134+
HDMI_FORMAT_DET_4,
135+
HDMI_FORMAT_DET_5,
136+
HDMI_FORMAT_DET_6,
137+
HDMI_FORMAT_DET_7,
138+
HDMI_FORMAT_DET_8,
139+
HDMI_FORMAT_DET_9,
140+
HDMI_FORMAT_DET_10,
131141
};
132142

133143
struct vc4_hdmi_register {
@@ -241,6 +251,16 @@ static const struct vc4_hdmi_register __maybe_unused vc5_hdmi_hdmi0_fields[] = {
241251
VC4_HDMI_REG(HDMI_MISC_CONTROL, 0x100),
242252
VC4_HDMI_REG(HDMI_MAI_CHANNEL_MAP, 0x09c),
243253
VC4_HDMI_REG(HDMI_MAI_CONFIG, 0x0a0),
254+
VC4_HDMI_REG(HDMI_FORMAT_DET_1, 0x134),
255+
VC4_HDMI_REG(HDMI_FORMAT_DET_2, 0x138),
256+
VC4_HDMI_REG(HDMI_FORMAT_DET_3, 0x13c),
257+
VC4_HDMI_REG(HDMI_FORMAT_DET_4, 0x140),
258+
VC4_HDMI_REG(HDMI_FORMAT_DET_5, 0x144),
259+
VC4_HDMI_REG(HDMI_FORMAT_DET_6, 0x148),
260+
VC4_HDMI_REG(HDMI_FORMAT_DET_7, 0x14c),
261+
VC4_HDMI_REG(HDMI_FORMAT_DET_8, 0x150),
262+
VC4_HDMI_REG(HDMI_FORMAT_DET_9, 0x154),
263+
VC4_HDMI_REG(HDMI_FORMAT_DET_10, 0x158),
244264
VC4_HDMI_REG(HDMI_DEEP_COLOR_CONFIG_1, 0x170),
245265
VC4_HDMI_REG(HDMI_GCP_CONFIG, 0x178),
246266
VC4_HDMI_REG(HDMI_GCP_WORD_1, 0x17c),
@@ -324,6 +344,16 @@ static const struct vc4_hdmi_register __maybe_unused vc5_hdmi_hdmi1_fields[] = {
324344
VC4_HDMI_REG(HDMI_MISC_CONTROL, 0x100),
325345
VC4_HDMI_REG(HDMI_MAI_CHANNEL_MAP, 0x09c),
326346
VC4_HDMI_REG(HDMI_MAI_CONFIG, 0x0a0),
347+
VC4_HDMI_REG(HDMI_FORMAT_DET_1, 0x134),
348+
VC4_HDMI_REG(HDMI_FORMAT_DET_2, 0x138),
349+
VC4_HDMI_REG(HDMI_FORMAT_DET_3, 0x13c),
350+
VC4_HDMI_REG(HDMI_FORMAT_DET_4, 0x140),
351+
VC4_HDMI_REG(HDMI_FORMAT_DET_5, 0x144),
352+
VC4_HDMI_REG(HDMI_FORMAT_DET_6, 0x148),
353+
VC4_HDMI_REG(HDMI_FORMAT_DET_7, 0x14c),
354+
VC4_HDMI_REG(HDMI_FORMAT_DET_8, 0x150),
355+
VC4_HDMI_REG(HDMI_FORMAT_DET_9, 0x154),
356+
VC4_HDMI_REG(HDMI_FORMAT_DET_10, 0x158),
327357
VC4_HDMI_REG(HDMI_DEEP_COLOR_CONFIG_1, 0x170),
328358
VC4_HDMI_REG(HDMI_GCP_CONFIG, 0x178),
329359
VC4_HDMI_REG(HDMI_GCP_WORD_1, 0x17c),

0 commit comments

Comments
 (0)