1 files changed, 9 insertions, 19 deletions

diff --git a/drivers/gpu/drm/tinydrm/repaper.c b/drivers/gpu/drm/tinydrm/repaper.c
index 33b4a71916e4..bb6f80a81899 100644
--- a/drivers/gpu/drm/tinydrm/repaper.c
+++ b/drivers/gpu/drm/tinydrm/repaper.c
@@ -540,14 +540,8 @@ static int repaper_fb_dirty(struct drm_framebuffer *fb,
         clip.y1 = 0;
         clip.y2 = fb->height;
 
-        mutex_lock(&tdev->dirty_lock);
-
         if (!epd->enabled)
-                goto out_unlock;
-
-        /* fbdev can flush even when we're not interested */
-        if (tdev->pipe.plane.fb != fb)
-                goto out_unlock;
+                return 0;
 
         repaper_get_temperature(epd);
 
@@ -555,16 +549,14 @@ static int repaper_fb_dirty(struct drm_framebuffer *fb,
                   epd->factored_stage_time);
 
         buf = kmalloc(fb->width * fb->height, GFP_KERNEL);
-        if (!buf) {
-                ret = -ENOMEM;
-                goto out_unlock;
-        }
+        if (!buf)
+                return -ENOMEM;
 
         if (import_attach) {
                 ret = dma_buf_begin_cpu_access(import_attach->dmabuf,
                                                DMA_FROM_DEVICE);
                 if (ret)
-                        goto out_unlock;
+                        goto out_free;
         }
 
         tinydrm_xrgb8888_to_gray8(buf, cma_obj->vaddr, fb, &clip);
@@ -573,7 +565,7 @@ static int repaper_fb_dirty(struct drm_framebuffer *fb,
                 ret = dma_buf_end_cpu_access(import_attach->dmabuf,
                                              DMA_FROM_DEVICE);
                 if (ret)
-                        goto out_unlock;
+                        goto out_free;
         }
 
         repaper_gray8_to_mono_reversed(buf, fb->width, fb->height);
@@ -625,11 +617,7 @@ static int repaper_fb_dirty(struct drm_framebuffer *fb,
                         }
         }
 
-out_unlock:
-        mutex_unlock(&tdev->dirty_lock);
-
-        if (ret)
-                DRM_DEV_ERROR(fb->dev->dev, "Failed to update display (%d)\n", ret);
+out_free:
         kfree(buf);
 
         return ret;
@@ -638,7 +626,7 @@ out_unlock:
 static const struct drm_framebuffer_funcs repaper_fb_funcs = {
         .destroy        = drm_gem_fb_destroy,
         .create_handle  = drm_gem_fb_create_handle,
-        .dirty          = repaper_fb_dirty,
+        .dirty          = tinydrm_fb_dirty,
 };
 
 static void power_off(struct repaper_epd *epd)
@@ -1070,6 +1058,8 @@ static int repaper_probe(struct spi_device *spi)
         if (ret)
                 return ret;
 
+        tdev->fb_dirty = repaper_fb_dirty;
+
         ret = tinydrm_display_pipe_init(tdev, &repaper_pipe_funcs,
                                         DRM_MODE_CONNECTOR_VIRTUAL,
                                         repaper_formats,