drm/cirrus: Move drm_dev_{enter, exit}() into DRM helpers

Call drm_dev_enter() and drm_dev_exit() immediately after entering
cirrus' DRM helper functions. Remove these calls from other functions.
Each enter/exit block in the DRM helpers covers the full hardware
update. No functional changes.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230215161517.5113-5-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/tiny/cirrus.c b/drivers/gpu/drm/tiny/cirrus.c
index 71fa07535298c3836c0376f57b842a896e0c0682..0b02244bd9f1dd7c9b67a9b1b7f525f572b4f71b 100644 (file)
--- a/drivers/gpu/drm/tiny/cirrus.c
+++ b/drivers/gpu/drm/tiny/cirrus.c
@@ -159,13 +159,9 @@ static int cirrus_pitch(struct drm_framebuffer *fb)
 
 static void cirrus_set_start_address(struct cirrus_device *cirrus, u32 offset)
 {
-       int idx;
        u32 addr;
        u8 tmp;
 
-       if (!drm_dev_enter(&cirrus->dev, &idx))
-               return;
-
        addr = offset >> 2;
        wreg_crt(cirrus, 0x0c, (u8)((addr >> 8) & 0xff));
        wreg_crt(cirrus, 0x0d, (u8)(addr & 0xff));
@@ -180,8 +176,6 @@ static void cirrus_set_start_address(struct cirrus_device *cirrus, u32 offset)
        tmp &= 0x7f;
        tmp |= (addr >> 12) & 0x80;
        wreg_crt(cirrus, 0x1d, tmp);
-
-       drm_dev_exit(idx);
 }
 
 static int cirrus_mode_set(struct cirrus_device *cirrus,
@@ -190,12 +184,9 @@ static int cirrus_mode_set(struct cirrus_device *cirrus,
 {
        int hsyncstart, hsyncend, htotal, hdispend;
        int vtotal, vdispend;
-       int tmp, idx;
+       int tmp;
        int sr07 = 0, hdr = 0;
 
-       if (!drm_dev_enter(&cirrus->dev, &idx))
-               return -1;
-
        htotal = mode->htotal / 8;
        hsyncend = mode->hsync_end / 8;
        hsyncstart = mode->hsync_start / 8;
@@ -281,7 +272,6 @@ static int cirrus_mode_set(struct cirrus_device *cirrus,
                hdr = 0xc5;
                break;
        default:
-               drm_dev_exit(idx);
                return -1;
        }
 
@@ -311,7 +301,6 @@ static int cirrus_mode_set(struct cirrus_device *cirrus,
        /* Unblank (needed on S3 resume, vgabios doesn't do it then) */
        outb(0x20, 0x3c0);
 
-       drm_dev_exit(idx);
        return 0;
 }
 
@@ -321,18 +310,12 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb,
 {
        struct cirrus_device *cirrus = to_cirrus(fb->dev);
        struct iosys_map dst;
-       int idx;
-
-       if (!drm_dev_enter(&cirrus->dev, &idx))
-               return -ENODEV;
 
        iosys_map_set_vaddr_iomem(&dst, cirrus->vram);
        iosys_map_incr(&dst, drm_fb_clip_offset(cirrus->pitch, fb->format, rect));
 
        drm_fb_blit(&dst, &cirrus->pitch, cirrus->format->format, vmap, fb, rect);
 
-       drm_dev_exit(idx);
-
        return 0;
 }
 
@@ -425,9 +408,15 @@ static void cirrus_pipe_enable(struct drm_simple_display_pipe *pipe,
 {
        struct cirrus_device *cirrus = to_cirrus(pipe->crtc.dev);
        struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(plane_state);
+       int idx;
+
+       if (!drm_dev_enter(&cirrus->dev, &idx))
+               return;
 
        cirrus_mode_set(cirrus, &crtc_state->mode, plane_state->fb);
        cirrus_fb_blit_fullscreen(plane_state->fb, &shadow_plane_state->data[0]);
+
+       drm_dev_exit(idx);
 }
 
 static void cirrus_pipe_update(struct drm_simple_display_pipe *pipe,
@@ -438,12 +427,18 @@ static void cirrus_pipe_update(struct drm_simple_display_pipe *pipe,
        struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(state);
        struct drm_crtc *crtc = &pipe->crtc;
        struct drm_rect rect;
+       int idx;
+
+       if (!drm_dev_enter(&cirrus->dev, &idx))
+               return;
 
        if (state->fb && cirrus->format != cirrus_format(state->fb))
                cirrus_mode_set(cirrus, &crtc->mode, state->fb);
 
        if (drm_atomic_helper_damage_merged(old_state, state, &rect))
                cirrus_fb_blit_rect(state->fb, &shadow_plane_state->data[0], &rect);
+
+       drm_dev_exit(idx);
 }
 
 static const struct drm_simple_display_pipe_funcs cirrus_pipe_funcs = {