drm/udl: Convert to drm_atomic_helper_dirtyfb()

The infrastruture for atomic modesetting allows us to use the generic
code for dirty-FB and damage handling. Switch over udl and remove the
driver's implementation. The simple-pipe's update function now picks up
the primary plane's damage and updates a minimal region of the screen.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191210084905.5570-7-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
index 89c0539..1ade917 100644 (file)
--- a/drivers/gpu/drm/udl/udl_drv.h
+++ b/drivers/gpu/drm/udl/udl_drv.h
@@ -83,11 +83,6 @@ void udl_urb_completion(struct urb *urb);
 int udl_init(struct udl_device *udl);
 void udl_fini(struct drm_device *dev);
 
-struct drm_framebuffer *
-udl_fb_user_fb_create(struct drm_device *dev,
-                     struct drm_file *file,
-                     const struct drm_mode_fb_cmd2 *mode_cmd);
-
 int udl_render_hline(struct drm_device *dev, int log_bpp, struct urb **urb_ptr,
                     const char *front, char **urb_buf_ptr,
                     u32 byte_offset, u32 device_byte_offset, u32 byte_width);

diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index 32a4551..98cc2ab 100644 (file)
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -11,12 +11,8 @@
 #include <linux/moduleparam.h>
 #include <linux/dma-buf.h>
 
-#include <drm/drm_crtc_helper.h>
-#include <drm/drm_drv.h>
 #include <drm/drm_fourcc.h>
-#include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_gem_shmem_helper.h>
-#include <drm/drm_modeset_helper.h>
 
 #include "udl_drv.h"
 
@@ -172,51 +168,3 @@ out_dma_buf_end_cpu_access:
 
        return ret;
 }
-
-static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb,
-                                     struct drm_file *file,
-                                     unsigned flags, unsigned color,
-                                     struct drm_clip_rect *clips,
-                                     unsigned num_clips)
-{
-       struct udl_device *udl = fb->dev->dev_private;
-       int i;
-       int ret = 0;
-
-       drm_modeset_lock_all(fb->dev);
-
-       spin_lock(&udl->active_fb_16_lock);
-       if (udl->active_fb_16 != fb) {
-               spin_unlock(&udl->active_fb_16_lock);
-               goto unlock;
-       }
-       spin_unlock(&udl->active_fb_16_lock);
-
-       for (i = 0; i < num_clips; i++) {
-               ret = udl_handle_damage(fb, clips[i].x1, clips[i].y1,
-                                       clips[i].x2 - clips[i].x1,
-                                       clips[i].y2 - clips[i].y1);
-               if (ret)
-                       break;
-       }
-
- unlock:
-       drm_modeset_unlock_all(fb->dev);
-
-       return ret;
-}
-
-static const struct drm_framebuffer_funcs udlfb_funcs = {
-       .destroy        = drm_gem_fb_destroy,
-       .create_handle  = drm_gem_fb_create_handle,
-       .dirty          = udl_user_framebuffer_dirty,
-};
-
-struct drm_framebuffer *
-udl_fb_user_fb_create(struct drm_device *dev,
-                  struct drm_file *file,
-                  const struct drm_mode_fb_cmd2 *mode_cmd)
-{
-       return drm_gem_fb_create_with_funcs(dev, file, mode_cmd,
-                                           &udlfb_funcs);
-}

diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c
index 067f626..c02e383 100644 (file)
--- a/drivers/gpu/drm/udl/udl_modeset.c
+++ b/drivers/gpu/drm/udl/udl_modeset.c
@@ -11,6 +11,7 @@
 
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_damage_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_modeset_helper_vtables.h>
 #include <drm/drm_vblank.h>
@@ -332,7 +333,9 @@ udl_simple_display_pipe_update(struct drm_simple_display_pipe *pipe,
 {
        struct drm_device *dev = pipe->crtc.dev;
        struct udl_device *udl = dev->dev_private;
-       struct drm_framebuffer *fb = pipe->plane.state->fb;
+       struct drm_plane_state *state = pipe->plane.state;
+       struct drm_framebuffer *fb = state->fb;
+       struct drm_rect rect;
 
        spin_lock(&udl->active_fb_16_lock);
        udl->active_fb_16 = fb;
@@ -341,7 +344,9 @@ udl_simple_display_pipe_update(struct drm_simple_display_pipe *pipe,
        if (!fb)
                return;
 
-       udl_handle_damage(fb, 0, 0, fb->width, fb->height);
+       if (drm_atomic_helper_damage_merged(old_plane_state, state, &rect))
+               udl_handle_damage(fb, rect.x1, rect.y1, rect.x2 - rect.x1,
+                                 rect.y2 - rect.y1);
 }
 
 static const
@@ -359,7 +364,7 @@ struct drm_simple_display_pipe_funcs udl_simple_display_pipe_funcs = {
  */
 
 static const struct drm_mode_config_funcs udl_mode_funcs = {
-       .fb_create = udl_fb_user_fb_create,
+       .fb_create = drm_gem_fb_create_with_dirty,
        .atomic_check  = drm_atomic_helper_check,
        .atomic_commit = drm_atomic_helper_commit,
 };