summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-03-19 14:05:53 +1000
committerDave Airlie <airlied@redhat.com>2015-03-19 14:05:53 +1000
commit6b94aea01d4f96235e947892f6c39f837045e741 (patch)
treef0597c10cae2e1102fad291336bc818214e98942 /drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
parentd79dc0a9baef6ba909ac9e8da095524046523d6a (diff)
parent1067219b27e29e925e7bdbb85b72c4c2bec0267e (diff)
Merge branch 'drm_next' of https://github.com/markyzq/kernel-drm-rockchip into drm-next
rockchip fixes. * 'drm_next' of https://github.com/markyzq/kernel-drm-rockchip: drm/rockchip: vop: power off until vop standby take effect drm/rockchip: vop: set vop enabled after enable iommu drm/rockchip: vop use is_enabled instead of dpms mode drm/rockchip: vop: fix vop vsync/hsync polarity drm/rockchip: Only alloc a kmap for fbdev gem object
Diffstat (limited to 'drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c')
-rw-r--r--drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
index ff04877e837c..d5c1248916b2 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
@@ -71,7 +71,7 @@ static int rockchip_drm_fbdev_create(struct drm_fb_helper *helper,
size = mode_cmd.pitches[0] * mode_cmd.height;
- rk_obj = rockchip_gem_create_object(dev, size);
+ rk_obj = rockchip_gem_create_object(dev, size, true);
if (IS_ERR(rk_obj))
return -ENOMEM;