Commit 08b7ef05 authored by Thomas Zimmermann's avatar Thomas Zimmermann

drm/gud: Use framebuffer dma-buf helpers

Replace dma_buf_begin_cpu_access() with drm_gem_fb_begin_cpu_access();
same for _end_cpu_access(). Remove some boiler-plate code. No functional
changes.
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210716140801.1215-5-tzimmermann@suse.de
parent 08971eea
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
* Copyright 2020 Noralf Trønnes * Copyright 2020 Noralf Trønnes
*/ */
#include <linux/dma-buf.h>
#include <linux/lz4.h> #include <linux/lz4.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
...@@ -15,6 +14,7 @@ ...@@ -15,6 +14,7 @@
#include <drm/drm_format_helper.h> #include <drm/drm_format_helper.h>
#include <drm/drm_fourcc.h> #include <drm/drm_fourcc.h>
#include <drm/drm_framebuffer.h> #include <drm/drm_framebuffer.h>
#include <drm/drm_gem_framebuffer_helper.h>
#include <drm/drm_gem_shmem_helper.h> #include <drm/drm_gem_shmem_helper.h>
#include <drm/drm_print.h> #include <drm/drm_print.h>
#include <drm/drm_rect.h> #include <drm/drm_rect.h>
...@@ -168,11 +168,9 @@ static int gud_prep_flush(struct gud_device *gdrm, struct drm_framebuffer *fb, ...@@ -168,11 +168,9 @@ static int gud_prep_flush(struct gud_device *gdrm, struct drm_framebuffer *fb,
vaddr = map.vaddr + fb->offsets[0]; vaddr = map.vaddr + fb->offsets[0];
if (import_attach) { ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE);
ret = dma_buf_begin_cpu_access(import_attach->dmabuf, DMA_FROM_DEVICE); if (ret)
if (ret) goto vunmap;
goto vunmap;
}
retry: retry:
if (compression) if (compression)
buf = gdrm->compress_buf; buf = gdrm->compress_buf;
...@@ -225,8 +223,7 @@ static int gud_prep_flush(struct gud_device *gdrm, struct drm_framebuffer *fb, ...@@ -225,8 +223,7 @@ static int gud_prep_flush(struct gud_device *gdrm, struct drm_framebuffer *fb,
} }
end_cpu_access: end_cpu_access:
if (import_attach) drm_gem_fb_end_cpu_access(fb, DMA_FROM_DEVICE);
dma_buf_end_cpu_access(import_attach->dmabuf, DMA_FROM_DEVICE);
vunmap: vunmap:
drm_gem_shmem_vunmap(fb->obj[0], &map); drm_gem_shmem_vunmap(fb->obj[0], &map);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment