Unverified Commit d5ca9870 authored by Dave Stevenson's avatar Dave Stevenson Committed by Maxime Ripard
Browse files

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: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://lore.kernel.org/r/20220613144800.326124-28-maxime@cerno.tech


Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
parent 125076c8
Loading
Loading
Loading
Loading
+30 −0
Original line number Original line Diff line number Diff line
@@ -128,6 +128,16 @@ enum vc4_hdmi_field {
	HDMI_VERTB1,
	HDMI_VERTB1,
	HDMI_VID_CTL,
	HDMI_VID_CTL,
	HDMI_MISC_CONTROL,
	HDMI_MISC_CONTROL,
	HDMI_FORMAT_DET_1,
	HDMI_FORMAT_DET_2,
	HDMI_FORMAT_DET_3,
	HDMI_FORMAT_DET_4,
	HDMI_FORMAT_DET_5,
	HDMI_FORMAT_DET_6,
	HDMI_FORMAT_DET_7,
	HDMI_FORMAT_DET_8,
	HDMI_FORMAT_DET_9,
	HDMI_FORMAT_DET_10,
};
};


struct vc4_hdmi_register {
struct vc4_hdmi_register {
@@ -241,6 +251,16 @@ static const struct vc4_hdmi_register __maybe_unused vc5_hdmi_hdmi0_fields[] = {
	VC4_HDMI_REG(HDMI_MISC_CONTROL, 0x100),
	VC4_HDMI_REG(HDMI_MISC_CONTROL, 0x100),
	VC4_HDMI_REG(HDMI_MAI_CHANNEL_MAP, 0x09c),
	VC4_HDMI_REG(HDMI_MAI_CHANNEL_MAP, 0x09c),
	VC4_HDMI_REG(HDMI_MAI_CONFIG, 0x0a0),
	VC4_HDMI_REG(HDMI_MAI_CONFIG, 0x0a0),
	VC4_HDMI_REG(HDMI_FORMAT_DET_1, 0x134),
	VC4_HDMI_REG(HDMI_FORMAT_DET_2, 0x138),
	VC4_HDMI_REG(HDMI_FORMAT_DET_3, 0x13c),
	VC4_HDMI_REG(HDMI_FORMAT_DET_4, 0x140),
	VC4_HDMI_REG(HDMI_FORMAT_DET_5, 0x144),
	VC4_HDMI_REG(HDMI_FORMAT_DET_6, 0x148),
	VC4_HDMI_REG(HDMI_FORMAT_DET_7, 0x14c),
	VC4_HDMI_REG(HDMI_FORMAT_DET_8, 0x150),
	VC4_HDMI_REG(HDMI_FORMAT_DET_9, 0x154),
	VC4_HDMI_REG(HDMI_FORMAT_DET_10, 0x158),
	VC4_HDMI_REG(HDMI_DEEP_COLOR_CONFIG_1, 0x170),
	VC4_HDMI_REG(HDMI_DEEP_COLOR_CONFIG_1, 0x170),
	VC4_HDMI_REG(HDMI_GCP_CONFIG, 0x178),
	VC4_HDMI_REG(HDMI_GCP_CONFIG, 0x178),
	VC4_HDMI_REG(HDMI_GCP_WORD_1, 0x17c),
	VC4_HDMI_REG(HDMI_GCP_WORD_1, 0x17c),
@@ -324,6 +344,16 @@ static const struct vc4_hdmi_register __maybe_unused vc5_hdmi_hdmi1_fields[] = {
	VC4_HDMI_REG(HDMI_MISC_CONTROL, 0x100),
	VC4_HDMI_REG(HDMI_MISC_CONTROL, 0x100),
	VC4_HDMI_REG(HDMI_MAI_CHANNEL_MAP, 0x09c),
	VC4_HDMI_REG(HDMI_MAI_CHANNEL_MAP, 0x09c),
	VC4_HDMI_REG(HDMI_MAI_CONFIG, 0x0a0),
	VC4_HDMI_REG(HDMI_MAI_CONFIG, 0x0a0),
	VC4_HDMI_REG(HDMI_FORMAT_DET_1, 0x134),
	VC4_HDMI_REG(HDMI_FORMAT_DET_2, 0x138),
	VC4_HDMI_REG(HDMI_FORMAT_DET_3, 0x13c),
	VC4_HDMI_REG(HDMI_FORMAT_DET_4, 0x140),
	VC4_HDMI_REG(HDMI_FORMAT_DET_5, 0x144),
	VC4_HDMI_REG(HDMI_FORMAT_DET_6, 0x148),
	VC4_HDMI_REG(HDMI_FORMAT_DET_7, 0x14c),
	VC4_HDMI_REG(HDMI_FORMAT_DET_8, 0x150),
	VC4_HDMI_REG(HDMI_FORMAT_DET_9, 0x154),
	VC4_HDMI_REG(HDMI_FORMAT_DET_10, 0x158),
	VC4_HDMI_REG(HDMI_DEEP_COLOR_CONFIG_1, 0x170),
	VC4_HDMI_REG(HDMI_DEEP_COLOR_CONFIG_1, 0x170),
	VC4_HDMI_REG(HDMI_GCP_CONFIG, 0x178),
	VC4_HDMI_REG(HDMI_GCP_CONFIG, 0x178),
	VC4_HDMI_REG(HDMI_GCP_WORD_1, 0x17c),
	VC4_HDMI_REG(HDMI_GCP_WORD_1, 0x17c),