diff options
author | Joonyoung Shim <jy0922.shim@samsung.com> | 2015-09-01 03:22:55 -0400 |
---|---|---|
committer | Inki Dae <daeinki@gmail.com> | 2015-09-02 10:10:34 -0400 |
commit | c3058579a2882bb4bb6bf1ab0fe65f5ed070e530 (patch) | |
tree | db9af6007129864e440393c182cb4015b9980771 | |
parent | faec262b14f3d92601c06b5c73b45ea71d0d164b (diff) |
drm/exynos: remove buf_cnt from struct exynos_drm_fb
Looking other drm drivers, there is no the restriction that framebuffer
has only one buffer in .create_handle() callback. They use just first
buffer.
If this limitation is removed, there is no reason keeping buffer count
for framebuffer, so we can remove buf_cnt from struct exynos_drm_fb.
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>
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_fb.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c index 5087f60985f5..084280859589 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fb.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c | |||
@@ -32,12 +32,10 @@ | |||
32 | * exynos specific framebuffer structure. | 32 | * exynos specific framebuffer structure. |
33 | * | 33 | * |
34 | * @fb: drm framebuffer obejct. | 34 | * @fb: drm framebuffer obejct. |
35 | * @buf_cnt: a buffer count to drm framebuffer. | ||
36 | * @exynos_gem_obj: array of exynos specific gem object containing a gem object. | 35 | * @exynos_gem_obj: array of exynos specific gem object containing a gem object. |
37 | */ | 36 | */ |
38 | struct exynos_drm_fb { | 37 | struct exynos_drm_fb { |
39 | struct drm_framebuffer fb; | 38 | struct drm_framebuffer fb; |
40 | unsigned int buf_cnt; | ||
41 | struct exynos_drm_gem_obj *exynos_gem_obj[MAX_FB_BUFFER]; | 39 | struct exynos_drm_gem_obj *exynos_gem_obj[MAX_FB_BUFFER]; |
42 | }; | 40 | }; |
43 | 41 | ||
@@ -97,10 +95,6 @@ static int exynos_drm_fb_create_handle(struct drm_framebuffer *fb, | |||
97 | { | 95 | { |
98 | struct exynos_drm_fb *exynos_fb = to_exynos_fb(fb); | 96 | struct exynos_drm_fb *exynos_fb = to_exynos_fb(fb); |
99 | 97 | ||
100 | /* This fb should have only one gem object. */ | ||
101 | if (WARN_ON(exynos_fb->buf_cnt != 1)) | ||
102 | return -EINVAL; | ||
103 | |||
104 | return drm_gem_handle_create(file_priv, | 98 | return drm_gem_handle_create(file_priv, |
105 | &exynos_fb->exynos_gem_obj[0]->base, handle); | 99 | &exynos_fb->exynos_gem_obj[0]->base, handle); |
106 | } | 100 | } |
@@ -135,9 +129,6 @@ exynos_drm_framebuffer_init(struct drm_device *dev, | |||
135 | if (!exynos_fb) | 129 | if (!exynos_fb) |
136 | return ERR_PTR(-ENOMEM); | 130 | return ERR_PTR(-ENOMEM); |
137 | 131 | ||
138 | exynos_fb->buf_cnt = count; | ||
139 | DRM_DEBUG_KMS("buf_cnt = %d\n", exynos_fb->buf_cnt); | ||
140 | |||
141 | for (i = 0; i < count; i++) { | 132 | for (i = 0; i < count; i++) { |
142 | ret = check_fb_gem_memory_type(dev, gem_obj[i]); | 133 | ret = check_fb_gem_memory_type(dev, gem_obj[i]); |
143 | if (ret < 0) | 134 | if (ret < 0) |