summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/rs600.c
diff options
context:
space:
mode:
authorChristian König <deathsimple@vodafone.de>2012-05-02 15:11:10 +0200
committerDave Airlie <airlied@redhat.com>2012-05-03 09:16:03 +0100
commit25a9e35218c66e7a3a5344cfe94a31a3c10ff810 (patch)
tree29ac00c6d3517d26eccc73705c2dfdb9d52feb52 /drivers/gpu/drm/radeon/rs600.c
parent312c4a8cf29af451ad0b58a5760150e496b7ffb8 (diff)
downloadop-kernel-dev-25a9e35218c66e7a3a5344cfe94a31a3c10ff810.zip
op-kernel-dev-25a9e35218c66e7a3a5344cfe94a31a3c10ff810.tar.gz
drm/radeon: replace gpu_lockup with ring->ready flag
It makes no sense at all to have more than one flag. Signed-off-by: Christian König <deathsimple@vodafone.de> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/rs600.c')
-rw-r--r--drivers/gpu/drm/radeon/rs600.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 10706c6..7fb3b1f 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -396,7 +396,6 @@ int rs600_asic_reset(struct radeon_device *rdev)
/* Check if GPU is idle */
if (G_000E40_GA_BUSY(status) || G_000E40_VAP_BUSY(status)) {
dev_err(rdev->dev, "failed to reset GPU\n");
- rdev->gpu_lockup = true;
ret = -1;
} else
dev_info(rdev->dev, "GPU reset succeed\n");
OpenPOWER on IntegriCloud