diff options
| author | Christian König <deathsimple@vodafone.de> | 2012-05-02 15:11:10 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-03 10:16:03 +0200 |
| commit | 25a9e35218c66e7a3a5344cfe94a31a3c10ff810 (patch) | |
| tree | 29ac00c6d3517d26eccc73705c2dfdb9d52feb52 /drivers/gpu/drm/radeon/r300.c | |
| parent | drm/radeon: make radeon_gpu_is_lockup a per ring function (diff) | |
| download | linux-25a9e35218c66e7a3a5344cfe94a31a3c10ff810.tar.xz linux-25a9e35218c66e7a3a5344cfe94a31a3c10ff810.zip | |
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/r300.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r300.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index fa14383f9ca0..a63f4324f0da 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c @@ -449,7 +449,6 @@ int r300_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"); |