OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/exynos: Move dma_addr out of exynos_drm_fb

Browse Source 
This can be calculated from the GEM BO DMA address as well as the offset
stored in the base framebuffer.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
This commit is contained in:
Daniel Stone 2018-03-30 15:11:31 +01:00 committed by Inki Dae
parent b11954a697
commit 7b30508f51
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/exynos/exynos_drm_fb.c
View File

@ -37,7 +37,6 @@
*/ */
struct exynos_drm_fb { struct exynos_drm_fb {
struct drm_framebuffer fb; struct drm_framebuffer fb;
dma_addr_t dma_addr[MAX_FB_BUFFER];
}; };
static int check_fb_gem_memory_type(struct drm_device *drm_dev, static int check_fb_gem_memory_type(struct drm_device *drm_dev,
@ -91,8 +90,6 @@ exynos_drm_framebuffer_init(struct drm_device *dev,
goto err; goto err;
exynos_fb->fb.obj[i] = &exynos_gem[i]->base; exynos_fb->fb.obj[i] = &exynos_gem[i]->base;
exynos_fb->dma_addr[i] = exynos_gem[i]->dma_addr
+ mode_cmd->offsets[i];
} }
drm_helper_mode_fill_fb_struct(dev, &exynos_fb->fb, mode_cmd); drm_helper_mode_fill_fb_struct(dev, &exynos_fb->fb, mode_cmd);
@ -160,12 +157,13 @@ err:
dma_addr_t exynos_drm_fb_dma_addr(struct drm_framebuffer *fb, int index) dma_addr_t exynos_drm_fb_dma_addr(struct drm_framebuffer *fb, int index)
{ {
struct exynos_drm_fb *exynos_fb = to_exynos_fb(fb); struct exynos_drm_gem *exynos_gem;
if (WARN_ON_ONCE(index >= MAX_FB_BUFFER)) if (WARN_ON_ONCE(index >= MAX_FB_BUFFER))
return 0; return 0;
return exynos_fb->dma_addr[index]; exynos_gem = to_exynos_gem(fb->obj[index]);
return exynos_gem->dma_addr + fb->offsets[index];
} }
static struct drm_mode_config_helper_funcs exynos_drm_mode_config_helpers = { static struct drm_mode_config_helper_funcs exynos_drm_mode_config_helpers = {