diff options
| author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-05-07 17:01:08 -0700 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-08 09:02:09 +0200 |
| commit | b0225d5a4857282af7e81a80e1c35e14c87bfb0f (patch) | |
| tree | 5f1cd8c9925ef08fbb6259548837d867010791b3 /patches/collateral-evolutions/drm | |
| parent | 68ee70bbfaf818704e79790912d2f062a83b0651 (diff) | |
backports: refresh patches for next-20130405
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/collateral-evolutions/drm')
| -rw-r--r-- | patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_drm_bufs.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_drm_bufs.patch b/patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_drm_bufs.patch index af4681c3..ba7b019b 100644 --- a/patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_drm_bufs.patch +++ b/patches/collateral-evolutions/drm/02-revert-vm_mmap/drivers_gpu_drm_drm_bufs.patch @@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c -@@ -1541,6 +1541,20 @@ +@@ -1541,6 +1541,20 @@ int drm_mapbufs(struct drm_device *dev, retcode = -EINVAL; goto done; } @@ -21,7 +21,7 @@ virtual = vm_mmap(file_priv->filp, 0, map->size, PROT_READ | PROT_WRITE, MAP_SHARED, -@@ -1549,6 +1563,7 @@ +@@ -1549,6 +1563,7 @@ int drm_mapbufs(struct drm_device *dev, virtual = vm_mmap(file_priv->filp, 0, dma->byte_count, PROT_READ | PROT_WRITE, MAP_SHARED, 0); |