diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-11-07 09:19:23 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-11-07 09:19:23 +1000 |
| commit | dc345c46774bc150ab852d2c74ee6542de438d46 (patch) | |
| tree | caf3e15fd648b4c3ead39641a67e911d9be959c1 /drivers/gpu/drm/omapdrm/omap_gem.c | |
| parent | fb422950c6cd726fd36eb72a7cf84583440a18a2 (diff) | |
| parent | d7b56e6f4e34b6d182b3c4e03c1bd88a3acfb210 (diff) | |
| download | linux-dc345c46774bc150ab852d2c74ee6542de438d46.tar.bz2 | |
Merge tag 'omapdrm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next
omapdrm changes for v4.10
The main change here is the big refactoring to remove omapdrm's own
'omap_video_timings', and use the standard display timings.
Besides that, a few minor fixes and cleanups.
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_gem.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index 505dee0db973..d4e1e11466f8 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -336,8 +336,10 @@ static void omap_gem_detach_pages(struct drm_gem_object *obj) if (omap_obj->flags & (OMAP_BO_WC|OMAP_BO_UNCACHED)) { int i, npages = obj->size >> PAGE_SHIFT; for (i = 0; i < npages; i++) { - dma_unmap_page(obj->dev->dev, omap_obj->addrs[i], - PAGE_SIZE, DMA_BIDIRECTIONAL); + if (omap_obj->addrs[i]) + dma_unmap_page(obj->dev->dev, + omap_obj->addrs[i], + PAGE_SIZE, DMA_BIDIRECTIONAL); } } |