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

Commit b24c683a authored by Nicolai Hähnle's avatar Nicolai Hähnle Committed by Alex Deucher
Browse files

drm/radeon: only increment sync_seq when a fence is really emitted 



In the rare situation where the kmalloc fails we're probably screwed anyway,
but let's try to be more robust about it.

Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarNicolai Hähnle <Nicolai.Haehnle@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5fc45397

drivers/gpu/drm/radeon/radeon_fence.c

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ int radeon_fence_emit(struct radeon_device *rdev, 
		      struct radeon_fence **fence,

		      int ring)

{

	u64 seq = ++rdev->fence_drv[ring].sync_seq[ring];

	u64 seq;



	/* we are protected by the ring emission mutex */

	*fence = kmalloc(sizeof(struct radeon_fence), GFP_KERNEL);
@@ -138,7 +138,7 @@ int radeon_fence_emit(struct radeon_device *rdev, 
		return -ENOMEM;

	}

	(*fence)->rdev = rdev;

	(*fence)->seq = seq;

	(*fence)->seq = seq = ++rdev->fence_drv[ring].sync_seq[ring];

	(*fence)->ring = ring;

	(*fence)->is_vm_update = false;

	fence_init(&(*fence)->base, &radeon_fence_ops,