Merge tag 'drm/tegra/for-4.9-rc1' of git://anongit.freedesktop.org/tegra/linux into...

[linux-2.6-block.git] / drivers / gpu / drm / tegra / dc.c

diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index 3de7ce33d3d4409a4b85c2f309fa01ebd3f602dd..4010d69cbd08404714fe92df3a61ee1a2f3d3bfb 100644 (file)
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -580,7 +580,14 @@ static void tegra_plane_atomic_update(struct drm_plane *plane,
                struct tegra_bo *bo = tegra_fb_get_plane(fb, i);
 
                window.base[i] = bo->paddr + fb->offsets[i];
-               window.stride[i] = fb->pitches[i];
+
+               /*
+                * Tegra uses a shared stride for UV planes. Framebuffers are
+                * already checked for this in the tegra_plane_atomic_check()
+                * function, so it's safe to ignore the V-plane pitch here.
+                */
+               if (i < 2)
+                       window.stride[i] = fb->pitches[i];
        }
 
        tegra_dc_setup_window(dc, p->index, &window);