This is a note to let you know that I've just added the patch titled
drm/radeon: don't leave fence blocked process on failed GPU reset
to the 3.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-radeon-don-t-leave-fence-blocked-process-on-failed-gpu-reset.patch
and it can be found in the queue-3.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 76903b96adbfbb38b049765add21e02e44c387a5 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <[email protected]>
Date: Mon, 17 Dec 2012 10:29:06 -0500
Subject: drm/radeon: don't leave fence blocked process on failed GPU reset
From: Jerome Glisse <[email protected]>
commit 76903b96adbfbb38b049765add21e02e44c387a5 upstream.
Force all fence to signal if GPU reset failed so no process get stuck
on waiting fence.
Signed-off-by: Jerome Glisse <[email protected]>
Reviewed-by: Christian König <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/radeon/radeon.h | 1 +
drivers/gpu/drm/radeon/radeon_device.c | 1 +
drivers/gpu/drm/radeon/radeon_fence.c | 19 +++++++++++++++++++
3 files changed, 21 insertions(+)
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -220,6 +220,7 @@ struct radeon_fence {
int radeon_fence_driver_start_ring(struct radeon_device *rdev, int ring);
int radeon_fence_driver_init(struct radeon_device *rdev);
void radeon_fence_driver_fini(struct radeon_device *rdev);
+void radeon_fence_driver_force_completion(struct radeon_device *rdev);
int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence **fence,
int ring);
void radeon_fence_process(struct radeon_device *rdev, int ring);
bool radeon_fence_signaled(struct radeon_fence *fence);
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1356,6 +1356,7 @@ retry:
}
}
} else {
+ radeon_fence_driver_force_completion(rdev);
for (i = 0; i < RADEON_NUM_RINGS; ++i) {
kfree(ring_data[i]);
}
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -868,6 +868,25 @@ void radeon_fence_driver_fini(struct rad
mutex_unlock(&rdev->ring_lock);
}
+/**
+ * radeon_fence_driver_force_completion - force all fence waiter to complete
+ *
+ * @rdev: radeon device pointer
+ *
+ * In case of GPU reset failure make sure no process keep waiting on fence
+ * that will never complete.
+ */
+void radeon_fence_driver_force_completion(struct radeon_device *rdev)
+{
+ int ring;
+
+ for (ring = 0; ring < RADEON_NUM_RINGS; ring++) {
+ if (!rdev->fence_drv[ring].initialized)
+ continue;
+ radeon_fence_write(rdev, rdev->fence_drv[ring].sync_seq[ring],
ring);
+ }
+}
+
/*
* Fence debugfs
Patches currently in stable-queue which might be from [email protected] are
queue-3.7/drm-radeon-avoid-deadlock-in-pm-path-when-waiting-for-fence.patch
queue-3.7/drm-radeon-restore-modeset-late-in-gpu-reset-path.patch
queue-3.7/drm-radeon-fix-amd-afusion-gpu-setup-aka-sumo-v2.patch
queue-3.7/drm-radeon-add-wait_until-to-evergreen-vm-safe-reg-list.patch
queue-3.7/drm-radeon-fix-edp-clk-and-lane-setup-for-scaled-modes.patch
queue-3.7/drm-radeon-don-t-leave-fence-blocked-process-on-failed-gpu-reset.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
