]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/tegra: sor: Use correct SOR index on Tegra210
authorThierry Reding <treding@nvidia.com>
Wed, 24 Jul 2019 15:06:17 +0000 (17:06 +0200)
committerThierry Reding <treding@nvidia.com>
Mon, 28 Oct 2019 10:18:54 +0000 (11:18 +0100)
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>
drivers/gpu/drm/tegra/sor.c

index 4e46524f22e3124f17cc27787d0674d38bf8a3dc..c7faf088cabc9dd3a210c6b4f0db56d686c7d5c8 100644 (file)
@@ -3759,6 +3759,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);