All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jerome Glisse <jglisse@redhat.com>
To: airlied@gmail.com
Cc: thellstrom@vmware.com, skeggsb@gmail.com,
	Jerome Glisse <jglisse@redhat.com>,
	dri-devel@lists.sf.net
Subject: [PATCH 9/9] drm/radeon/kms: enable use of unmappable VRAM
Date: Tue, 23 Feb 2010 15:40:44 +0100	[thread overview]
Message-ID: <1266936044-11211-10-git-send-email-jglisse@redhat.com> (raw)
In-Reply-To: <1266936044-11211-9-git-send-email-jglisse@redhat.com>

This patch enable the use of unmappable VRAM thanks to
previous TTM infrastructure change.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
---
 drivers/gpu/drm/radeon/evergreen.c |    5 -----
 drivers/gpu/drm/radeon/r100.c      |    5 -----
 drivers/gpu/drm/radeon/r600.c      |    5 -----
 drivers/gpu/drm/radeon/rv770.c     |    5 -----
 4 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index bd2e7aa..abab06e 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -475,11 +475,6 @@ int evergreen_mc_init(struct radeon_device *rdev)
 	rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024;
 	rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024;
 	rdev->mc.visible_vram_size = rdev->mc.aper_size;
-	/* FIXME remove this once we support unmappable VRAM */
-	if (rdev->mc.mc_vram_size > rdev->mc.aper_size) {
-		rdev->mc.mc_vram_size = rdev->mc.aper_size;
-		rdev->mc.real_vram_size = rdev->mc.aper_size;
-	}
 	r600_vram_gtt_location(rdev, &rdev->mc);
 	/* FIXME: we should enforce default clock in case GPU is not in
 	 * default setup
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 03f3b2f..2095ab2 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -1991,11 +1991,6 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
 		else
 			rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
 	}
-	/* FIXME remove this once we support unmappable VRAM */
-	if (rdev->mc.mc_vram_size > rdev->mc.aper_size) {
-		rdev->mc.mc_vram_size = rdev->mc.aper_size;
-		rdev->mc.real_vram_size = rdev->mc.aper_size;
-	}
 }
 
 void r100_vga_set_state(struct radeon_device *rdev, bool state)
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index ad1b0c7..9b5a0b1 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -727,11 +727,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;
-	/* FIXME remove this once we support unmappable VRAM */
-	if (rdev->mc.mc_vram_size > rdev->mc.aper_size) {
-		rdev->mc.mc_vram_size = rdev->mc.aper_size;
-		rdev->mc.real_vram_size = rdev->mc.aper_size;
-	}
 	r600_vram_gtt_location(rdev, &rdev->mc);
 	/* FIXME: we should enforce default clock in case GPU is not in
 	 * default setup
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index 81c8739..66b22d0 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -821,11 +821,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;
-	/* FIXME remove this once we support unmappable VRAM */
-	if (rdev->mc.mc_vram_size > rdev->mc.aper_size) {
-		rdev->mc.mc_vram_size = rdev->mc.aper_size;
-		rdev->mc.real_vram_size = rdev->mc.aper_size;
-	}
 	r600_vram_gtt_location(rdev, &rdev->mc);
 	/* FIXME: we should enforce default clock in case GPU is not in
 	 * default setup
-- 
1.6.6


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--

  reply	other threads:[~2010-02-23 14:40 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-23 14:40 Unmappable VRAM patchset V4 Jerome Glisse
2010-02-23 14:40 ` [PATCH 1/9] drm/ttm: ttm_fault callback to allow driver to handle bo placement V2 Jerome Glisse
2010-02-23 14:40   ` [PATCH 2/9] drm/radeon/kms: add support for new fault callback V3 Jerome Glisse
2010-02-23 14:40     ` [PATCH 3/9] drm/nouveau/kms: add support for new TTM fault callback V2 Jerome Glisse
2010-02-23 14:40       ` [PATCH 4/9] drm/vmwgfx: " Jerome Glisse
2010-02-23 14:40         ` [PATCH 5/9] drm/radeon/kms: don't initialize TTM io memory manager field Jerome Glisse
2010-02-23 14:40           ` [PATCH 6/9] drm/nouveau/kms: " Jerome Glisse
2010-02-23 14:40             ` [PATCH 7/9] drm/vmwgfx: " Jerome Glisse
2010-02-23 14:40               ` [PATCH 8/9] drm/ttm: remove io_ field from TTM V2 Jerome Glisse
2010-02-23 14:40                 ` Jerome Glisse [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-02-25 17:01 Unmappable VRAM patchset V4 Jerome Glisse
2010-02-25 17:01 ` [PATCH 1/9] drm/ttm: ttm_fault callback to allow driver to handle bo placement V2 Jerome Glisse
2010-02-25 17:01   ` [PATCH 2/9] drm/radeon/kms: add support for new fault callback V3 Jerome Glisse
2010-02-25 17:01     ` [PATCH 3/9] drm/nouveau/kms: add support for new TTM fault callback V2 Jerome Glisse
2010-02-25 17:01       ` [PATCH 4/9] drm/vmwgfx: " Jerome Glisse
2010-02-25 17:01         ` [PATCH 5/9] drm/radeon/kms: don't initialize TTM io memory manager field Jerome Glisse
2010-02-25 17:01           ` [PATCH 6/9] drm/nouveau/kms: " Jerome Glisse
2010-02-25 17:01             ` [PATCH 7/9] drm/vmwgfx: " Jerome Glisse
2010-02-25 17:01               ` [PATCH 8/9] drm/ttm: remove io_ field from TTM V2 Jerome Glisse
2010-02-25 17:01                 ` [PATCH 9/9] drm/radeon/kms: enable use of unmappable VRAM Jerome Glisse
2010-02-22 17:11 Unmappable VRAM patchset V3 Jerome Glisse
2010-02-22 17:11 ` [PATCH 1/9] drm/ttm: add ttm_fault callback to allow driver to handle bo placement Jerome Glisse
2010-02-22 17:11   ` [PATCH 1/9] drm/ttm: ttm_fault callback to allow driver to handle bo placement V2 Jerome Glisse
2010-02-22 17:11     ` [PATCH 2/9] drm/radeon/kms: add support for new fault callback Jerome Glisse
2010-02-22 17:11       ` [PATCH 2/9] drm/radeon/kms: add support for new fault callback V2 Jerome Glisse
2010-02-22 17:11         ` [PATCH 3/9] drm/nouveau/kms: add support for new TTM fault callback Jerome Glisse
2010-02-22 17:11           ` [PATCH 4/9] drm/vmwgfx: " Jerome Glisse
2010-02-22 17:11             ` [PATCH 5/9] drm/radeon/kms: don't initialize TTM io memory manager field Jerome Glisse
2010-02-22 17:11               ` [PATCH 6/9] drm/nouveau/kms: " Jerome Glisse
2010-02-22 17:11                 ` [PATCH 7/9] drm/vmwgfx: " Jerome Glisse
2010-02-22 17:11                   ` [PATCH 8/9] drm/ttm: remove io_ field from TTM Jerome Glisse
2010-02-22 17:11                     ` [PATCH 8/9] drm/ttm: remove io_ field from TTM V2 Jerome Glisse
2010-02-22 17:11                       ` [PATCH 9/9] drm/radeon/kms: enable use of unmappable VRAM Jerome Glisse
2010-02-20 12:30 Unmappable VRAM patchset take 2 Jerome Glisse
2010-02-20 12:30 ` [PATCH 1/9] drm/ttm: add ttm_fault callback to allow driver to handle bo placement Jerome Glisse
2010-02-20 12:30   ` [PATCH 2/9] drm/radeon/kms: add support for new fault callback Jerome Glisse
2010-02-20 12:30     ` [PATCH 3/9] drm/nouveau/kms: add support for new TTM " Jerome Glisse
2010-02-20 12:30       ` [PATCH 4/9] drm/vmwgfx: " Jerome Glisse
2010-02-20 12:30         ` [PATCH 5/9] drm/radeon/kms: don't initialize TTM io memory manager field Jerome Glisse
2010-02-20 12:30           ` [PATCH 6/9] drm/nouveau/kms: " Jerome Glisse
2010-02-20 12:30             ` [PATCH 7/9] drm/vmwgfx: " Jerome Glisse
2010-02-20 12:30               ` [PATCH 8/9] drm/ttm: remove io_ field from TTM Jerome Glisse
2010-02-20 12:30                 ` [PATCH 9/9] drm/radeon/kms: enable use of unmappable VRAM Jerome Glisse
2010-02-19 23:45 TTM changes + support for " Jerome Glisse
2010-02-19 23:45 ` [PATCH 1/9] drm/ttm: add ttm_fault callback to allow driver to handle bo placement Jerome Glisse
2010-02-19 23:45   ` [PATCH 2/9] drm/radeon/kms: add support for new fault callback Jerome Glisse
2010-02-19 23:45     ` [PATCH 3/9] drm/nouveau/kms: add support for new TTM " Jerome Glisse
2010-02-19 23:45       ` [PATCH 4/9] drm/vmwgfx: " Jerome Glisse
2010-02-19 23:45         ` [PATCH 5/9] drm/radeon/kms: don't initialize TTM io memory manager field Jerome Glisse
2010-02-19 23:45           ` [PATCH 6/9] drm/nouveau/kms: " Jerome Glisse
2010-02-19 23:45             ` [PATCH 7/9] drm/vmwgfx: " Jerome Glisse
2010-02-19 23:45               ` [PATCH 8/9] drm/ttm: remove io_ field from TTM Jerome Glisse
2010-02-19 23:45                 ` [PATCH 9/9] drm/radeon/kms: enable use of unmappable VRAM Jerome Glisse

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1266936044-11211-10-git-send-email-jglisse@redhat.com \
    --to=jglisse@redhat.com \
    --cc=airlied@gmail.com \
    --cc=dri-devel@lists.sf.net \
    --cc=skeggsb@gmail.com \
    --cc=thellstrom@vmware.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.