Skip to content

Commit

Permalink
gpu: drm: radeon: Adding new typedef vm_fault_t
Browse files Browse the repository at this point in the history
Use new return type vm_fault_t for fault handler
in vm_operations_struct.

Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Reviewed-by: Matthew Wilcox <mawilcox@microsoft.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Souptick Joarder authored and Alex Deucher committed Jun 19, 2018
1 parent 85ee15d commit 2bfb0b6
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/gpu/drm/radeon/radeon_ttm.c
Original file line number Diff line number Diff line change
Expand Up @@ -947,21 +947,21 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
static struct vm_operations_struct radeon_ttm_vm_ops;
static const struct vm_operations_struct *ttm_vm_ops = NULL;

static int radeon_ttm_fault(struct vm_fault *vmf)
static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
{
struct ttm_buffer_object *bo;
struct radeon_device *rdev;
int r;
vm_fault_t ret;

bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data;
if (bo == NULL) {
return VM_FAULT_NOPAGE;
}
rdev = radeon_get_rdev(bo->bdev);
down_read(&rdev->pm.mclk_lock);
r = ttm_vm_ops->fault(vmf);
ret = ttm_vm_ops->fault(vmf);
up_read(&rdev->pm.mclk_lock);
return r;
return ret;
}

int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
Expand Down

0 comments on commit 2bfb0b6

Please sign in to comment.