drm/tegra: Use proper IOVA address for cursor image

The IOVA address for the cursor is the result of mapping the buffer
object for the given display controller. Make sure to use the proper
IOVA address as stored in the cursor's plane state.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index 5b1f9ff975760f57862ba4ba769bcb3032b65830..85d3c9ad29df2e8ff072f334d5353f12d87de3a5 100644 (file)
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -837,16 +837,15 @@ static int tegra_cursor_atomic_check(struct drm_plane *plane,
 static void tegra_cursor_atomic_update(struct drm_plane *plane,
                                       struct drm_plane_state *old_state)
 {
-       struct tegra_bo *bo = tegra_fb_get_plane(plane->state->fb, 0);
+       struct tegra_plane_state *state = to_tegra_plane_state(plane->state);
        struct tegra_dc *dc = to_tegra_dc(plane->state->crtc);
-       struct drm_plane_state *state = plane->state;
        u32 value = CURSOR_CLIP_DISPLAY;
 
        /* rien ne va plus */
        if (!plane->state->crtc || !plane->state->fb)
                return;
 
-       switch (state->crtc_w) {
+       switch (plane->state->crtc_w) {
        case 32:
                value |= CURSOR_SIZE_32x32;
                break;
@@ -864,16 +863,16 @@ static void tegra_cursor_atomic_update(struct drm_plane *plane,
                break;
 
        default:
-               WARN(1, "cursor size %ux%u not supported\n", state->crtc_w,
-                    state->crtc_h);
+               WARN(1, "cursor size %ux%u not supported\n",
+                    plane->state->crtc_w, plane->state->crtc_h);
                return;
        }
 
-       value |= (bo->iova >> 10) & 0x3fffff;
+       value |= (state->iova[0] >> 10) & 0x3fffff;
        tegra_dc_writel(dc, value, DC_DISP_CURSOR_START_ADDR);
 
 #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
-       value = (bo->iova >> 32) & 0x3;
+       value = (state->iova[0] >> 32) & 0x3;
        tegra_dc_writel(dc, value, DC_DISP_CURSOR_START_ADDR_HI);
 #endif
 
@@ -892,7 +891,8 @@ static void tegra_cursor_atomic_update(struct drm_plane *plane,
        tegra_dc_writel(dc, value, DC_DISP_BLEND_CURSOR_CONTROL);
 
        /* position the cursor */
-       value = (state->crtc_y & 0x3fff) << 16 | (state->crtc_x & 0x3fff);
+       value = (plane->state->crtc_y & 0x3fff) << 16 |
+               (plane->state->crtc_x & 0x3fff);
        tegra_dc_writel(dc, value, DC_DISP_CURSOR_POSITION);
 }