* [PATCH] drm/radeon/kms: clean up gart dummy page handling
@ 2011-04-12 17:32 Alex Deucher
2011-04-12 17:41 ` Michel Dänzer
2011-04-12 20:38 ` Konrad Rzeszutek Wilk
0 siblings, 2 replies; 4+ messages in thread
From: Alex Deucher @ 2011-04-12 17:32 UTC (permalink / raw)
To: airlied, dri-devel; +Cc: Jerome Glisse, Konrad Rzeszutek Wilk
As per Konrad's original patch, the dummy page used
by the gart code and allocated in radeon_gart_init()
was not freed properly in radeon_gart_fini().
At the same time r6xx and newer allocated and freed the
dummy page on their own. So to do Konrad's patch one
better, just remove the allocation and freeing of the
dummy page in the r6xx, 7xx, evergreen, and ni code and
allocate and free in the gart_init/fini() functions for
all asics.
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
---
drivers/gpu/drm/radeon/evergreen.c | 4 ----
drivers/gpu/drm/radeon/r600.c | 4 ----
drivers/gpu/drm/radeon/radeon_gart.c | 2 ++
drivers/gpu/drm/radeon/rv770.c | 4 ----
4 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 0b0cc74..cff7144 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -3036,9 +3036,6 @@ int evergreen_init(struct radeon_device *rdev)
{
int r;
- r = radeon_dummy_page_init(rdev);
- if (r)
- return r;
/* This don't do much */
r = radeon_gem_init(rdev);
if (r)
@@ -3150,7 +3147,6 @@ void evergreen_fini(struct radeon_device *rdev)
radeon_atombios_fini(rdev);
kfree(rdev->bios);
rdev->bios = NULL;
- radeon_dummy_page_fini(rdev);
}
static void evergreen_pcie_gen2_enable(struct radeon_device *rdev)
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index be271c4..304fc76 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2509,9 +2509,6 @@ int r600_init(struct radeon_device *rdev)
{
int r;
- r = radeon_dummy_page_init(rdev);
- if (r)
- return r;
if (r600_debugfs_mc_info_init(rdev)) {
DRM_ERROR("Failed to register debugfs file for mc !\n");
}
@@ -2625,7 +2622,6 @@ void r600_fini(struct radeon_device *rdev)
radeon_atombios_fini(rdev);
kfree(rdev->bios);
rdev->bios = NULL;
- radeon_dummy_page_fini(rdev);
}
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
index f0534ef..8a955bb 100644
--- a/drivers/gpu/drm/radeon/radeon_gart.c
+++ b/drivers/gpu/drm/radeon/radeon_gart.c
@@ -285,4 +285,6 @@ void radeon_gart_fini(struct radeon_device *rdev)
rdev->gart.pages = NULL;
rdev->gart.pages_addr = NULL;
rdev->gart.ttm_alloced = NULL;
+
+ radeon_dummy_page_fini(rdev);
}
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index b974ac7..4faa2e5 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -1255,9 +1255,6 @@ int rv770_init(struct radeon_device *rdev)
{
int r;
- r = radeon_dummy_page_init(rdev);
- if (r)
- return r;
/* This don't do much */
r = radeon_gem_init(rdev);
if (r)
@@ -1372,7 +1369,6 @@ void rv770_fini(struct radeon_device *rdev)
radeon_atombios_fini(rdev);
kfree(rdev->bios);
rdev->bios = NULL;
- radeon_dummy_page_fini(rdev);
}
static void rv770_pcie_gen2_enable(struct radeon_device *rdev)
--
1.7.1.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/radeon/kms: clean up gart dummy page handling
2011-04-12 17:32 [PATCH] drm/radeon/kms: clean up gart dummy page handling Alex Deucher
@ 2011-04-12 17:41 ` Michel Dänzer
2011-04-12 20:38 ` Konrad Rzeszutek Wilk
1 sibling, 0 replies; 4+ messages in thread
From: Michel Dänzer @ 2011-04-12 17:41 UTC (permalink / raw)
To: Alex Deucher; +Cc: dri-devel
On Die, 2011-04-12 at 13:32 -0400, Alex Deucher wrote:
> As per Konrad's original patch, the dummy page used
> by the gart code and allocated in radeon_gart_init()
> was not freed properly in radeon_gart_fini().
>
> At the same time r6xx and newer allocated and freed the
> dummy page on their own. So to do Konrad's patch one
> better, just remove the allocation and freeing of the
> dummy page in the r6xx, 7xx, evergreen, and ni code and
> allocate and free in the gart_init/fini() functions for
> all asics.
>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Cc: Jerome Glisse <jglisse@redhat.com>
> Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
--
Earthling Michel Dänzer | http://www.vmware.com
Libre software enthusiast | Debian, X and DRI developer
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/radeon/kms: clean up gart dummy page handling
2011-04-12 17:32 [PATCH] drm/radeon/kms: clean up gart dummy page handling Alex Deucher
2011-04-12 17:41 ` Michel Dänzer
@ 2011-04-12 20:38 ` Konrad Rzeszutek Wilk
1 sibling, 0 replies; 4+ messages in thread
From: Konrad Rzeszutek Wilk @ 2011-04-12 20:38 UTC (permalink / raw)
To: Alex Deucher; +Cc: Jerome Glisse, dri-devel
On Tue, Apr 12, 2011 at 01:32:13PM -0400, Alex Deucher wrote:
> As per Konrad's original patch, the dummy page used
> by the gart code and allocated in radeon_gart_init()
> was not freed properly in radeon_gart_fini().
>
> At the same time r6xx and newer allocated and freed the
> dummy page on their own. So to do Konrad's patch one
> better, just remove the allocation and freeing of the
> dummy page in the r6xx, 7xx, evergreen, and ni code and
> allocate and free in the gart_init/fini() functions for
> all asics.
>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
You can convert that to Acked-by. Been running with this patch
for a couple of weeks (months?) with no ill effects.
> Cc: Jerome Glisse <jglisse@redhat.com>
> Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
> ---
> drivers/gpu/drm/radeon/evergreen.c | 4 ----
> drivers/gpu/drm/radeon/r600.c | 4 ----
> drivers/gpu/drm/radeon/radeon_gart.c | 2 ++
> drivers/gpu/drm/radeon/rv770.c | 4 ----
> 4 files changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
> index 0b0cc74..cff7144 100644
> --- a/drivers/gpu/drm/radeon/evergreen.c
> +++ b/drivers/gpu/drm/radeon/evergreen.c
> @@ -3036,9 +3036,6 @@ int evergreen_init(struct radeon_device *rdev)
> {
> int r;
>
> - r = radeon_dummy_page_init(rdev);
> - if (r)
> - return r;
> /* This don't do much */
> r = radeon_gem_init(rdev);
> if (r)
> @@ -3150,7 +3147,6 @@ void evergreen_fini(struct radeon_device *rdev)
> radeon_atombios_fini(rdev);
> kfree(rdev->bios);
> rdev->bios = NULL;
> - radeon_dummy_page_fini(rdev);
> }
>
> static void evergreen_pcie_gen2_enable(struct radeon_device *rdev)
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index be271c4..304fc76 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -2509,9 +2509,6 @@ int r600_init(struct radeon_device *rdev)
> {
> int r;
>
> - r = radeon_dummy_page_init(rdev);
> - if (r)
> - return r;
> if (r600_debugfs_mc_info_init(rdev)) {
> DRM_ERROR("Failed to register debugfs file for mc !\n");
> }
> @@ -2625,7 +2622,6 @@ void r600_fini(struct radeon_device *rdev)
> radeon_atombios_fini(rdev);
> kfree(rdev->bios);
> rdev->bios = NULL;
> - radeon_dummy_page_fini(rdev);
> }
>
>
> diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
> index f0534ef..8a955bb 100644
> --- a/drivers/gpu/drm/radeon/radeon_gart.c
> +++ b/drivers/gpu/drm/radeon/radeon_gart.c
> @@ -285,4 +285,6 @@ void radeon_gart_fini(struct radeon_device *rdev)
> rdev->gart.pages = NULL;
> rdev->gart.pages_addr = NULL;
> rdev->gart.ttm_alloced = NULL;
> +
> + radeon_dummy_page_fini(rdev);
> }
> diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
> index b974ac7..4faa2e5 100644
> --- a/drivers/gpu/drm/radeon/rv770.c
> +++ b/drivers/gpu/drm/radeon/rv770.c
> @@ -1255,9 +1255,6 @@ int rv770_init(struct radeon_device *rdev)
> {
> int r;
>
> - r = radeon_dummy_page_init(rdev);
> - if (r)
> - return r;
> /* This don't do much */
> r = radeon_gem_init(rdev);
> if (r)
> @@ -1372,7 +1369,6 @@ void rv770_fini(struct radeon_device *rdev)
> radeon_atombios_fini(rdev);
> kfree(rdev->bios);
> rdev->bios = NULL;
> - radeon_dummy_page_fini(rdev);
> }
>
> static void rv770_pcie_gen2_enable(struct radeon_device *rdev)
> --
> 1.7.1.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] drm/radeon/kms: clean up gart dummy page handling
@ 2011-02-28 7:37 Alex Deucher
0 siblings, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2011-02-28 7:37 UTC (permalink / raw)
To: airlied, dri-devel; +Cc: Jerome Glisse, Konrad Rzeszutek Wilk
As per Konrad's original patch, the dummy page used
by the gart code and allocated in radeon_gart_init()
was not freed properly in radeon_gart_fini().
At the same time r6xx and newer allocated and freed the
dummy page on their own. So to do Konrad's patch one
better, just remove the allocation and freeing of the
dummy page in the r6xx, 7xx, evergreen, and ni code and
allocate and free in the gart_init/fini() functions for
all asics.
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
---
drivers/gpu/drm/radeon/evergreen.c | 4 ----
drivers/gpu/drm/radeon/r600.c | 4 ----
drivers/gpu/drm/radeon/radeon_gart.c | 2 ++
drivers/gpu/drm/radeon/rv770.c | 4 ----
4 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 789441e..9ecb2b6 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -3048,9 +3048,6 @@ int evergreen_init(struct radeon_device *rdev)
{
int r;
- r = radeon_dummy_page_init(rdev);
- if (r)
- return r;
/* This don't do much */
r = radeon_gem_init(rdev);
if (r)
@@ -3162,7 +3159,6 @@ void evergreen_fini(struct radeon_device *rdev)
radeon_atombios_fini(rdev);
kfree(rdev->bios);
rdev->bios = NULL;
- radeon_dummy_page_fini(rdev);
}
static void evergreen_pcie_gen2_enable(struct radeon_device *rdev)
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 1252198..88eaffc 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2510,9 +2510,6 @@ int r600_init(struct radeon_device *rdev)
{
int r;
- r = radeon_dummy_page_init(rdev);
- if (r)
- return r;
if (r600_debugfs_mc_info_init(rdev)) {
DRM_ERROR("Failed to register debugfs file for mc !\n");
}
@@ -2626,7 +2623,6 @@ void r600_fini(struct radeon_device *rdev)
radeon_atombios_fini(rdev);
kfree(rdev->bios);
rdev->bios = NULL;
- radeon_dummy_page_fini(rdev);
}
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
index 6501611..dc04c7b 100644
--- a/drivers/gpu/drm/radeon/radeon_gart.c
+++ b/drivers/gpu/drm/radeon/radeon_gart.c
@@ -269,4 +269,6 @@ void radeon_gart_fini(struct radeon_device *rdev)
kfree(rdev->gart.pages_addr);
rdev->gart.pages = NULL;
rdev->gart.pages_addr = NULL;
+
+ radeon_dummy_page_fini(rdev);
}
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index d8ba676..6a312e6 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -1256,9 +1256,6 @@ int rv770_init(struct radeon_device *rdev)
{
int r;
- r = radeon_dummy_page_init(rdev);
- if (r)
- return r;
/* This don't do much */
r = radeon_gem_init(rdev);
if (r)
@@ -1373,7 +1370,6 @@ void rv770_fini(struct radeon_device *rdev)
radeon_atombios_fini(rdev);
kfree(rdev->bios);
rdev->bios = NULL;
- radeon_dummy_page_fini(rdev);
}
static void rv770_pcie_gen2_enable(struct radeon_device *rdev)
--
1.7.1.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-04-12 20:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-12 17:32 [PATCH] drm/radeon/kms: clean up gart dummy page handling Alex Deucher
2011-04-12 17:41 ` Michel Dänzer
2011-04-12 20:38 ` Konrad Rzeszutek Wilk
-- strict thread matches above, loose matches on Subject: below --
2011-02-28 7:37 Alex Deucher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.