| Message ID | 20191126134707.22385-8-tzimmermann@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/udl: Convert to simple-pipe helpers and clean up | expand |
On Tue, Nov 26, 2019 at 02:47:07PM +0100, Thomas Zimmermann wrote: > The only caller of udl_handle_damage() in the plane-update function > in udl_modeset.c. Move udl_handle_damage() there, make it static, and > remove several left-over macros. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/udl/Makefile | 2 +- > drivers/gpu/drm/udl/udl_drv.h | 3 - > drivers/gpu/drm/udl/udl_fb.c | 142 ------------------------------ > drivers/gpu/drm/udl/udl_modeset.c | 88 ++++++++++++++++++ > 4 files changed, 89 insertions(+), 146 deletions(-) > delete mode 100644 drivers/gpu/drm/udl/udl_fb.c > > diff --git a/drivers/gpu/drm/udl/Makefile b/drivers/gpu/drm/udl/Makefile > index 177ce74f4cf4..b50179bb4de0 100644 > --- a/drivers/gpu/drm/udl/Makefile > +++ b/drivers/gpu/drm/udl/Makefile > @@ -1,4 +1,4 @@ > # SPDX-License-Identifier: GPL-2.0-only > -udl-y := udl_drv.o udl_modeset.o udl_connector.o udl_main.o udl_fb.o udl_transfer.o udl_gem.o > +udl-y := udl_drv.o udl_modeset.o udl_connector.o udl_main.o udl_transfer.o udl_gem.o > > obj-$(CONFIG_DRM_UDL) := udl.o > diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h > index e540f8e64aa1..ab62a6aecd06 100644 > --- a/drivers/gpu/drm/udl/udl_drv.h > +++ b/drivers/gpu/drm/udl/udl_drv.h > @@ -93,9 +93,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 > deleted file mode 100644 > index 3d8cf674dfa5..000000000000 > --- a/drivers/gpu/drm/udl/udl_fb.c > +++ /dev/null > @@ -1,142 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0-only > -/* > - * Copyright (C) 2012 Red Hat > - * > - * based in parts on udlfb.c: > - * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> > - * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> > - * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> > - */ > - > -#include <linux/moduleparam.h> > - > -#include <drm/drm_fourcc.h> > -#include <drm/drm_gem_shmem_helper.h> > - > -#include "udl_drv.h" > - > -#define DL_ALIGN_UP(x, a) ALIGN(x, a) > -#define DL_ALIGN_DOWN(x, a) ALIGN_DOWN(x, a) > - > -/** Read the red component (0..255) of a 32 bpp colour. */ > -#define DLO_RGB_GETRED(col) (uint8_t)((col) & 0xFF) > - > -/** Read the green component (0..255) of a 32 bpp colour. */ > -#define DLO_RGB_GETGRN(col) (uint8_t)(((col) >> 8) & 0xFF) > - > -/** Read the blue component (0..255) of a 32 bpp colour. */ > -#define DLO_RGB_GETBLU(col) (uint8_t)(((col) >> 16) & 0xFF) > - > -/** Return red/green component of a 16 bpp colour number. */ > -#define DLO_RG16(red, grn) (uint8_t)((((red) & 0xF8) | ((grn) >> 5)) & 0xFF) > - > -/** Return green/blue component of a 16 bpp colour number. */ > -#define DLO_GB16(grn, blu) (uint8_t)(((((grn) & 0x1C) << 3) | ((blu) >> 3)) & 0xFF) > - > -/** Return 8 bpp colour number from red, green and blue components. */ > -#define DLO_RGB8(red, grn, blu) ((((red) << 5) | (((grn) & 3) << 3) | ((blu) & 7)) & 0xFF) > - > -#if 0 > -static uint8_t rgb8(uint32_t col) > -{ > - uint8_t red = DLO_RGB_GETRED(col); > - uint8_t grn = DLO_RGB_GETGRN(col); > - uint8_t blu = DLO_RGB_GETBLU(col); > - > - return DLO_RGB8(red, grn, blu); > -} > - > -static uint16_t rgb16(uint32_t col) > -{ > - uint8_t red = DLO_RGB_GETRED(col); > - uint8_t grn = DLO_RGB_GETGRN(col); > - uint8_t blu = DLO_RGB_GETBLU(col); > - > - return (DLO_RG16(red, grn) << 8) + DLO_GB16(grn, blu); > -} > -#endif > - > -int udl_handle_damage(struct drm_framebuffer *fb, int x, int y, > - int width, int height) > -{ > - struct drm_device *dev = fb->dev; > - struct udl_device *udl = to_udl(dev); > - int i, ret; > - char *cmd; > - cycles_t start_cycles, end_cycles; > - int bytes_sent = 0; > - int bytes_identical = 0; > - struct urb *urb; > - int aligned_x; > - int log_bpp; > - void *vaddr; > - > - if (WARN_ON(!is_power_of_2(fb->format->cpp[0]))) > - return -EINVAL; > - > - log_bpp = __ffs(fb->format->cpp[0]); > - > - vaddr = drm_gem_shmem_vmap(fb->obj[0]); > - if (IS_ERR(vaddr)) { > - DRM_ERROR("failed to vmap fb\n"); > - return 0; > - } > - > - aligned_x = DL_ALIGN_DOWN(x, sizeof(unsigned long)); > - width = DL_ALIGN_UP(width + (x-aligned_x), sizeof(unsigned long)); > - x = aligned_x; > - > - if ((width <= 0) || > - (x + width > fb->width) || > - (y + height > fb->height)) { > - ret = -EINVAL; > - goto err_drm_gem_shmem_vunmap; > - } > - > - start_cycles = get_cycles(); > - > - urb = udl_get_urb(dev); > - if (!urb) > - goto out; > - cmd = urb->transfer_buffer; > - > - for (i = y; i < y + height ; i++) { > - const int line_offset = fb->pitches[0] * i; > - const int byte_offset = line_offset + (x << log_bpp); > - const int dev_byte_offset = (fb->width * i + x) << log_bpp; > - if (udl_render_hline(dev, log_bpp, &urb, (char *)vaddr, > - &cmd, byte_offset, dev_byte_offset, > - width << log_bpp, > - &bytes_identical, &bytes_sent)) > - goto error; > - } > - > - 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); > - bytes_sent += len; > - } else > - udl_urb_completion(urb); > - > -error: > - atomic_add(bytes_sent, &udl->bytes_sent); > - atomic_add(bytes_identical, &udl->bytes_identical); > - atomic_add((width * height) << log_bpp, &udl->bytes_rendered); > - end_cycles = get_cycles(); > - atomic_add(((unsigned int) ((end_cycles - start_cycles) > - >> 10)), /* Kcycles */ > - &udl->cpu_kcycles_used); > - > -out: > - drm_gem_shmem_vunmap(fb->obj[0], vaddr); > - > - return 0; > - > -err_drm_gem_shmem_vunmap: > - drm_gem_shmem_vunmap(fb->obj[0], vaddr); > - return ret; > -} > diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c > index 83e80083e0b2..7107c90672ae 100644 > --- a/drivers/gpu/drm/udl/udl_modeset.c > +++ b/drivers/gpu/drm/udl/udl_modeset.c > @@ -12,7 +12,9 @@ > #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> > > @@ -282,6 +284,92 @@ static void udl_crtc_dpms(struct drm_crtc *crtc, int mode) > > } > > +static int udl_handle_damage(struct drm_framebuffer *fb, int x, int y, > + int width, int height) > +{ > + struct drm_device *dev = fb->dev; > + struct udl_device *udl = to_udl(dev); > + int i, ret; > + char *cmd; > + cycles_t start_cycles, end_cycles; > + int bytes_sent = 0; > + int bytes_identical = 0; > + struct urb *urb; > + int aligned_x; > + int log_bpp; > + void *vaddr; > + > + if (WARN_ON(!is_power_of_2(fb->format->cpp[0]))) > + return -EINVAL; > + > + log_bpp = __ffs(fb->format->cpp[0]); > + > + vaddr = drm_gem_shmem_vmap(fb->obj[0]); > + if (IS_ERR(vaddr)) { > + DRM_ERROR("failed to vmap fb\n"); > + return 0; > + } > + > + aligned_x = ALIGN_DOWN(x, sizeof(unsigned long)); > + width = ALIGN(width + (x-aligned_x), sizeof(unsigned long)); > + x = aligned_x; > + > + if ((width <= 0) || > + (x + width > fb->width) || > + (y + height > fb->height)) { > + ret = -EINVAL; > + goto err_drm_gem_shmem_vunmap; > + } > + > + start_cycles = get_cycles(); > + > + urb = udl_get_urb(dev); > + if (!urb) > + goto out; > + cmd = urb->transfer_buffer; > + > + for (i = y; i < y + height ; i++) { > + const int line_offset = fb->pitches[0] * i; > + const int byte_offset = line_offset + (x << log_bpp); > + const int dev_byte_offset = (fb->width * i + x) << log_bpp; > + > + if (udl_render_hline(dev, log_bpp, &urb, (char *)vaddr, > + &cmd, byte_offset, dev_byte_offset, > + width << log_bpp, > + &bytes_identical, &bytes_sent)) > + goto error; > + } > + > + 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); > + bytes_sent += len; > + } else > + udl_urb_completion(urb); > + > +error: > + atomic_add(bytes_sent, &udl->bytes_sent); > + atomic_add(bytes_identical, &udl->bytes_identical); > + atomic_add((width * height) << log_bpp, &udl->bytes_rendered); > + end_cycles = get_cycles(); > + atomic_add(((unsigned int) ((end_cycles - start_cycles) > + >> 10)), /* Kcycles */ > + &udl->cpu_kcycles_used); > + > +out: > + drm_gem_shmem_vunmap(fb->obj[0], vaddr); > + > + return 0; > + > +err_drm_gem_shmem_vunmap: > + drm_gem_shmem_vunmap(fb->obj[0], vaddr); > + return ret; > +} > + > /* > * Simple display pipeline > */ > -- > 2.23.0 >
On Tue, 26 Nov 2019 at 13:47, Thomas Zimmermann <tzimmermann@suse.de> wrote: > > The only caller of udl_handle_damage() in the plane-update function > in udl_modeset.c. Move udl_handle_damage() there, make it static, and > remove several left-over macros. > Personally I would have left the mechanic code motion from the dead code removal. Not a big deal though: Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> There's few comments for follow-up work below. > +static int udl_handle_damage(struct drm_framebuffer *fb, int x, int y, > + int width, int height) > +{ > + struct drm_device *dev = fb->dev; > + struct udl_device *udl = to_udl(dev); > + int i, ret; > + char *cmd; > + cycles_t start_cycles, end_cycles; > + int bytes_sent = 0; > + int bytes_identical = 0; > + struct urb *urb; > + int aligned_x; > + int log_bpp; > + void *vaddr; > + > + if (WARN_ON(!is_power_of_2(fb->format->cpp[0]))) > + return -EINVAL; > + > + log_bpp = __ffs(fb->format->cpp[0]); > + > + vaddr = drm_gem_shmem_vmap(fb->obj[0]); > + if (IS_ERR(vaddr)) { > + DRM_ERROR("failed to vmap fb\n"); > + return 0; > + } > + Might as well move this hunk ... > + aligned_x = ALIGN_DOWN(x, sizeof(unsigned long)); > + width = ALIGN(width + (x-aligned_x), sizeof(unsigned long)); > + x = aligned_x; > + > + if ((width <= 0) || > + (x + width > fb->width) || > + (y + height > fb->height)) { > + ret = -EINVAL; > + goto err_drm_gem_shmem_vunmap; > + } > + > + start_cycles = get_cycles(); > + > + urb = udl_get_urb(dev); > + if (!urb) > + goto out; > + cmd = urb->transfer_buffer; > + ... here > + for (i = y; i < y + height ; i++) { > + const int line_offset = fb->pitches[0] * i; > + const int byte_offset = line_offset + (x << log_bpp); > + const int dev_byte_offset = (fb->width * i + x) << log_bpp; > + > + if (udl_render_hline(dev, log_bpp, &urb, (char *)vaddr, > + &cmd, byte_offset, dev_byte_offset, > + width << log_bpp, > + &bytes_identical, &bytes_sent)) udl_render_hline() - drop the unused args bytes_identical and bytes_sent? > + goto error; > + } > + > + 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); > + bytes_sent += len; Nit: int len = cmd - (char *) urb->transfer_buffer; if (len > 0) { /* Send partial buffer remaining before exiting */ if (len < urb->transfer_buffer_length) ... > + } else > + udl_urb_completion(urb); > + > +error: > + atomic_add(bytes_sent, &udl->bytes_sent); > + atomic_add(bytes_identical, &udl->bytes_identical); > + atomic_add((width * height) << log_bpp, &udl->bytes_rendered); > + end_cycles = get_cycles(); > + atomic_add(((unsigned int) ((end_cycles - start_cycles) > + >> 10)), /* Kcycles */ > + &udl->cpu_kcycles_used); > + These atomics (+ lost_pixels) seem to be set-but-unused since day one. We might as well kill them, alongside the associated get_cycles(). HTH Emil
Hi Am 02.12.19 um 10:27 schrieb Emil Velikov: > On Tue, 26 Nov 2019 at 13:47, Thomas Zimmermann <tzimmermann@suse.de> wrote: >> >> The only caller of udl_handle_damage() in the plane-update function >> in udl_modeset.c. Move udl_handle_damage() there, make it static, and >> remove several left-over macros. >> > Personally I would have left the mechanic code motion from the dead > code removal. > Not a big deal though: > Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> > > There's few comments for follow-up work below. > >> +static int udl_handle_damage(struct drm_framebuffer *fb, int x, int y, >> + int width, int height) >> +{ >> + struct drm_device *dev = fb->dev; >> + struct udl_device *udl = to_udl(dev); >> + int i, ret; >> + char *cmd; >> + cycles_t start_cycles, end_cycles; >> + int bytes_sent = 0; >> + int bytes_identical = 0; >> + struct urb *urb; >> + int aligned_x; >> + int log_bpp; >> + void *vaddr; >> + >> + if (WARN_ON(!is_power_of_2(fb->format->cpp[0]))) >> + return -EINVAL; >> + > >> + log_bpp = __ffs(fb->format->cpp[0]); >> + >> + vaddr = drm_gem_shmem_vmap(fb->obj[0]); >> + if (IS_ERR(vaddr)) { >> + DRM_ERROR("failed to vmap fb\n"); >> + return 0; >> + } >> + > Might as well move this hunk ... > >> + aligned_x = ALIGN_DOWN(x, sizeof(unsigned long)); >> + width = ALIGN(width + (x-aligned_x), sizeof(unsigned long)); >> + x = aligned_x; >> + >> + if ((width <= 0) || >> + (x + width > fb->width) || >> + (y + height > fb->height)) { >> + ret = -EINVAL; >> + goto err_drm_gem_shmem_vunmap; >> + } >> + >> + start_cycles = get_cycles(); >> + >> + urb = udl_get_urb(dev); >> + if (!urb) >> + goto out; >> + cmd = urb->transfer_buffer; >> + > ... here > >> + for (i = y; i < y + height ; i++) { >> + const int line_offset = fb->pitches[0] * i; >> + const int byte_offset = line_offset + (x << log_bpp); >> + const int dev_byte_offset = (fb->width * i + x) << log_bpp; >> + >> + if (udl_render_hline(dev, log_bpp, &urb, (char *)vaddr, >> + &cmd, byte_offset, dev_byte_offset, >> + width << log_bpp, >> + &bytes_identical, &bytes_sent)) > udl_render_hline() - drop the unused args bytes_identical and bytes_sent? > >> + goto error; >> + } >> + >> + 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); >> + bytes_sent += len; > Nit: > > int len = cmd - (char *) urb->transfer_buffer; > if (len > 0) { > /* Send partial buffer remaining before exiting */ > if (len < urb->transfer_buffer_length) > ... > >> + } else >> + udl_urb_completion(urb); >> + >> +error: > >> + atomic_add(bytes_sent, &udl->bytes_sent); >> + atomic_add(bytes_identical, &udl->bytes_identical); >> + atomic_add((width * height) << log_bpp, &udl->bytes_rendered); >> + end_cycles = get_cycles(); >> + atomic_add(((unsigned int) ((end_cycles - start_cycles) >> + >> 10)), /* Kcycles */ >> + &udl->cpu_kcycles_used); >> + > These atomics (+ lost_pixels) seem to be set-but-unused since day one. > We might as well kill them, alongside the associated get_cycles(). I wanted to do this later. But since you brought it up and there's also the issue where I forgot to convert the import_attach code, I'll send out a series to clean up the damage handling and then get back to the simple-pipe conversion. Best regards Thomas > > HTH > Emil >
diff --git a/drivers/gpu/drm/udl/Makefile b/drivers/gpu/drm/udl/Makefile index 177ce74f4cf4..b50179bb4de0 100644 --- a/drivers/gpu/drm/udl/Makefile +++ b/drivers/gpu/drm/udl/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -udl-y := udl_drv.o udl_modeset.o udl_connector.o udl_main.o udl_fb.o udl_transfer.o udl_gem.o +udl-y := udl_drv.o udl_modeset.o udl_connector.o udl_main.o udl_transfer.o udl_gem.o obj-$(CONFIG_DRM_UDL) := udl.o diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h index e540f8e64aa1..ab62a6aecd06 100644 --- a/drivers/gpu/drm/udl/udl_drv.h +++ b/drivers/gpu/drm/udl/udl_drv.h @@ -93,9 +93,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 deleted file mode 100644 index 3d8cf674dfa5..000000000000 --- a/drivers/gpu/drm/udl/udl_fb.c +++ /dev/null @@ -1,142 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (C) 2012 Red Hat - * - * based in parts on udlfb.c: - * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> - * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> - * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> - */ - -#include <linux/moduleparam.h> - -#include <drm/drm_fourcc.h> -#include <drm/drm_gem_shmem_helper.h> - -#include "udl_drv.h" - -#define DL_ALIGN_UP(x, a) ALIGN(x, a) -#define DL_ALIGN_DOWN(x, a) ALIGN_DOWN(x, a) - -/** Read the red component (0..255) of a 32 bpp colour. */ -#define DLO_RGB_GETRED(col) (uint8_t)((col) & 0xFF) - -/** Read the green component (0..255) of a 32 bpp colour. */ -#define DLO_RGB_GETGRN(col) (uint8_t)(((col) >> 8) & 0xFF) - -/** Read the blue component (0..255) of a 32 bpp colour. */ -#define DLO_RGB_GETBLU(col) (uint8_t)(((col) >> 16) & 0xFF) - -/** Return red/green component of a 16 bpp colour number. */ -#define DLO_RG16(red, grn) (uint8_t)((((red) & 0xF8) | ((grn) >> 5)) & 0xFF) - -/** Return green/blue component of a 16 bpp colour number. */ -#define DLO_GB16(grn, blu) (uint8_t)(((((grn) & 0x1C) << 3) | ((blu) >> 3)) & 0xFF) - -/** Return 8 bpp colour number from red, green and blue components. */ -#define DLO_RGB8(red, grn, blu) ((((red) << 5) | (((grn) & 3) << 3) | ((blu) & 7)) & 0xFF) - -#if 0 -static uint8_t rgb8(uint32_t col) -{ - uint8_t red = DLO_RGB_GETRED(col); - uint8_t grn = DLO_RGB_GETGRN(col); - uint8_t blu = DLO_RGB_GETBLU(col); - - return DLO_RGB8(red, grn, blu); -} - -static uint16_t rgb16(uint32_t col) -{ - uint8_t red = DLO_RGB_GETRED(col); - uint8_t grn = DLO_RGB_GETGRN(col); - uint8_t blu = DLO_RGB_GETBLU(col); - - return (DLO_RG16(red, grn) << 8) + DLO_GB16(grn, blu); -} -#endif - -int udl_handle_damage(struct drm_framebuffer *fb, int x, int y, - int width, int height) -{ - struct drm_device *dev = fb->dev; - struct udl_device *udl = to_udl(dev); - int i, ret; - char *cmd; - cycles_t start_cycles, end_cycles; - int bytes_sent = 0; - int bytes_identical = 0; - struct urb *urb; - int aligned_x; - int log_bpp; - void *vaddr; - - if (WARN_ON(!is_power_of_2(fb->format->cpp[0]))) - return -EINVAL; - - log_bpp = __ffs(fb->format->cpp[0]); - - vaddr = drm_gem_shmem_vmap(fb->obj[0]); - if (IS_ERR(vaddr)) { - DRM_ERROR("failed to vmap fb\n"); - return 0; - } - - aligned_x = DL_ALIGN_DOWN(x, sizeof(unsigned long)); - width = DL_ALIGN_UP(width + (x-aligned_x), sizeof(unsigned long)); - x = aligned_x; - - if ((width <= 0) || - (x + width > fb->width) || - (y + height > fb->height)) { - ret = -EINVAL; - goto err_drm_gem_shmem_vunmap; - } - - start_cycles = get_cycles(); - - urb = udl_get_urb(dev); - if (!urb) - goto out; - cmd = urb->transfer_buffer; - - for (i = y; i < y + height ; i++) { - const int line_offset = fb->pitches[0] * i; - const int byte_offset = line_offset + (x << log_bpp); - const int dev_byte_offset = (fb->width * i + x) << log_bpp; - if (udl_render_hline(dev, log_bpp, &urb, (char *)vaddr, - &cmd, byte_offset, dev_byte_offset, - width << log_bpp, - &bytes_identical, &bytes_sent)) - goto error; - } - - 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); - bytes_sent += len; - } else - udl_urb_completion(urb); - -error: - atomic_add(bytes_sent, &udl->bytes_sent); - atomic_add(bytes_identical, &udl->bytes_identical); - atomic_add((width * height) << log_bpp, &udl->bytes_rendered); - end_cycles = get_cycles(); - atomic_add(((unsigned int) ((end_cycles - start_cycles) - >> 10)), /* Kcycles */ - &udl->cpu_kcycles_used); - -out: - drm_gem_shmem_vunmap(fb->obj[0], vaddr); - - return 0; - -err_drm_gem_shmem_vunmap: - drm_gem_shmem_vunmap(fb->obj[0], vaddr); - return ret; -} diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c index 83e80083e0b2..7107c90672ae 100644 --- a/drivers/gpu/drm/udl/udl_modeset.c +++ b/drivers/gpu/drm/udl/udl_modeset.c @@ -12,7 +12,9 @@ #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> @@ -282,6 +284,92 @@ static void udl_crtc_dpms(struct drm_crtc *crtc, int mode) } +static int udl_handle_damage(struct drm_framebuffer *fb, int x, int y, + int width, int height) +{ + struct drm_device *dev = fb->dev; + struct udl_device *udl = to_udl(dev); + int i, ret; + char *cmd; + cycles_t start_cycles, end_cycles; + int bytes_sent = 0; + int bytes_identical = 0; + struct urb *urb; + int aligned_x; + int log_bpp; + void *vaddr; + + if (WARN_ON(!is_power_of_2(fb->format->cpp[0]))) + return -EINVAL; + + log_bpp = __ffs(fb->format->cpp[0]); + + vaddr = drm_gem_shmem_vmap(fb->obj[0]); + if (IS_ERR(vaddr)) { + DRM_ERROR("failed to vmap fb\n"); + return 0; + } + + aligned_x = ALIGN_DOWN(x, sizeof(unsigned long)); + width = ALIGN(width + (x-aligned_x), sizeof(unsigned long)); + x = aligned_x; + + if ((width <= 0) || + (x + width > fb->width) || + (y + height > fb->height)) { + ret = -EINVAL; + goto err_drm_gem_shmem_vunmap; + } + + start_cycles = get_cycles(); + + urb = udl_get_urb(dev); + if (!urb) + goto out; + cmd = urb->transfer_buffer; + + for (i = y; i < y + height ; i++) { + const int line_offset = fb->pitches[0] * i; + const int byte_offset = line_offset + (x << log_bpp); + const int dev_byte_offset = (fb->width * i + x) << log_bpp; + + if (udl_render_hline(dev, log_bpp, &urb, (char *)vaddr, + &cmd, byte_offset, dev_byte_offset, + width << log_bpp, + &bytes_identical, &bytes_sent)) + goto error; + } + + 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); + bytes_sent += len; + } else + udl_urb_completion(urb); + +error: + atomic_add(bytes_sent, &udl->bytes_sent); + atomic_add(bytes_identical, &udl->bytes_identical); + atomic_add((width * height) << log_bpp, &udl->bytes_rendered); + end_cycles = get_cycles(); + atomic_add(((unsigned int) ((end_cycles - start_cycles) + >> 10)), /* Kcycles */ + &udl->cpu_kcycles_used); + +out: + drm_gem_shmem_vunmap(fb->obj[0], vaddr); + + return 0; + +err_drm_gem_shmem_vunmap: + drm_gem_shmem_vunmap(fb->obj[0], vaddr); + return ret; +} + /* * Simple display pipeline */
The only caller of udl_handle_damage() in the plane-update function in udl_modeset.c. Move udl_handle_damage() there, make it static, and remove several left-over macros. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> --- drivers/gpu/drm/udl/Makefile | 2 +- drivers/gpu/drm/udl/udl_drv.h | 3 - drivers/gpu/drm/udl/udl_fb.c | 142 ------------------------------ drivers/gpu/drm/udl/udl_modeset.c | 88 ++++++++++++++++++ 4 files changed, 89 insertions(+), 146 deletions(-) delete mode 100644 drivers/gpu/drm/udl/udl_fb.c