drm/tegra: sor: Use correct SOR index on Tegra210

[ Upstream commit 24e64f86da40e68c5f58af08796110f147b12193 ]

The device tree bindings for the Tegra210 SOR don't require the
controller instance to be defined, since the instance can be derived
from the compatible string. The index is never used on Tegra210, so we
got away with it not getting set. However, subsequent patches will
change that, so make sure the proper index is used.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index e1669ada0a405b04924806cd3729837b86195df3..75e65d9536d546f931d77482c60524139816058a 100644 (file)
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -3200,6 +3200,11 @@ static int tegra_sor_parse_dt(struct tegra_sor *sor)
                 * earlier
                 */
                sor->pad = TEGRA_IO_PAD_HDMI_DP0 + sor->index;
+       } else {
+               if (sor->soc->supports_edp)
+                       sor->index = 0;
+               else
+                       sor->index = 1;
        }
 
        err = of_property_read_u32_array(np, "nvidia,xbar-cfg", xbar_cfg, 5);