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

drm/exynos: cleanup exynos_user_fb_create() 

Using exynos_drm_framebuffer_init(), redundant codes can be removed.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
This commit is contained in:
Joonyoung Shim 2015-09-01 16:22:53 +09:00 committed by Inki Dae
parent d56125afcb
commit 8d31758ecf
1 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,57 +174,36 @@ static struct drm_framebuffer *
exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
struct drm_mode_fb_cmd2 *mode_cmd) struct drm_mode_fb_cmd2 *mode_cmd)
{ {
struct exynos_drm_gem_obj *gem_objs[MAX_FB_BUFFER];
struct drm_gem_object *obj; struct drm_gem_object *obj;
struct exynos_drm_gem_obj *exynos_gem_obj; struct drm_framebuffer *fb;
struct exynos_drm_fb *exynos_fb; int i;
int i, ret; int ret;
exynos_fb = kzalloc(sizeof(*exynos_fb), GFP_KERNEL); for (i = 0; i < drm_format_num_planes(mode_cmd->pixel_format); i++) {
if (!exynos_fb)
return ERR_PTR(-ENOMEM);
exynos_fb->buf_cnt = drm_format_num_planes(mode_cmd->pixel_format);
DRM_DEBUG_KMS("buf_cnt = %d\n", exynos_fb->buf_cnt);
for (i = 0; i < exynos_fb->buf_cnt; i++) {
obj = drm_gem_object_lookup(dev, file_priv, obj = drm_gem_object_lookup(dev, file_priv,
mode_cmd->handles[i]); mode_cmd->handles[i]);
if (!obj) { if (!obj) {
DRM_ERROR("failed to lookup gem object\n"); DRM_ERROR("failed to lookup gem object\n");
ret = -ENOENT; ret = -ENOENT;
exynos_fb->buf_cnt = i;
goto err; goto err;
} }
exynos_gem_obj = to_exynos_gem_obj(obj); gem_objs[i] = to_exynos_gem_obj(obj);
exynos_fb->exynos_gem_obj[i] = exynos_gem_obj;
ret = check_fb_gem_memory_type(dev, exynos_gem_obj);
if (ret < 0)
goto err;
} }
drm_helper_mode_fill_fb_struct(&exynos_fb->fb, mode_cmd); fb = exynos_drm_framebuffer_init(dev, mode_cmd, gem_objs, i);
if (IS_ERR(fb)) {
ret = drm_framebuffer_init(dev, &exynos_fb->fb, &exynos_drm_fb_funcs); ret = PTR_ERR(fb);
if (ret) {
DRM_ERROR("failed to init framebuffer.\n");
goto err; goto err;
} }
return &exynos_fb->fb; return fb;
err: err:
for (i = 0; i < exynos_fb->buf_cnt; i++) { while (i--)
struct drm_gem_object *obj; drm_gem_object_unreference_unlocked(&gem_objs[i]->base);
obj = &exynos_fb->exynos_gem_obj[i]->base;
if (obj)
drm_gem_object_unreference_unlocked(obj);
}
kfree(exynos_fb);
return ERR_PTR(ret); return ERR_PTR(ret);
} }