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

Commit 392a250b authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Alex Deucher
Browse files

drm/radeon: cope with foreign fences inside the reservation object 



Not the whole world is a radeon! :-)

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a0e84764

drivers/gpu/drm/radeon/cik.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3993,7 +3993,7 @@ struct radeon_fence *cik_copy_cpdma(struct radeon_device *rdev, 
		return ERR_PTR(r);

		return ERR_PTR(r);

	}

	}





	radeon_semaphore_sync_resv(sem, resv, false);

	radeon_semaphore_sync_resv(rdev, sem, resv, false);

	radeon_semaphore_sync_rings(rdev, sem, ring->idx);

	radeon_semaphore_sync_rings(rdev, sem, ring->idx);





	for (i = 0; i < num_loops; i++) {

	for (i = 0; i < num_loops; i++) {

drivers/gpu/drm/radeon/cik_sdma.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -571,7 +571,7 @@ struct radeon_fence *cik_copy_dma(struct radeon_device *rdev, 
		return ERR_PTR(r);

		return ERR_PTR(r);

	}

	}





	radeon_semaphore_sync_resv(sem, resv, false);

	radeon_semaphore_sync_resv(rdev, sem, resv, false);

	radeon_semaphore_sync_rings(rdev, sem, ring->idx);

	radeon_semaphore_sync_rings(rdev, sem, ring->idx);





	for (i = 0; i < num_loops; i++) {

	for (i = 0; i < num_loops; i++) {

drivers/gpu/drm/radeon/evergreen_dma.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -133,7 +133,7 @@ struct radeon_fence *evergreen_copy_dma(struct radeon_device *rdev, 
		return ERR_PTR(r);

		return ERR_PTR(r);

	}

	}





	radeon_semaphore_sync_resv(sem, resv, false);

	radeon_semaphore_sync_resv(rdev, sem, resv, false);

	radeon_semaphore_sync_rings(rdev, sem, ring->idx);

	radeon_semaphore_sync_rings(rdev, sem, ring->idx);





	for (i = 0; i < num_loops; i++) {

	for (i = 0; i < num_loops; i++) {

drivers/gpu/drm/radeon/r600.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2912,7 +2912,7 @@ struct radeon_fence *r600_copy_cpdma(struct radeon_device *rdev, 
		return ERR_PTR(r);

		return ERR_PTR(r);

	}

	}





	radeon_semaphore_sync_resv(sem, resv, false);

	radeon_semaphore_sync_resv(rdev, sem, resv, false);

	radeon_semaphore_sync_rings(rdev, sem, ring->idx);

	radeon_semaphore_sync_rings(rdev, sem, ring->idx);





	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));

	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));

drivers/gpu/drm/radeon/r600_dma.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -470,7 +470,7 @@ struct radeon_fence *r600_copy_dma(struct radeon_device *rdev, 
		return ERR_PTR(r);

		return ERR_PTR(r);

	}

	}





	radeon_semaphore_sync_resv(sem, resv, false);

	radeon_semaphore_sync_resv(rdev, sem, resv, false);

	radeon_semaphore_sync_rings(rdev, sem, ring->idx);

	radeon_semaphore_sync_rings(rdev, sem, ring->idx);





	for (i = 0; i < num_loops; i++) {

	for (i = 0; i < num_loops; i++) {