diff options
author | Jerome Glisse <jglisse@redhat.com> | 2009-09-14 12:29:49 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-09-14 18:53:14 -0400 |
commit | 4aac047323e3082d0866b8ad3784236632105af4 (patch) | |
tree | af4c118e42b9ea55c961c4f5bbb02998dc2cc4fe /drivers/gpu/drm/radeon/r520.c | |
parent | 21f9a437222e92adb3abc68584a5f04801b92739 (diff) |
drm/radeon/kms: clear confusion in GART init/deinit path
GART static one time initialization was mixed up with GART
enabling/disabling which could happen several time for instance
during suspend/resume cycles. This patch splits all GART
handling into 4 differents function. gart_init is for one
time initialization, gart_deinit is called upon module unload
to free resources allocated by gart_init, gart_enable enable
the GART and is intented to be call after first initialization
and at each resume cycle or reset cycle. Finaly gart_disable
stop the GART and is intended to be call at suspend time or
when unloading the module.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r520.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r520.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c index 0e1686d1c873..d4b0b9d2e39b 100644 --- a/drivers/gpu/drm/radeon/r520.c +++ b/drivers/gpu/drm/radeon/r520.c | |||
@@ -31,8 +31,6 @@ | |||
31 | 31 | ||
32 | /* r520,rv530,rv560,rv570,r580 depends on : */ | 32 | /* r520,rv530,rv560,rv570,r580 depends on : */ |
33 | void r100_hdp_reset(struct radeon_device *rdev); | 33 | void r100_hdp_reset(struct radeon_device *rdev); |
34 | int rv370_pcie_gart_enable(struct radeon_device *rdev); | ||
35 | void rv370_pcie_gart_disable(struct radeon_device *rdev); | ||
36 | void r420_pipes_init(struct radeon_device *rdev); | 34 | void r420_pipes_init(struct radeon_device *rdev); |
37 | void rs600_mc_disable_clients(struct radeon_device *rdev); | 35 | void rs600_mc_disable_clients(struct radeon_device *rdev); |
38 | void rs600_disable_vga(struct radeon_device *rdev); | 36 | void rs600_disable_vga(struct radeon_device *rdev); |
@@ -118,9 +116,6 @@ int r520_mc_init(struct radeon_device *rdev) | |||
118 | 116 | ||
119 | void r520_mc_fini(struct radeon_device *rdev) | 117 | void r520_mc_fini(struct radeon_device *rdev) |
120 | { | 118 | { |
121 | rv370_pcie_gart_disable(rdev); | ||
122 | radeon_gart_table_vram_free(rdev); | ||
123 | radeon_gart_fini(rdev); | ||
124 | } | 119 | } |
125 | 120 | ||
126 | 121 | ||