From 9ff014075a83fce8e655217cc0f0c4a54c6f3634 Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Mon, 2 Jul 2018 14:51:35 +0800 Subject: [PATCH] drm/rockchip: fb: add support fb demo test and add two framebuffer Change-Id: I2e2e9b4d909861ed60016fe900cb0a739046c7d7 Signed-off-by: Sandy Huang --- drivers/gpu/drm/drm_fb_helper.c | 4 ++-- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 7cab34d..3b831e5 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1300,8 +1300,8 @@ int drm_fb_helper_pan_display(struct fb_var_screeninfo *var, drm_modeset_lock_all(dev); if (!drm_fb_helper_is_bound(fb_helper)) { - drm_modeset_unlock_all(dev); - return -EBUSY; + //drm_modeset_unlock_all(dev); + //return -EBUSY; } if (fb_helper->atomic) { diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c index 5bd8444..edd02cf 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c @@ -81,7 +81,7 @@ static int rockchip_drm_fbdev_create(struct drm_fb_helper *helper, bytes_per_pixel = DIV_ROUND_UP(sizes->surface_bpp, 8); mode_cmd.width = sizes->surface_width; - mode_cmd.height = sizes->surface_height; + mode_cmd.height = sizes->surface_height * 2; mode_cmd.pitches[0] = sizes->surface_width * bytes_per_pixel; mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp, sizes->surface_depth); -- 2.7.4