Skip to content

Commit

Permalink
drm/sun4i: Grab reserved memory region
Browse files Browse the repository at this point in the history
Allow to provide an optional memory region to allocate from for our DRM
driver.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  • Loading branch information
Maxime Ripard committed Mar 7, 2017
1 parent 3c64fb3 commit 596afb6
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion drivers/gpu/drm/sun4i/sun4i_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include <linux/component.h>
#include <linux/of_graph.h>
#include <linux/of_reserved_mem.h>

#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
Expand Down Expand Up @@ -101,10 +102,16 @@ static int sun4i_drv_bind(struct device *dev)
}
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 */
ret = drm_vblank_init(drm, 1);
if (ret)
goto free_drm;
goto free_mem_region;

drm_mode_config_init(drm);

Expand Down Expand Up @@ -142,6 +149,8 @@ static int sun4i_drv_bind(struct device *dev)
cleanup_mode_config:
drm_mode_config_cleanup(drm);
drm_vblank_cleanup(drm);
free_mem_region:
of_reserved_mem_device_release(dev);
free_drm:
drm_dev_unref(drm);
return ret;
Expand All @@ -156,6 +165,7 @@ static void sun4i_drv_unbind(struct device *dev)
sun4i_framebuffer_free(drm);
drm_mode_config_cleanup(drm);
drm_vblank_cleanup(drm);
of_reserved_mem_device_release(dev);
drm_dev_unref(drm);
}

Expand Down

0 comments on commit 596afb6

Please sign in to comment.