Attachment 44426 Details for Bug 35254 – attempt 3 to fix VRAM size and hopefully this bug.

[patch] attempt 3 to fix VRAM size and hopefully this bug.

0001-drm-radeon-fix-problem-with-changing-active-VRAM-siz.patch (text/plain), 9.84 KB, created by Dave Airlie on 2011-03-13 17:03:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Airlie

Created: 2011-03-13 17:03:31 UTC

Size: 9.84 KB

patch

obsolete

>From ce3c84df624fad5da9257391f18cbf16f81e689b Mon Sep 17 00:00:00 2001
>From: Dave Airlie <airlied@redhat.com>
>Date: Mon, 14 Mar 2011 09:47:24 +1000
>Subject: [PATCH] drm/radeon: fix problem with changing active VRAM size.
>
>So we used to use lpfn directly to restrict VRAM when we couldn't
>access the unmappable area, however this was removed in
>93225b0d7bc030f4a93165347a65893685822d70 as it also restricted
>the gtt placements. However it was only later noticed that this
>broke on some hw.
>
>This removes the active_vram_size, and just explicitly sets it
>when it changes, TTM/drm_mm will always use the real_vram_size,
>and the active vram size will change the TTM size used for lpfn
>setting.
>
>We should re-work the fpfn/lpfn to per-placement at some point
>I suspect, but that is too late for this kernel.
>
>Hopefully this addresses:
>https://bugs.freedesktop.org/show_bug.cgi?id=35254
>
>Signed-off-by: Dave Airlie <airlied@redhat.com>
>---
> drivers/gpu/drm/radeon/evergreen.c          |    3 +--
> drivers/gpu/drm/radeon/evergreen_blit_kms.c |    4 ++--
> drivers/gpu/drm/radeon/r100.c               |    5 ++---
> drivers/gpu/drm/radeon/r600.c               |    3 +--
> drivers/gpu/drm/radeon/r600_blit_kms.c      |    4 ++--
> drivers/gpu/drm/radeon/radeon.h             |    2 +-
> drivers/gpu/drm/radeon/radeon_ttm.c         |   14 ++++++++++++++
> drivers/gpu/drm/radeon/rs600.c              |    1 -
> drivers/gpu/drm/radeon/rs690.c              |    1 -
> drivers/gpu/drm/radeon/rv770.c              |    3 +--
> 10 files changed, 24 insertions(+), 16 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
>index d270b3f..6140ea1 100644
>--- a/drivers/gpu/drm/radeon/evergreen.c
>+++ b/drivers/gpu/drm/radeon/evergreen.c
>@@ -2194,7 +2194,6 @@ int evergreen_mc_init(struct radeon_device *rdev)
> 		rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024;
> 	}
> 	rdev->mc.visible_vram_size = rdev->mc.aper_size;
>-	rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
> 	r700_vram_gtt_location(rdev, &rdev->mc);
> 	radeon_update_bandwidth_info(rdev);
> 
>@@ -2934,7 +2933,7 @@ static int evergreen_startup(struct radeon_device *rdev)
> 	/* XXX: ontario has problems blitting to gart at the moment */
> 	if (rdev->family == CHIP_PALM) {
> 		rdev->asic->copy = NULL;
>-		rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
>+		radeon_ttm_set_active_vram_size(rdev, rdev->mc.visible_vram_size);
> 	}
> 
> 	/* allocate wb buffer */
>diff --git a/drivers/gpu/drm/radeon/evergreen_blit_kms.c b/drivers/gpu/drm/radeon/evergreen_blit_kms.c
>index 2adfb03..2be698e 100644
>--- a/drivers/gpu/drm/radeon/evergreen_blit_kms.c
>+++ b/drivers/gpu/drm/radeon/evergreen_blit_kms.c
>@@ -623,7 +623,7 @@ done:
> 		dev_err(rdev->dev, "(%d) pin blit object failed\n", r);
> 		return r;
> 	}
>-	rdev->mc.active_vram_size = rdev->mc.real_vram_size;
>+	radeon_ttm_set_active_vram_size(rdev, rdev->mc.real_vram_size);
> 	return 0;
> }
> 
>@@ -631,7 +631,7 @@ void evergreen_blit_fini(struct radeon_device *rdev)
> {
> 	int r;
> 
>-	rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
>+	radeon_ttm_set_active_vram_size(rdev, rdev->mc.visible_vram_size);
> 	if (rdev->r600_blit.shader_obj == NULL)
> 		return;
> 	/* If we can't reserve the bo, unref should be enough to destroy
>diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
>index 93fa735..c7f3a85 100644
>--- a/drivers/gpu/drm/radeon/r100.c
>+++ b/drivers/gpu/drm/radeon/r100.c
>@@ -1041,7 +1041,7 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size)
> 		return r;
> 	}
> 	rdev->cp.ready = true;
>-	rdev->mc.active_vram_size = rdev->mc.real_vram_size;
>+	radeon_ttm_set_active_vram_size(rdev, rdev->mc.real_vram_size);
> 	return 0;
> }
> 
>@@ -1059,7 +1059,7 @@ void r100_cp_fini(struct radeon_device *rdev)
> void r100_cp_disable(struct radeon_device *rdev)
> {
> 	/* Disable ring */
>-	rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
>+	radeon_ttm_set_active_vram_size(rdev, rdev->mc.visible_vram_size);
> 	rdev->cp.ready = false;
> 	WREG32(RADEON_CP_CSQ_MODE, 0);
> 	WREG32(RADEON_CP_CSQ_CNTL, 0);
>@@ -2329,7 +2329,6 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
> 	/* FIXME we don't use the second aperture yet when we could use it */
> 	if (rdev->mc.visible_vram_size > rdev->mc.aper_size)
> 		rdev->mc.visible_vram_size = rdev->mc.aper_size;
>-	rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
> 	config_aper_size = RREG32(RADEON_CONFIG_APER_SIZE);
> 	if (rdev->flags & RADEON_IS_IGP) {
> 		uint32_t tom;
>diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
>index de88624..9b3fad2 100644
>--- a/drivers/gpu/drm/radeon/r600.c
>+++ b/drivers/gpu/drm/radeon/r600.c
>@@ -1255,7 +1255,6 @@ int r600_mc_init(struct radeon_device *rdev)
> 	rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
> 	rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
> 	rdev->mc.visible_vram_size = rdev->mc.aper_size;
>-	rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
> 	r600_vram_gtt_location(rdev, &rdev->mc);
> 
> 	if (rdev->flags & RADEON_IS_IGP) {
>@@ -1937,7 +1936,7 @@ void r600_pciep_wreg(struct radeon_device *rdev, u32 reg, u32 v)
>  */
> void r600_cp_stop(struct radeon_device *rdev)
> {
>-	rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
>+	radeon_ttm_set_active_vram_size(rdev, rdev->mc.visible_vram_size);
> 	WREG32(R_0086D8_CP_ME_CNTL, S_0086D8_CP_ME_HALT(1));
> 	WREG32(SCRATCH_UMSK, 0);
> }
>diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c
>index 41f7aaf..df68d91 100644
>--- a/drivers/gpu/drm/radeon/r600_blit_kms.c
>+++ b/drivers/gpu/drm/radeon/r600_blit_kms.c
>@@ -558,7 +558,7 @@ done:
> 		dev_err(rdev->dev, "(%d) pin blit object failed\n", r);
> 		return r;
> 	}
>-	rdev->mc.active_vram_size = rdev->mc.real_vram_size;
>+	radeon_ttm_set_active_vram_size(rdev, rdev->mc.real_vram_size);
> 	return 0;
> }
> 
>@@ -566,7 +566,7 @@ void r600_blit_fini(struct radeon_device *rdev)
> {
> 	int r;
> 
>-	rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
>+	radeon_ttm_set_active_vram_size(rdev, rdev->mc.visible_vram_size);
> 	if (rdev->r600_blit.shader_obj == NULL)
> 		return;
> 	/* If we can't reserve the bo, unref should be enough to destroy
>diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
>index 56c48b6..6b34294 100644
>--- a/drivers/gpu/drm/radeon/radeon.h
>+++ b/drivers/gpu/drm/radeon/radeon.h
>@@ -345,7 +345,6 @@ struct radeon_mc {
> 	 * about vram size near mc fb location */
> 	u64			mc_vram_size;
> 	u64			visible_vram_size;
>-	u64			active_vram_size;
> 	u64			gtt_size;
> 	u64			gtt_start;
> 	u64			gtt_end;
>@@ -1448,6 +1447,7 @@ extern void radeon_vram_location(struct radeon_device *rdev, struct radeon_mc *m
> extern void radeon_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc);
> extern int radeon_resume_kms(struct drm_device *dev);
> extern int radeon_suspend_kms(struct drm_device *dev, pm_message_t state);
>+extern void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size);
> 
> /* r600, rv610, rv630, rv620, rv635, rv670, rs780, rs880 */
> extern bool r600_card_posted(struct radeon_device *rdev);
>diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
>index e5b2cf1..8389b4c 100644
>--- a/drivers/gpu/drm/radeon/radeon_ttm.c
>+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
>@@ -589,6 +589,20 @@ void radeon_ttm_fini(struct radeon_device *rdev)
> 	DRM_INFO("radeon: ttm finalized\n");
> }
> 
>+/* this should only be called at bootup or when userspace
>+ * isn't running */
>+void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
>+{
>+	struct ttm_mem_type_manager *man;
>+
>+	if (!rdev->mman.initialized)
>+		return;
>+
>+	man = &rdev->mman.bdev.man[TTM_PL_VRAM];
>+	/* this just adjusts TTM size idea, which sets lpfn to the correct value */
>+	man->size = size >> PAGE_SHIFT;
>+}
>+
> static struct vm_operations_struct radeon_ttm_vm_ops;
> static const struct vm_operations_struct *ttm_vm_ops = NULL;
> 
>diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
>index 5afe294..8af4679 100644
>--- a/drivers/gpu/drm/radeon/rs600.c
>+++ b/drivers/gpu/drm/radeon/rs600.c
>@@ -751,7 +751,6 @@ void rs600_mc_init(struct radeon_device *rdev)
> 	rdev->mc.real_vram_size = RREG32(RADEON_CONFIG_MEMSIZE);
> 	rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
> 	rdev->mc.visible_vram_size = rdev->mc.aper_size;
>-	rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
> 	rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev);
> 	base = RREG32_MC(R_000004_MC_FB_LOCATION);
> 	base = G_000004_MC_FB_START(base) << 16;
>diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
>index 6638c8e..66c949b 100644
>--- a/drivers/gpu/drm/radeon/rs690.c
>+++ b/drivers/gpu/drm/radeon/rs690.c
>@@ -157,7 +157,6 @@ void rs690_mc_init(struct radeon_device *rdev)
> 	rdev->mc.aper_base = pci_resource_start(rdev->pdev, 0);
> 	rdev->mc.aper_size = pci_resource_len(rdev->pdev, 0);
> 	rdev->mc.visible_vram_size = rdev->mc.aper_size;
>-	rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
> 	base = RREG32_MC(R_000100_MCCFG_FB_LOCATION);
> 	base = G_000100_MC_FB_START(base) << 16;
> 	rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev);
>diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
>index d8ba676..714ad45 100644
>--- a/drivers/gpu/drm/radeon/rv770.c
>+++ b/drivers/gpu/drm/radeon/rv770.c
>@@ -307,7 +307,7 @@ static void rv770_mc_program(struct radeon_device *rdev)
>  */
> void r700_cp_stop(struct radeon_device *rdev)
> {
>-	rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
>+	radeon_ttm_set_active_vram_size(rdev, rdev->mc.visible_vram_size);
> 	WREG32(CP_ME_CNTL, (CP_ME_HALT | CP_PFP_HALT));
> 	WREG32(SCRATCH_UMSK, 0);
> }
>@@ -1123,7 +1123,6 @@ int rv770_mc_init(struct radeon_device *rdev)
> 	rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
> 	rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
> 	rdev->mc.visible_vram_size = rdev->mc.aper_size;
>-	rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
> 	r700_vram_gtt_location(rdev, &rdev->mc);
> 	radeon_update_bandwidth_info(rdev);
> 
>-- 
>1.7.4.1
>

Actions: View | Splinter Review

Attachments on bug 35254: 44397 | 44398 | 44408 | 44409 | 44426

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.