Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
omapdrm
/
omap_gem_dmabuf.c
diff --git
a/kernel/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
b/kernel/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
index
344fd78
..
27c2976
100644
(file)
--- a/
kernel/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
+++ b/
kernel/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
@@
-17,10
+17,10
@@
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "omap_drv.h"
-
#include <linux/dma-buf.h>
#include <linux/dma-buf.h>
+#include "omap_drv.h"
+
static struct sg_table *omap_gem_map_dma_buf(
struct dma_buf_attachment *attachment,
enum dma_data_direction dir)
static struct sg_table *omap_gem_map_dma_buf(
struct dma_buf_attachment *attachment,
enum dma_data_direction dir)
@@
-140,15
+140,12
@@
static int omap_gem_dmabuf_mmap(struct dma_buf *buffer,
struct vm_area_struct *vma)
{
struct drm_gem_object *obj = buffer->priv;
struct vm_area_struct *vma)
{
struct drm_gem_object *obj = buffer->priv;
- struct drm_device *dev = obj->dev;
int ret = 0;
if (WARN_ON(!obj->filp))
return -EINVAL;
int ret = 0;
if (WARN_ON(!obj->filp))
return -EINVAL;
- mutex_lock(&dev->struct_mutex);
ret = drm_gem_mmap_obj(obj, omap_gem_mmap_size(obj), vma);
ret = drm_gem_mmap_obj(obj, omap_gem_mmap_size(obj), vma);
- mutex_unlock(&dev->struct_mutex);
if (ret < 0)
return ret;
if (ret < 0)
return ret;