Commit 23970e15 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Tomi Valkeinen

omapdrm: hdmi4: Correct the SoC revision matching

I believe the intention of the commit 2c9fc9bf
("drm: omapdrm: Move FEAT_HDMI_* features to hdmi4 driver")
was to identify omap4430 ES1.x, omap4430 ES2.x and other OMAP4 revisions,
like omap4460.

By using family=OMAP4 in the match the code will treat omap4460 ES1.x in a
same way as it would treat omap4430 ES1.x

This breaks HDMI audio on OMAP4460 devices (PandaES for example).

Correct the match rule so we are not going to get false positive match.

Fixes: 2c9fc9bf ("drm: omapdrm: Move FEAT_HDMI_* features to hdmi4 driver")

Cc: stable@vger.kernel.org # 4.14
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 499ec0ed
...@@ -886,25 +886,36 @@ struct hdmi4_features { ...@@ -886,25 +886,36 @@ struct hdmi4_features {
bool audio_use_mclk; bool audio_use_mclk;
}; };
static const struct hdmi4_features hdmi4_es1_features = { static const struct hdmi4_features hdmi4430_es1_features = {
.cts_swmode = false, .cts_swmode = false,
.audio_use_mclk = false, .audio_use_mclk = false,
}; };
static const struct hdmi4_features hdmi4_es2_features = { static const struct hdmi4_features hdmi4430_es2_features = {
.cts_swmode = true, .cts_swmode = true,
.audio_use_mclk = false, .audio_use_mclk = false,
}; };
static const struct hdmi4_features hdmi4_es3_features = { static const struct hdmi4_features hdmi4_features = {
.cts_swmode = true, .cts_swmode = true,
.audio_use_mclk = true, .audio_use_mclk = true,
}; };
static const struct soc_device_attribute hdmi4_soc_devices[] = { static const struct soc_device_attribute hdmi4_soc_devices[] = {
{ .family = "OMAP4", .revision = "ES1.?", .data = &hdmi4_es1_features }, {
{ .family = "OMAP4", .revision = "ES2.?", .data = &hdmi4_es2_features }, .machine = "OMAP4430",
{ .family = "OMAP4", .data = &hdmi4_es3_features }, .revision = "ES1.?",
.data = &hdmi4430_es1_features,
},
{
.machine = "OMAP4430",
.revision = "ES2.?",
.data = &hdmi4430_es2_features,
},
{
.family = "OMAP4",
.data = &hdmi4_features,
},
{ /* sentinel */ } { /* sentinel */ }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment