Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 884c6dab authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm/<ttm-based-drivers>: Don't call drm_mmap 



Really, the legacy buffer api should be dead, especially for all these
newfangled drivers. I suspect this is copypasta from the transitioning
days, which probably originated in radeon.

Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Herrmann <dh.herrmann@gmail.com>
Cc: Rashika <rashika.kheria@gmail.com>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Fabian Frederick <fabf@skynet.be>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Alexandre Courbot <acourbot@nvidia.com>
Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Cc: Christian Engelmayer <cengelma@gmx.at>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Acked-by: default avatarBen Skeggs <bskeggs@redhat.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 9908fb65

drivers/gpu/drm/ast/ast_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ int ast_mmap(struct file *filp, struct vm_area_struct *vma) 
	struct ast_private *ast;



	if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))

		return drm_mmap(filp, vma);

		return -EINVAL;



	file_priv = filp->private_data;

	ast = file_priv->minor->dev->dev_private;

drivers/gpu/drm/bochs/bochs_mm.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ int bochs_mmap(struct file *filp, struct vm_area_struct *vma) 
	struct bochs_device *bochs;



	if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))

		return drm_mmap(filp, vma);

		return -EINVAL;



	file_priv = filp->private_data;

	bochs = file_priv->minor->dev->dev_private;

drivers/gpu/drm/cirrus/cirrus_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ int cirrus_mmap(struct file *filp, struct vm_area_struct *vma) 
	struct cirrus_device *cirrus;



	if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))

		return drm_mmap(filp, vma);

		return -EINVAL;



	file_priv = filp->private_data;

	cirrus = file_priv->minor->dev->dev_private;

drivers/gpu/drm/mgag200/mgag200_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ int mgag200_mmap(struct file *filp, struct vm_area_struct *vma) 
	struct mga_device *mdev;



	if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))

		return drm_mmap(filp, vma);

		return -EINVAL;



	file_priv = filp->private_data;

	mdev = file_priv->minor->dev->dev_private;

drivers/gpu/drm/nouveau/nouveau_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ nouveau_ttm_mmap(struct file *filp, struct vm_area_struct *vma) 
	struct nouveau_drm *drm = nouveau_drm(file_priv->minor->dev);



	if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))

		return drm_mmap(filp, vma);

		return -EINVAL;



	return ttm_bo_mmap(filp, vma, &drm->ttm.bdev);

}