diff options
author | Michel Dänzer <daenzer@vmware.com> | 2009-09-17 03:42:28 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-09-18 02:04:10 -0400 |
commit | 5e6dde7ec2e72f49ff749204efc03a59478d7d34 (patch) | |
tree | 9eaa09a484cb09c598a32f16f00765b4f9c65c47 /drivers/gpu/drm/radeon/r600.c | |
parent | 445282db9e815e7f5e82761c3c971dc9ea988d85 (diff) |
drm/radeon/kms: Move radeon_get_clock_info() call out of radeon_clocks_init().
Someone on IRC reported problems after commit
95a8f1bf4f48b434c9f839ab5a0773f66b39d7c6 ('drm/radeon/kms: Move
radeon_clocks_init() call back after getting VRAM info.'). And indeed, at least
some ASIC vram_info hooks use the clock info obtained by
radeon_get_clock_info(). So, move that call out of radeon_clocks_init(), ahead
of the radeon_vram_info() call.
[airlied - fixup missing r600/rv770 calls]
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drm/radeon/kms: fix get clock info calls for r600/rv770 init path.
These were missed when it got split out.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index af430d719e7f..1e1cab5ef1e4 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
@@ -1537,6 +1537,7 @@ int r600_init(struct radeon_device *rdev) | |||
1537 | r600_scratch_init(rdev); | 1537 | r600_scratch_init(rdev); |
1538 | /* Initialize surface registers */ | 1538 | /* Initialize surface registers */ |
1539 | radeon_surface_init(rdev); | 1539 | radeon_surface_init(rdev); |
1540 | radeon_get_clock_info(rdev->ddev); | ||
1540 | r = radeon_clocks_init(rdev); | 1541 | r = radeon_clocks_init(rdev); |
1541 | if (r) | 1542 | if (r) |
1542 | return r; | 1543 | return r; |