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

Commit 2bfb0b67 authored by Souptick Joarder's avatar Souptick Joarder Committed by Alex Deucher
Browse files

gpu: drm: radeon: Adding new typedef vm_fault_t 



Use new return type vm_fault_t for fault handler
in vm_operations_struct.

Signed-off-by: default avatarSouptick Joarder <jrdr.linux@gmail.com>
Reviewed-by: default avatarMatthew Wilcox <mawilcox@microsoft.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 85ee15d6

drivers/gpu/drm/radeon/radeon_ttm.c

+4 −4
Original line number Diff line number Diff line
@@ -947,11 +947,11 @@ 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) {
@@ -959,9 +959,9 @@ static int radeon_ttm_fault(struct vm_fault *vmf) 
	}

	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)