Commit 234a2c42 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'exynos-drm-fixes-v5.9-rc3' of...

Merge tag 'exynos-drm-fixes-v5.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes

One fixup
- Just drop __iommu annotation to fix sparse warning.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Inki Dae <daeinki@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200826071520.3140-1-daeinki@gmail.com
parents d012a719 d4035d10
...@@ -92,7 +92,7 @@ static int exynos_drm_fbdev_update(struct drm_fb_helper *helper, ...@@ -92,7 +92,7 @@ static int exynos_drm_fbdev_update(struct drm_fb_helper *helper,
offset = fbi->var.xoffset * fb->format->cpp[0]; offset = fbi->var.xoffset * fb->format->cpp[0];
offset += fbi->var.yoffset * fb->pitches[0]; offset += fbi->var.yoffset * fb->pitches[0];
fbi->screen_base = exynos_gem->kvaddr + offset; fbi->screen_buffer = exynos_gem->kvaddr + offset;
fbi->screen_size = size; fbi->screen_size = size;
fbi->fix.smem_len = size; fbi->fix.smem_len = size;
......
...@@ -40,7 +40,7 @@ struct exynos_drm_gem { ...@@ -40,7 +40,7 @@ struct exynos_drm_gem {
unsigned int flags; unsigned int flags;
unsigned long size; unsigned long size;
void *cookie; void *cookie;
void __iomem *kvaddr; void *kvaddr;
dma_addr_t dma_addr; dma_addr_t dma_addr;
unsigned long dma_attrs; unsigned long dma_attrs;
struct sg_table *sgt; struct sg_table *sgt;
......
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