diff options
| author |   Christian König <christian.koenig@amd.com> | 2013-10-29 20:14:47 +0100 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2013-11-01 15:25:51 -0400 |
| commit | f9eaf9ae782d6480f179850e27e6f4911ac10227 (patch) | |
| tree | fc35df46d3ee3b859bf7c2823719fdde6619abf1 /drivers/gpu/drm/radeon/radeon.h | |
| parent | drm/radeon: don't use PACKET2 on CIK (diff) | |
| download | linux-dev-f9eaf9ae782d6480f179850e27e6f4911ac10227.tar.xz linux-dev-f9eaf9ae782d6480f179850e27e6f4911ac10227.zip | |
drm/radeon: rework and fix reset detection v2
Stop fiddling with jiffies, always wait for RADEON_FENCE_JIFFIES_TIMEOUT.
Consolidate the two wait sequence implementations into just one function.
Activate all waiters and remember if the reset was already done instead of
trying to reset from only one thread.
v2: clear reset flag earlier to avoid timeout in IB test
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index ad54525cfa79..14531e155b35 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -328,7 +328,6 @@ struct radeon_fence_driver { /* sync_seq is protected by ring emission lock */ uint64_t sync_seq[RADEON_NUM_RINGS]; atomic64_t last_seq; - unsigned long last_activity; bool initialized; }; @@ -2171,6 +2170,7 @@ struct radeon_device { bool need_dma32; bool accel_working; bool fastfb_working; /* IGP feature*/ + bool needs_reset; struct radeon_surface_reg surface_regs[RADEON_GEM_MAX_SURFACES]; const struct firmware *me_fw; /* all family ME firmware */ const struct firmware *pfp_fw; /* r6/700 PFP firmware */ |