p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/sun4i: Grab reserved memory region 

Allow to provide an optional memory region to allocate from for our DRM
driver.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
Maxime Ripard 2017-02-09 17:39:18 +01:00
parent 3c64fb3747
commit 596afb6f05
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/sun4i/sun4i_drv.c
View File

@ -12,6 +12,7 @@
#include <linux/component.h> #include <linux/component.h>
#include <linux/of_graph.h> #include <linux/of_graph.h>
#include <linux/of_reserved_mem.h>
#include <drm/drmP.h> #include <drm/drmP.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
@ -101,10 +102,16 @@ static int sun4i_drv_bind(struct device *dev)
} }
drm->dev_private = drv; drm->dev_private = drv;
ret = of_reserved_mem_device_init(dev);
if (ret && ret != -ENODEV) {
dev_err(drm->dev, "Couldn't claim our memory region\n");
goto free_drm;
}
/* drm_vblank_init calls kcalloc, which can fail */ /* drm_vblank_init calls kcalloc, which can fail */
ret = drm_vblank_init(drm, 1); ret = drm_vblank_init(drm, 1);
if (ret) if (ret)
goto free_drm; goto free_mem_region;
drm_mode_config_init(drm); drm_mode_config_init(drm);
@ -142,6 +149,8 @@ static int sun4i_drv_bind(struct device *dev)
cleanup_mode_config: cleanup_mode_config:
drm_mode_config_cleanup(drm); drm_mode_config_cleanup(drm);
drm_vblank_cleanup(drm); drm_vblank_cleanup(drm);
free_mem_region:
of_reserved_mem_device_release(dev);
free_drm: free_drm:
drm_dev_unref(drm); drm_dev_unref(drm);
return ret; return ret;
@ -156,6 +165,7 @@ static void sun4i_drv_unbind(struct device *dev)
sun4i_framebuffer_free(drm); sun4i_framebuffer_free(drm);
drm_mode_config_cleanup(drm); drm_mode_config_cleanup(drm);
drm_vblank_cleanup(drm); drm_vblank_cleanup(drm);
of_reserved_mem_device_release(dev);
drm_dev_unref(drm); drm_dev_unref(drm);
} }