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

Commit 37c5a525 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Dave Airlie
Browse files

drm/cirrus: inline reservations 



Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 4094dc2a

drivers/gpu/drm/cirrus/cirrus_drv.h

+19 −2
Original line number Diff line number Diff line
@@ -240,8 +240,25 @@ void cirrus_ttm_placement(struct cirrus_bo *bo, int domain); 
int cirrus_bo_create(struct drm_device *dev, int size, int align,

		     uint32_t flags, struct cirrus_bo **pcirrusbo);

int cirrus_mmap(struct file *filp, struct vm_area_struct *vma);

int cirrus_bo_reserve(struct cirrus_bo *bo, bool no_wait);

void cirrus_bo_unreserve(struct cirrus_bo *bo);



static inline int cirrus_bo_reserve(struct cirrus_bo *bo, bool no_wait)

{

	int ret;



	ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, 0);

	if (ret) {

		if (ret != -ERESTARTSYS && ret != -EBUSY)

			DRM_ERROR("reserve failed %p\n", bo);

		return ret;

	}

	return 0;

}



static inline void cirrus_bo_unreserve(struct cirrus_bo *bo)

{

	ttm_bo_unreserve(&bo->bo);

}



int cirrus_bo_push_sysram(struct cirrus_bo *bo);

int cirrus_bo_pin(struct cirrus_bo *bo, u32 pl_flag, u64 *gpu_addr);

#endif				/* __CIRRUS_DRV_H__ */

drivers/gpu/drm/cirrus/cirrus_ttm.c

+0 −18
Original line number Diff line number Diff line
@@ -308,24 +308,6 @@ void cirrus_ttm_placement(struct cirrus_bo *bo, int domain) 
	bo->placement.num_busy_placement = c;

}



int cirrus_bo_reserve(struct cirrus_bo *bo, bool no_wait)

{

	int ret;



	ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, 0);

	if (ret) {

		if (ret != -ERESTARTSYS && ret != -EBUSY)

			DRM_ERROR("reserve failed %p\n", bo);

		return ret;

	}

	return 0;

}



void cirrus_bo_unreserve(struct cirrus_bo *bo)

{

	ttm_bo_unreserve(&bo->bo);

}



int cirrus_bo_create(struct drm_device *dev, int size, int align,

		  uint32_t flags, struct cirrus_bo **pcirrusbo)

{