drm/mipi-dbi: Use shadow-plane mappings

Use the buffer mappings provided by shadow-plane helpers. As the
mappings are established while the commit can still fail, errors
are now reported correctly to callers.

v2:
	* use shadow-plane state directly (Noralf)

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
Tested-by: Javier Martinez Canillas <javierm@redhat.com>
Tested-by: Noralf Trønnes <noralf@tronnes.org> # drm/tiny/mi0283qt
Link: https://patchwork.freedesktop.org/patch/msgid/20221202125644.7917-8-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c
index b808de6..0ef5e81 100644 (file)
--- a/drivers/gpu/drm/drm_mipi_dbi.c
+++ b/drivers/gpu/drm/drm_mipi_dbi.c
@@ -321,12 +321,10 @@ EXPORT_SYMBOL(mipi_dbi_pipe_mode_valid);
 void mipi_dbi_pipe_update(struct drm_simple_display_pipe *pipe,
                          struct drm_plane_state *old_state)
 {
-       struct iosys_map map[DRM_FORMAT_MAX_PLANES] = { };
-       struct iosys_map data[DRM_FORMAT_MAX_PLANES] = { };
        struct drm_plane_state *state = pipe->plane.state;
+       struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(state);
        struct drm_framebuffer *fb = state->fb;
        struct drm_rect rect;
-       int ret;
 
        if (!pipe->crtc.state->active)
                return;
@@ -334,14 +332,8 @@ void mipi_dbi_pipe_update(struct drm_simple_display_pipe *pipe,
        if (WARN_ON(!fb))
                return;
 
-       ret = drm_gem_fb_vmap(fb, map, data);
-       if (ret)
-               return;
-
        if (drm_atomic_helper_damage_merged(old_state, state, &rect))
-               mipi_dbi_fb_dirty(&data[0], fb, &rect);
-
-       drm_gem_fb_vunmap(fb, map);
+               mipi_dbi_fb_dirty(&shadow_plane_state->data[0], fb, &rect);
 }
 EXPORT_SYMBOL(mipi_dbi_pipe_update);
 
@@ -362,6 +354,7 @@ void mipi_dbi_enable_flush(struct mipi_dbi_dev *dbidev,
                           struct drm_crtc_state *crtc_state,
                           struct drm_plane_state *plane_state)
 {
+       struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(plane_state);
        struct drm_framebuffer *fb = plane_state->fb;
        struct drm_rect rect = {
                .x1 = 0,
@@ -369,22 +362,14 @@ void mipi_dbi_enable_flush(struct mipi_dbi_dev *dbidev,
                .y1 = 0,
                .y2 = fb->height,
        };
-       struct iosys_map map[DRM_FORMAT_MAX_PLANES] = { };
-       struct iosys_map data[DRM_FORMAT_MAX_PLANES] = { };
-       int idx, ret;
+       int idx;
 
        if (!drm_dev_enter(&dbidev->drm, &idx))
                return;
 
-       ret = drm_gem_fb_vmap(fb, map, data);
-       if (ret)
-               goto err_drm_dev_exit;
-
-       mipi_dbi_fb_dirty(&data[0], fb, &rect);
+       mipi_dbi_fb_dirty(&shadow_plane_state->data[0], fb, &rect);
        backlight_enable(dbidev->backlight);
 
-       drm_gem_fb_vunmap(fb, map);
-err_drm_dev_exit:
        drm_dev_exit(idx);
 }
 EXPORT_SYMBOL(mipi_dbi_enable_flush);

diff --git a/drivers/gpu/drm/tiny/ili9225.c b/drivers/gpu/drm/tiny/ili9225.c
index a69aec8..0ba5177 100644 (file)
--- a/drivers/gpu/drm/tiny/ili9225.c
+++ b/drivers/gpu/drm/tiny/ili9225.c
@@ -164,19 +164,15 @@ static void ili9225_pipe_update(struct drm_simple_display_pipe *pipe,
                                struct drm_plane_state *old_state)
 {
        struct drm_plane_state *state = pipe->plane.state;
+       struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(state);
        struct drm_framebuffer *fb = state->fb;
-       struct drm_gem_dma_object *dma_obj;
-       struct iosys_map src;
        struct drm_rect rect;
 
        if (!pipe->crtc.state->active)
                return;
 
-       dma_obj = drm_fb_dma_get_gem_obj(fb, 0);
-       iosys_map_set_vaddr(&src, dma_obj->vaddr);
-
        if (drm_atomic_helper_damage_merged(old_state, state, &rect))
-               ili9225_fb_dirty(&src, fb, &rect);
+               ili9225_fb_dirty(&shadow_plane_state->data[0], fb, &rect);
 }
 
 static void ili9225_pipe_enable(struct drm_simple_display_pipe *pipe,
@@ -184,6 +180,7 @@ static void ili9225_pipe_enable(struct drm_simple_display_pipe *pipe,
                                struct drm_plane_state *plane_state)
 {
        struct mipi_dbi_dev *dbidev = drm_to_mipi_dbi_dev(pipe->crtc.dev);
+       struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(plane_state);
        struct drm_framebuffer *fb = plane_state->fb;
        struct device *dev = pipe->crtc.dev->dev;
        struct mipi_dbi *dbi = &dbidev->dbi;
@@ -193,8 +190,6 @@ static void ili9225_pipe_enable(struct drm_simple_display_pipe *pipe,
                .y1 = 0,
                .y2 = fb->height,
        };
-       struct drm_gem_dma_object *dma_obj;
-       struct iosys_map src;
        int ret, idx;
        u8 am_id;
 
@@ -285,10 +280,7 @@ static void ili9225_pipe_enable(struct drm_simple_display_pipe *pipe,
 
        ili9225_command(dbi, ILI9225_DISPLAY_CONTROL_1, 0x1017);
 
-       dma_obj = drm_fb_dma_get_gem_obj(fb, 0);
-       iosys_map_set_vaddr(&src, dma_obj->vaddr);
-
-       ili9225_fb_dirty(&src, fb, &rect);
+       ili9225_fb_dirty(&shadow_plane_state->data[0], fb, &rect);
 
 out_exit:
        drm_dev_exit(idx);

diff --git a/drivers/gpu/drm/tiny/st7586.c b/drivers/gpu/drm/tiny/st7586.c
index 76b13ce..53dca92 100644 (file)
--- a/drivers/gpu/drm/tiny/st7586.c
+++ b/drivers/gpu/drm/tiny/st7586.c
@@ -153,19 +153,15 @@ static void st7586_pipe_update(struct drm_simple_display_pipe *pipe,
                               struct drm_plane_state *old_state)
 {
        struct drm_plane_state *state = pipe->plane.state;
+       struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(state);
        struct drm_framebuffer *fb = state->fb;
-       struct drm_gem_dma_object *dma_obj;
-       struct iosys_map src;
        struct drm_rect rect;
 
        if (!pipe->crtc.state->active)
                return;
 
-       dma_obj = drm_fb_dma_get_gem_obj(fb, 0);
-       iosys_map_set_vaddr(&src, dma_obj->vaddr);
-
        if (drm_atomic_helper_damage_merged(old_state, state, &rect))
-               st7586_fb_dirty(&src, fb, &rect);
+               st7586_fb_dirty(&shadow_plane_state->data[0], fb, &rect);
 }
 
 static void st7586_pipe_enable(struct drm_simple_display_pipe *pipe,
@@ -173,6 +169,7 @@ static void st7586_pipe_enable(struct drm_simple_display_pipe *pipe,
                               struct drm_plane_state *plane_state)
 {
        struct mipi_dbi_dev *dbidev = drm_to_mipi_dbi_dev(pipe->crtc.dev);
+       struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(plane_state);
        struct drm_framebuffer *fb = plane_state->fb;
        struct mipi_dbi *dbi = &dbidev->dbi;
        struct drm_rect rect = {
@@ -181,8 +178,6 @@ static void st7586_pipe_enable(struct drm_simple_display_pipe *pipe,
                .y1 = 0,
                .y2 = fb->height,
        };
-       struct drm_gem_dma_object *dma_obj;
-       struct iosys_map src;
        int idx, ret;
        u8 addr_mode;
 
@@ -242,10 +237,7 @@ static void st7586_pipe_enable(struct drm_simple_display_pipe *pipe,
 
        msleep(100);
 
-       dma_obj = drm_fb_dma_get_gem_obj(fb, 0);
-       iosys_map_set_vaddr(&src, dma_obj->vaddr);
-
-       st7586_fb_dirty(&src, fb, &rect);
+       st7586_fb_dirty(&shadow_plane_state->data[0], fb, &rect);
 
        mipi_dbi_command(dbi, MIPI_DCS_SET_DISPLAY_ON);
 out_exit: