drm/udl: Move udl_handle_damage() into udl_modeset.c

The only caller of udl_handle_damage() in the plane-update function
in udl_modeset.c. Move udl_handle_damage() there.

v2:
	* remove udl_fb.c in a separate patch

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-9-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
index dd58b9a51669a64ccb6fe43f6e2aa5d08f797a21..e67227c44cc444eb0bc3a9cfb1479ae4a4111ab8 100644 (file)
--- a/drivers/gpu/drm/udl/udl_drv.h
+++ b/drivers/gpu/drm/udl/udl_drv.h
@@ -86,9 +86,6 @@ int udl_render_hline(struct drm_device *dev, int log_bpp, struct urb **urb_ptr,
 struct drm_gem_object *udl_driver_gem_create_object(struct drm_device *dev,
                                                    size_t size);
 
-int udl_handle_damage(struct drm_framebuffer *fb, int x, int y,
-                     int width, int height);
-
 int udl_drop_usb(struct drm_device *dev);
 
 #define CMD_WRITE_RAW8   "\xAF\x60" /**< 8 bit raw write command. */

diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index 397c621429780d80fcb87c33444935addcc824a6..84cff9d9edbe3479d5bd607b839ee433ff51fb17 100644 (file)
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -9,10 +9,6 @@
  */
 
 #include <linux/moduleparam.h>
-#include <linux/dma-buf.h>
-
-#include <drm/drm_fourcc.h>
-#include <drm/drm_gem_shmem_helper.h>
 
 #include "udl_drv.h"
 
@@ -53,110 +49,3 @@ static uint16_t rgb16(uint32_t col)
        return (DLO_RG16(red, grn) << 8) + DLO_GB16(grn, blu);
 }
 #endif
-
-static long udl_log_cpp(unsigned int cpp)
-{
-       if (WARN_ON(!is_power_of_2(cpp)))
-               return -EINVAL;
-       return __ffs(cpp);
-}
-
-static int udl_aligned_damage_clip(struct drm_rect *clip, int x, int y,
-                                  int width, int height)
-{
-       int x1, x2;
-
-       if (WARN_ON_ONCE(x < 0) ||
-           WARN_ON_ONCE(y < 0) ||
-           WARN_ON_ONCE(width < 0) ||
-           WARN_ON_ONCE(height < 0))
-               return -EINVAL;
-
-       x1 = ALIGN_DOWN(x, sizeof(unsigned long));
-       x2 = ALIGN(width + (x - x1), sizeof(unsigned long)) + x1;
-
-       clip->x1 = x1;
-       clip->y1 = y;
-       clip->x2 = x2;
-       clip->y2 = y + height;
-
-       return 0;
-}
-
-int udl_handle_damage(struct drm_framebuffer *fb, int x, int y,
-                     int width, int height)
-{
-       struct drm_device *dev = fb->dev;
-       struct dma_buf_attachment *import_attach = fb->obj[0]->import_attach;
-       int i, ret, tmp_ret;
-       char *cmd;
-       struct urb *urb;
-       struct drm_rect clip;
-       int log_bpp;
-       void *vaddr;
-
-       ret = udl_log_cpp(fb->format->cpp[0]);
-       if (ret < 0)
-               return ret;
-       log_bpp = ret;
-
-       ret = udl_aligned_damage_clip(&clip, x, y, width, height);
-       if (ret)
-               return ret;
-       else if ((clip.x2 > fb->width) || (clip.y2 > fb->height))
-               return -EINVAL;
-
-       if (import_attach) {
-               ret = dma_buf_begin_cpu_access(import_attach->dmabuf,
-                                              DMA_FROM_DEVICE);
-               if (ret)
-                       return ret;
-       }
-
-       vaddr = drm_gem_shmem_vmap(fb->obj[0]);
-       if (IS_ERR(vaddr)) {
-               DRM_ERROR("failed to vmap fb\n");
-               goto out_dma_buf_end_cpu_access;
-       }
-
-       urb = udl_get_urb(dev);
-       if (!urb)
-               goto out_drm_gem_shmem_vunmap;
-       cmd = urb->transfer_buffer;
-
-       for (i = clip.y1; i < clip.y2; i++) {
-               const int line_offset = fb->pitches[0] * i;
-               const int byte_offset = line_offset + (clip.x1 << log_bpp);
-               const int dev_byte_offset = (fb->width * i + clip.x1) << log_bpp;
-               const int byte_width = (clip.x2 - clip.x1) << log_bpp;
-               ret = udl_render_hline(dev, log_bpp, &urb, (char *)vaddr,
-                                      &cmd, byte_offset, dev_byte_offset,
-                                      byte_width);
-               if (ret)
-                       goto out_drm_gem_shmem_vunmap;
-       }
-
-       if (cmd > (char *) urb->transfer_buffer) {
-               /* Send partial buffer remaining before exiting */
-               int len;
-               if (cmd < (char *) urb->transfer_buffer + urb->transfer_buffer_length)
-                       *cmd++ = 0xAF;
-               len = cmd - (char *) urb->transfer_buffer;
-               ret = udl_submit_urb(dev, urb, len);
-       } else
-               udl_urb_completion(urb);
-
-       ret = 0;
-
-out_drm_gem_shmem_vunmap:
-       drm_gem_shmem_vunmap(fb->obj[0], vaddr);
-out_dma_buf_end_cpu_access:
-       if (import_attach) {
-               tmp_ret = dma_buf_end_cpu_access(import_attach->dmabuf,
-                                                DMA_FROM_DEVICE);
-               if (tmp_ret && !ret)
-                       ret = tmp_ret; /* only update ret if not set yet */
-       }
-
-       return ret;
-}

diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c
index 35fa7b11c681d18039a21dd533c5ec3b4947efdf..22af179590536b75f59745dc2fd71c9cbad5bb6b 100644 (file)
--- a/drivers/gpu/drm/udl/udl_modeset.c
+++ b/drivers/gpu/drm/udl/udl_modeset.c
@@ -9,10 +9,14 @@
 
  */
 
+#include <linux/dma-buf.h>
+
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_damage_helper.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_vtables.h>
 #include <drm/drm_vblank.h>
 
@@ -233,6 +237,114 @@ static int udl_crtc_write_mode_to_hw(struct drm_crtc *crtc)
        return retval;
 }
 
+static long udl_log_cpp(unsigned int cpp)
+{
+       if (WARN_ON(!is_power_of_2(cpp)))
+               return -EINVAL;
+       return __ffs(cpp);
+}
+
+static int udl_aligned_damage_clip(struct drm_rect *clip, int x, int y,
+                                  int width, int height)
+{
+       int x1, x2;
+
+       if (WARN_ON_ONCE(x < 0) ||
+           WARN_ON_ONCE(y < 0) ||
+           WARN_ON_ONCE(width < 0) ||
+           WARN_ON_ONCE(height < 0))
+               return -EINVAL;
+
+       x1 = ALIGN_DOWN(x, sizeof(unsigned long));
+       x2 = ALIGN(width + (x - x1), sizeof(unsigned long)) + x1;
+
+       clip->x1 = x1;
+       clip->y1 = y;
+       clip->x2 = x2;
+       clip->y2 = y + height;
+
+       return 0;
+}
+
+int udl_handle_damage(struct drm_framebuffer *fb, int x, int y,
+                     int width, int height)
+{
+       struct drm_device *dev = fb->dev;
+       struct dma_buf_attachment *import_attach = fb->obj[0]->import_attach;
+       int i, ret, tmp_ret;
+       char *cmd;
+       struct urb *urb;
+       struct drm_rect clip;
+       int log_bpp;
+       void *vaddr;
+
+       ret = udl_log_cpp(fb->format->cpp[0]);
+       if (ret < 0)
+               return ret;
+       log_bpp = ret;
+
+       ret = udl_aligned_damage_clip(&clip, x, y, width, height);
+       if (ret)
+               return ret;
+       else if ((clip.x2 > fb->width) || (clip.y2 > fb->height))
+               return -EINVAL;
+
+       if (import_attach) {
+               ret = dma_buf_begin_cpu_access(import_attach->dmabuf,
+                                              DMA_FROM_DEVICE);
+               if (ret)
+                       return ret;
+       }
+
+       vaddr = drm_gem_shmem_vmap(fb->obj[0]);
+       if (IS_ERR(vaddr)) {
+               DRM_ERROR("failed to vmap fb\n");
+               goto out_dma_buf_end_cpu_access;
+       }
+
+       urb = udl_get_urb(dev);
+       if (!urb)
+               goto out_drm_gem_shmem_vunmap;
+       cmd = urb->transfer_buffer;
+
+       for (i = clip.y1; i < clip.y2; i++) {
+               const int line_offset = fb->pitches[0] * i;
+               const int byte_offset = line_offset + (clip.x1 << log_bpp);
+               const int dev_byte_offset = (fb->width * i + clip.x1) << log_bpp;
+               const int byte_width = (clip.x2 - clip.x1) << log_bpp;
+               ret = udl_render_hline(dev, log_bpp, &urb, (char *)vaddr,
+                                      &cmd, byte_offset, dev_byte_offset,
+                                      byte_width);
+               if (ret)
+                       goto out_drm_gem_shmem_vunmap;
+       }
+
+       if (cmd > (char *)urb->transfer_buffer) {
+               /* Send partial buffer remaining before exiting */
+               int len;
+               if (cmd < (char *)urb->transfer_buffer + urb->transfer_buffer_length)
+                       *cmd++ = 0xAF;
+               len = cmd - (char *)urb->transfer_buffer;
+               ret = udl_submit_urb(dev, urb, len);
+       } else {
+               udl_urb_completion(urb);
+       }
+
+       ret = 0;
+
+out_drm_gem_shmem_vunmap:
+       drm_gem_shmem_vunmap(fb->obj[0], vaddr);
+out_dma_buf_end_cpu_access:
+       if (import_attach) {
+               tmp_ret = dma_buf_end_cpu_access(import_attach->dmabuf,
+                                                DMA_FROM_DEVICE);
+               if (tmp_ret && !ret)
+                       ret = tmp_ret; /* only update ret if not set yet */
+       }
+
+       return ret;
+}
+
 /*
  * Simple display pipeline
  */