Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7619960 authored by Joonyoung Shim's avatar Joonyoung Shim Committed by Inki Dae
Browse files

drm/exynos: cleanup exynos_drm_fbdev_update() 



It can get exynos_gem object via function argument, so no need to call
exynos_drm_fb_gem_obj() in exynos_drm_fbdev_update.

It also can get struct drm_framebuffer *fb via helper->fb, so can remove
a function argument for it.

Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Reviewed-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 39a839f2

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

+4 −11
Original line number Original line Diff line number Diff line
@@ -76,10 +76,10 @@ static struct fb_ops exynos_drm_fb_ops = { 




static int exynos_drm_fbdev_update(struct drm_fb_helper *helper,

static int exynos_drm_fbdev_update(struct drm_fb_helper *helper,

				   struct drm_fb_helper_surface_size *sizes,

				   struct drm_fb_helper_surface_size *sizes,

				     struct drm_framebuffer *fb)

				   struct exynos_drm_gem_obj *obj)

{

{

	struct fb_info *fbi = helper->fbdev;

	struct fb_info *fbi = helper->fbdev;

	struct exynos_drm_gem_obj *obj;

	struct drm_framebuffer *fb = helper->fb;

	unsigned int size = fb->width * fb->height * (fb->bits_per_pixel >> 3);

	unsigned int size = fb->width * fb->height * (fb->bits_per_pixel >> 3);

	unsigned int nr_pages;

	unsigned int nr_pages;

	unsigned long offset;

	unsigned long offset;
@@ -87,13 +87,6 @@ static int exynos_drm_fbdev_update(struct drm_fb_helper *helper, 
	drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->depth);

	drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->depth);

	drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height);

	drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height);





	/* RGB formats use only one buffer */

	obj = exynos_drm_fb_gem_obj(fb, 0);

	if (!obj) {

		DRM_DEBUG_KMS("gem object is null.\n");

		return -EFAULT;

	}



	nr_pages = obj->size >> PAGE_SHIFT;

	nr_pages = obj->size >> PAGE_SHIFT;





	obj->kvaddr = (void __iomem *) vmap(obj->pages, nr_pages, VM_MAP,

	obj->kvaddr = (void __iomem *) vmap(obj->pages, nr_pages, VM_MAP,
@@ -175,7 +168,7 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper, 
	fbi->flags = FBINFO_FLAG_DEFAULT;

	fbi->flags = FBINFO_FLAG_DEFAULT;

	fbi->fbops = &exynos_drm_fb_ops;

	fbi->fbops = &exynos_drm_fb_ops;





	ret = exynos_drm_fbdev_update(helper, sizes, helper->fb);

	ret = exynos_drm_fbdev_update(helper, sizes, obj);

	if (ret < 0)

	if (ret < 0)

		goto err_destroy_framebuffer;

		goto err_destroy_framebuffer;