leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/udl: Call udl_handle_damage() with DRM framebuffer

Browse Source 
Simplifying the udl code before replacing struct udl_framebuffer.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191114141025.32198-5-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2019-11-14 15:10:24 +01:00
parent ba59b015a0
commit 8344603534
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/udl/udl_drv.h
View File

@ -110,7 +110,7 @@ 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, struct drm_gem_object *udl_driver_gem_create_object(struct drm_device *dev,
size_t size); size_t size);
int udl_handle_damage(struct udl_framebuffer *fb, int x, int y, int udl_handle_damage(struct drm_framebuffer *fb, int x, int y,
int width, int height); int width, int height);
int udl_drop_usb(struct drm_device *dev); int udl_drop_usb(struct drm_device *dev);

35
drivers/gpu/drm/udl/udl_fb.c
View File

@ -60,10 +60,10 @@ static uint16_t rgb16(uint32_t col)
} }
#endif #endif
int udl_handle_damage(struct udl_framebuffer *fb, int x, int y, int udl_handle_damage(struct drm_framebuffer *fb, int x, int y,
int width, int height) int width, int height)
{ {
struct drm_device *dev = fb->base.dev; struct drm_device *dev = fb->dev;
struct udl_device *udl = to_udl(dev); struct udl_device *udl = to_udl(dev);
int i, ret; int i, ret;
char *cmd; char *cmd;
@ -75,17 +75,19 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y,
int log_bpp; int log_bpp;
void *vaddr; void *vaddr;
BUG_ON(!is_power_of_2(fb->base.format->cpp[0])); if (WARN_ON(!is_power_of_2(fb->format->cpp[0])))
log_bpp = __ffs(fb->base.format->cpp[0]); return -EINVAL;
log_bpp = __ffs(fb->format->cpp[0]);
spin_lock(&udl->active_fb_16_lock); spin_lock(&udl->active_fb_16_lock);
if (udl->active_fb_16 != &fb->base) { if (udl->active_fb_16 != fb) {
spin_unlock(&udl->active_fb_16_lock); spin_unlock(&udl->active_fb_16_lock);
return 0; return 0;
} }
spin_unlock(&udl->active_fb_16_lock); spin_unlock(&udl->active_fb_16_lock);
vaddr = drm_gem_shmem_vmap(&fb->shmem->base); vaddr = drm_gem_shmem_vmap(fb->obj[0]);
if (IS_ERR(vaddr)) { if (IS_ERR(vaddr)) {
DRM_ERROR("failed to vmap fb\n"); DRM_ERROR("failed to vmap fb\n");
return 0; return 0;
@ -96,8 +98,8 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y,
x = aligned_x; x = aligned_x;
if ((width <= 0) || if ((width <= 0) ||
(x + width > fb->base.width) || (x + width > fb->width) ||
(y + height > fb->base.height)) { (y + height > fb->height)) {
ret = -EINVAL; ret = -EINVAL;
goto err_drm_gem_shmem_vunmap; goto err_drm_gem_shmem_vunmap;
} }
@ -110,9 +112,9 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y,
cmd = urb->transfer_buffer; cmd = urb->transfer_buffer;
for (i = y; i < y + height ; i++) { for (i = y; i < y + height ; i++) {
const int line_offset = fb->base.pitches[0] * i; const int line_offset = fb->pitches[0] * i;
const int byte_offset = line_offset + (x << log_bpp); const int byte_offset = line_offset + (x << log_bpp);
const int dev_byte_offset = (fb->base.width * i + x) << log_bpp; const int dev_byte_offset = (fb->width * i + x) << log_bpp;
if (udl_render_hline(dev, log_bpp, &urb, (char *)vaddr, if (udl_render_hline(dev, log_bpp, &urb, (char *)vaddr,
&cmd, byte_offset, dev_byte_offset, &cmd, byte_offset, dev_byte_offset,
width << log_bpp, width << log_bpp,
@ -141,12 +143,12 @@ error:
&udl->cpu_kcycles_used); &udl->cpu_kcycles_used);
out: out:
drm_gem_shmem_vunmap(&fb->shmem->base, vaddr); drm_gem_shmem_vunmap(fb->obj[0], vaddr);
return 0; return 0;
err_drm_gem_shmem_vunmap: err_drm_gem_shmem_vunmap:
drm_gem_shmem_vunmap(&fb->shmem->base, vaddr); drm_gem_shmem_vunmap(fb->obj[0], vaddr);
return ret; return ret;
} }
@ -156,7 +158,6 @@ static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb,
struct drm_clip_rect *clips, struct drm_clip_rect *clips,
unsigned num_clips) unsigned num_clips)
{ {
struct udl_framebuffer *ufb = to_udl_fb(fb);
struct udl_device *udl = fb->dev->dev_private; struct udl_device *udl = fb->dev->dev_private;
struct dma_buf_attachment *import_attach; struct dma_buf_attachment *import_attach;
int i; int i;
@ -171,7 +172,7 @@ static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb,
} }
spin_unlock(&udl->active_fb_16_lock); spin_unlock(&udl->active_fb_16_lock);
import_attach = ufb->shmem->base.import_attach; import_attach = fb->obj[0]->import_attach;
if (import_attach) { if (import_attach) {
ret = dma_buf_begin_cpu_access(import_attach->dmabuf, ret = dma_buf_begin_cpu_access(import_attach->dmabuf,
@ -181,9 +182,9 @@ static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb,
} }
for (i = 0; i < num_clips; i++) { for (i = 0; i < num_clips; i++) {
ret = udl_handle_damage(ufb, clips[i].x1, clips[i].y1, ret = udl_handle_damage(fb, clips[i].x1, clips[i].y1,
clips[i].x2 - clips[i].x1, clips[i].x2 - clips[i].x1,
clips[i].y2 - clips[i].y1); clips[i].y2 - clips[i].y1);
if (ret) if (ret)
break; break;
} }

15
drivers/gpu/drm/udl/udl_modeset.c
View File

@ -301,7 +301,7 @@ static int udl_crtc_mode_set(struct drm_crtc *crtc,
{ {
struct drm_device *dev = crtc->dev; struct drm_device *dev = crtc->dev;
struct udl_framebuffer *ufb = to_udl_fb(crtc->primary->fb); struct drm_framebuffer *fb = crtc->primary->fb;
struct udl_device *udl = dev->dev_private; struct udl_device *udl = dev->dev_private;
char *buf; char *buf;
char *wrptr; char *wrptr;
@ -333,12 +333,12 @@ static int udl_crtc_mode_set(struct drm_crtc *crtc,
wrptr = udl_dummy_render(wrptr); wrptr = udl_dummy_render(wrptr);
spin_lock(&udl->active_fb_16_lock); spin_lock(&udl->active_fb_16_lock);
udl->active_fb_16 = &ufb->base; udl->active_fb_16 = fb;
spin_unlock(&udl->active_fb_16_lock); spin_unlock(&udl->active_fb_16_lock);
udl->mode_buf_len = wrptr - buf; udl->mode_buf_len = wrptr - buf;
/* damage all of it */ /* damage all of it */
udl_handle_damage(ufb, 0, 0, ufb->base.width, ufb->base.height); udl_handle_damage(fb, 0, 0, fb->width, fb->height);
return 0; return 0;
} }
@ -360,7 +360,6 @@ static int udl_crtc_page_flip(struct drm_crtc *crtc,
uint32_t page_flip_flags, uint32_t page_flip_flags,
struct drm_modeset_acquire_ctx *ctx) struct drm_modeset_acquire_ctx *ctx)
{ {
struct udl_framebuffer *ufb = to_udl_fb(fb);
struct drm_device *dev = crtc->dev; struct drm_device *dev = crtc->dev;
struct udl_device *udl = dev->dev_private; struct udl_device *udl = dev->dev_private;
@ -368,7 +367,7 @@ static int udl_crtc_page_flip(struct drm_crtc *crtc,
udl->active_fb_16 = fb; udl->active_fb_16 = fb;
spin_unlock(&udl->active_fb_16_lock); spin_unlock(&udl->active_fb_16_lock);
udl_handle_damage(ufb, 0, 0, fb->width, fb->height); udl_handle_damage(fb, 0, 0, fb->width, fb->height);
spin_lock_irq(&dev->event_lock); spin_lock_irq(&dev->event_lock);
if (event) if (event)
@ -448,13 +447,13 @@ int udl_modeset_init(struct drm_device *dev)
void udl_modeset_restore(struct drm_device *dev) void udl_modeset_restore(struct drm_device *dev)
{ {
struct udl_device *udl = dev->dev_private; struct udl_device *udl = dev->dev_private;
struct udl_framebuffer *ufb; struct drm_framebuffer *fb;
if (!udl->crtc || !udl->crtc->primary->fb) if (!udl->crtc || !udl->crtc->primary->fb)
return; return;
udl_crtc_commit(udl->crtc); udl_crtc_commit(udl->crtc);
ufb = to_udl_fb(udl->crtc->primary->fb); fb = udl->crtc->primary->fb;
udl_handle_damage(ufb, 0, 0, ufb->base.width, ufb->base.height); udl_handle_damage(fb, 0, 0, fb->width, fb->height);
} }
void udl_modeset_cleanup(struct drm_device *dev) void udl_modeset_cleanup(struct drm_device *dev)