diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-04-20 13:15:05 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-04-20 13:15:05 +1000 |
| commit | 0bcb1d844ac638a4c4280f697d5bfac9791e9a70 (patch) | |
| tree | c51aa8427a81cb64dded4d4f68bf1a1b8ad32041 /drivers/gpu/drm/radeon/rv770.c | |
| parent | c9c2625ff4fc4ce652e686f895059d2902c01ca0 (diff) | |
| parent | 90aca4d2740255bd130ea71a91530b9920c70abe (diff) | |
| download | blackbird-op-linux-0bcb1d844ac638a4c4280f697d5bfac9791e9a70.tar.gz blackbird-op-linux-0bcb1d844ac638a4c4280f697d5bfac9791e9a70.zip | |
Merge branch 'drm-radeon-lockup' into drm-core-next
* drm-radeon-lockup:
drm/radeon/kms: simplify & improve GPU reset V2
drm/radeon/kms: rename gpu_reset to asic_reset
drm/radeon/kms: fence cleanup + more reliable GPU lockup detection V4
Conflicts:
drivers/gpu/drm/radeon/r300.c
Diffstat (limited to 'drivers/gpu/drm/radeon/rv770.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rv770.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 97958a64df1a..72bc57a92388 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c @@ -917,12 +917,6 @@ int rv770_mc_init(struct radeon_device *rdev) return 0; } -int rv770_gpu_reset(struct radeon_device *rdev) -{ - /* FIXME: implement any rv770 specific bits */ - return r600_gpu_reset(rdev); -} - static int rv770_startup(struct radeon_device *rdev) { int r; |
