diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-12-02 06:16:24 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-02 06:16:24 +0300 |
| commit | c936a69981435b994a1ffe1e2a9ccf70aeb09a54 (patch) | |
| tree | b7f8cb08e01c21f730940ab78f67f3f5b0d23d1a /drivers/gpu/drm/rockchip/rockchip_drm_gem.c | |
| parent | d6d38d9d795edc0f31c6c2d4e6743e66564d6c20 (diff) | |
| parent | c9fbb7f7b5c56752373e4f425d5157815426e233 (diff) | |
| download | linux-c936a69981435b994a1ffe1e2a9ccf70aeb09a54.tar.xz | |
Merge branch 'drm-fixes-rockchip-2015-12-02' of https://github.com/markyzq/kernel-drm-rockchip into drm-fixes
Rockchip fixes from Mark.
* 'drm-fixes-rockchip-2015-12-02' of https://github.com/markyzq/kernel-drm-rockchip:
drm/rockchip: Use CRTC vblank event interface
drm/rockchip: Fix module autoload for OF platform driver
drm/rockchip: vop: fix window origin calculation
drm/rockchip: unset pgoff when mmap'ing gems
drm/rockchip: vop: Correct enabled clocks during setup
Diffstat (limited to 'drivers/gpu/drm/rockchip/rockchip_drm_gem.c')
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c index 8caea0a33dd8..d908321b94ce 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -67,6 +67,7 @@ static int rockchip_drm_gem_object_mmap(struct drm_gem_object *obj, * VM_PFNMAP flag that was set by drm_gem_mmap_obj()/drm_gem_mmap(). */ vma->vm_flags &= ~VM_PFNMAP; + vma->vm_pgoff = 0; ret = dma_mmap_attrs(drm->dev, vma, rk_obj->kvaddr, rk_obj->dma_addr, obj->size, &rk_obj->dma_attrs); |