aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/exynos
diff options
context:
space:
mode:
authorRob Clark <robdclark@gmail.com>2015-03-11 10:23:11 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-03-11 17:08:17 -0400
commitecbf1d5afe993f05f0c513a4b99256589ab5c810 (patch)
tree9c0f18ba0f88a9fa5fffc00689f1c432a9a4f522 /drivers/gpu/drm/exynos
parent8d76612bd49a73dca018e6fe5c790c943dbde98f (diff)
drm/exynos: use correct fb width/height
What is passed to drm_fb_helper_fill_var() should be fb_width/fb_height, rather than the surface size. Signed-off-by: Rob Clark <robdclark@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/exynos')
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_fbdev.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
index 84f8dfe1c5ec..e71e331f0188 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
@@ -76,6 +76,7 @@ static struct fb_ops exynos_drm_fb_ops = {
76}; 76};
77 77
78static int exynos_drm_fbdev_update(struct drm_fb_helper *helper, 78static int exynos_drm_fbdev_update(struct drm_fb_helper *helper,
79 struct drm_fb_helper_surface_size *sizes,
79 struct drm_framebuffer *fb) 80 struct drm_framebuffer *fb)
80{ 81{
81 struct fb_info *fbi = helper->fbdev; 82 struct fb_info *fbi = helper->fbdev;
@@ -85,7 +86,7 @@ static int exynos_drm_fbdev_update(struct drm_fb_helper *helper,
85 unsigned long offset; 86 unsigned long offset;
86 87
87 drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->depth); 88 drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->depth);
88 drm_fb_helper_fill_var(fbi, helper, fb->width, fb->height); 89 drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height);
89 90
90 /* RGB formats use only one buffer */ 91 /* RGB formats use only one buffer */
91 buffer = exynos_drm_fb_buffer(fb, 0); 92 buffer = exynos_drm_fb_buffer(fb, 0);
@@ -189,7 +190,7 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper,
189 goto err_destroy_framebuffer; 190 goto err_destroy_framebuffer;
190 } 191 }
191 192
192 ret = exynos_drm_fbdev_update(helper, helper->fb); 193 ret = exynos_drm_fbdev_update(helper, sizes, helper->fb);
193 if (ret < 0) 194 if (ret < 0)
194 goto err_dealloc_cmap; 195 goto err_dealloc_cmap;
195 196