drm/solomon: Move calls to drm_gem_fb_end_cpu*()

Calls to drm_gem_fb_end_cpu*() should be between the calls to
drm_dev*(), and not hidden inside some other function. This way the
critical section code is visible at a glance, keeping it short and
improving maintainability.

Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Iker Pedrosa <ikerpedrosam@gmail.com>
Link: https://lore.kernel.org/r/20250920-improve-ssd130x-v2-1-77721e87ae08@gmail.com
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>

diff --git a/drivers/gpu/drm/solomon/ssd130x.c b/drivers/gpu/drm/solomon/ssd130x.c
index 8368f0ffbe1edc67e75b1bbcc2c21daf4dba1319..feaeadc49cce0536a66efc29e68bc5c733b47e12 100644 (file)
--- a/drivers/gpu/drm/solomon/ssd130x.c
+++ b/drivers/gpu/drm/solomon/ssd130x.c
@@ -1016,15 +1016,9 @@ static int ssd130x_fb_blit_rect(struct drm_framebuffer *fb,
 
        dst_pitch = DIV_ROUND_UP(drm_rect_width(rect), 8);
 
-       ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE);
-       if (ret)
-               return ret;
-
        iosys_map_set_vaddr(&dst, buf);
        drm_fb_xrgb8888_to_mono(&dst, &dst_pitch, vmap, fb, rect, fmtcnv_state);
 
-       drm_gem_fb_end_cpu_access(fb, DMA_FROM_DEVICE);
-
        ssd130x_update_rect(ssd130x, rect, buf, data_array);
 
        return ret;
@@ -1048,15 +1042,9 @@ static int ssd132x_fb_blit_rect(struct drm_framebuffer *fb,
 
        dst_pitch = drm_rect_width(rect);
 
-       ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE);
-       if (ret)
-               return ret;
-
        iosys_map_set_vaddr(&dst, buf);
        drm_fb_xrgb8888_to_gray8(&dst, &dst_pitch, vmap, fb, rect, fmtcnv_state);
 
-       drm_gem_fb_end_cpu_access(fb, DMA_FROM_DEVICE);
-
        ssd132x_update_rect(ssd130x, rect, buf, data_array);
 
        return ret;
@@ -1078,15 +1066,9 @@ static int ssd133x_fb_blit_rect(struct drm_framebuffer *fb,
 
        dst_pitch = drm_format_info_min_pitch(fi, 0, drm_rect_width(rect));
 
-       ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE);
-       if (ret)
-               return ret;
-
        iosys_map_set_vaddr(&dst, data_array);
        drm_fb_xrgb8888_to_rgb332(&dst, &dst_pitch, vmap, fb, rect, fmtcnv_state);
 
-       drm_gem_fb_end_cpu_access(fb, DMA_FROM_DEVICE);
-
        ssd133x_update_rect(ssd130x, rect, data_array, dst_pitch);
 
        return ret;
@@ -1232,6 +1214,9 @@ static void ssd130x_primary_plane_atomic_update(struct drm_plane *plane,
        if (!drm_dev_enter(drm, &idx))
                return;
 
+       if (drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE))
+               goto out_drm_dev_exit;
+
        drm_atomic_helper_damage_iter_init(&iter, old_plane_state, plane_state);
        drm_atomic_for_each_plane_damage(&iter, &damage) {
                dst_clip = plane_state->dst;
@@ -1245,6 +1230,9 @@ static void ssd130x_primary_plane_atomic_update(struct drm_plane *plane,
                                     &shadow_plane_state->fmtcnv_state);
        }
 
+       drm_gem_fb_end_cpu_access(fb, DMA_FROM_DEVICE);
+
+out_drm_dev_exit:
        drm_dev_exit(idx);
 }
 
@@ -1267,6 +1255,9 @@ static void ssd132x_primary_plane_atomic_update(struct drm_plane *plane,
        if (!drm_dev_enter(drm, &idx))
                return;
 
+       if (drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE))
+               goto out_drm_dev_exit;
+
        drm_atomic_helper_damage_iter_init(&iter, old_plane_state, plane_state);
        drm_atomic_for_each_plane_damage(&iter, &damage) {
                dst_clip = plane_state->dst;
@@ -1280,6 +1271,9 @@ static void ssd132x_primary_plane_atomic_update(struct drm_plane *plane,
                                     &shadow_plane_state->fmtcnv_state);
        }
 
+       drm_gem_fb_end_cpu_access(fb, DMA_FROM_DEVICE);
+
+out_drm_dev_exit:
        drm_dev_exit(idx);
 }
 
@@ -1301,6 +1295,9 @@ static void ssd133x_primary_plane_atomic_update(struct drm_plane *plane,
        if (!drm_dev_enter(drm, &idx))
                return;
 
+       if (drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE))
+               goto out_drm_dev_exit;
+
        drm_atomic_helper_damage_iter_init(&iter, old_plane_state, plane_state);
        drm_atomic_for_each_plane_damage(&iter, &damage) {
                dst_clip = plane_state->dst;
@@ -1313,6 +1310,9 @@ static void ssd133x_primary_plane_atomic_update(struct drm_plane *plane,
                                     &shadow_plane_state->fmtcnv_state);
        }
 
+       drm_gem_fb_end_cpu_access(fb, DMA_FROM_DEVICE);
+
+out_drm_dev_exit:
        drm_dev_exit(idx);
 }