From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: eric@anholt.net
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, intel-gfx@lists.freedesktop.org
Subject: [PATCH 8/8] agp/intel-gtt: kill previous_size assignments
Date: Wed, 14 Apr 2010 00:29:58 +0200 [thread overview]
Message-ID: <1271197798-4581-9-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1271197798-4581-1-git-send-email-daniel.vetter@ffwll.ch>
Not needed for the GTT and inconsistent: Sometimes the _new_ size
was stored there ...
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/char/agp/intel-gtt.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 3a8f5d7..361a382 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -213,13 +213,11 @@ static int intel_i810_fetch_size(void)
return 0;
}
if ((smram_miscc & I810_GFX_MEM_WIN_SIZE) == I810_GFX_MEM_WIN_32M) {
- agp_bridge->previous_size =
- agp_bridge->current_size = (void *) (values + 1);
+ agp_bridge->current_size = (void *) (values + 1);
agp_bridge->aperture_size_idx = 1;
return values[1].size;
} else {
- agp_bridge->previous_size =
- agp_bridge->current_size = (void *) (values);
+ agp_bridge->current_size = (void *) (values);
agp_bridge->aperture_size_idx = 0;
return values[0].size;
}
@@ -835,7 +833,7 @@ static int intel_i830_fetch_size(void)
if (agp_bridge->dev->device != PCI_DEVICE_ID_INTEL_82830_HB &&
agp_bridge->dev->device != PCI_DEVICE_ID_INTEL_82845G_HB) {
/* 855GM/852GM/865G has 128MB aperture size */
- agp_bridge->previous_size = agp_bridge->current_size = (void *) values;
+ agp_bridge->current_size = (void *) values;
agp_bridge->aperture_size_idx = 0;
return values[0].size;
}
@@ -843,11 +841,11 @@ static int intel_i830_fetch_size(void)
pci_read_config_word(agp_bridge->dev, I830_GMCH_CTRL, &gmch_ctrl);
if ((gmch_ctrl & I830_GMCH_MEM_MASK) == I830_GMCH_MEM_128M) {
- agp_bridge->previous_size = agp_bridge->current_size = (void *) values;
+ agp_bridge->current_size = (void *) values;
agp_bridge->aperture_size_idx = 0;
return values[0].size;
} else {
- agp_bridge->previous_size = agp_bridge->current_size = (void *) (values + 1);
+ agp_bridge->current_size = (void *) (values + 1);
agp_bridge->aperture_size_idx = 1;
return values[1].size;
}
@@ -1212,7 +1210,6 @@ static int intel_i9xx_fetch_size(void)
for (i = 0; i < num_sizes; i++) {
if (aper_size == intel_i830_sizes[i].size) {
agp_bridge->current_size = intel_i830_sizes + i;
- agp_bridge->previous_size = agp_bridge->current_size;
return aper_size;
}
}
--
1.7.0.4
next prev parent reply other threads:[~2010-04-13 22:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-13 22:29 [PATCH 0/8] split intel-agp.c into gtt and agp port driver - rebased Daniel Vetter
2010-04-13 22:29 ` [PATCH 1/8] agp/intel: introduce intel-agp.h header file Daniel Vetter
2010-04-13 22:29 ` [PATCH 2/8] agp/intel: split out the GTT support Daniel Vetter
2010-04-13 22:29 ` [PATCH 3/8] agp/intel: uncoditionally reconfigure driver on resume Daniel Vetter
2010-04-13 22:29 ` [PATCH 4/8] drm/intel: kill mutli_gmch_chip Daniel Vetter
2010-04-13 22:29 ` [PATCH 5/8] agp/intel: split out gmch/gtt probe, part 1 Daniel Vetter
2010-04-13 22:29 ` [PATCH 6/8] agp/intel: split out gmch/gtt probe, part 2 Daniel Vetter
2010-04-14 7:33 ` [PATCH 0/2] split up patch 6/8 Daniel Vetter
2010-04-14 7:33 ` [PATCH 1/2] agp/intel: split out gmch/gtt probe, part 2 Daniel Vetter
2010-04-14 7:33 ` [PATCH 2/2] agp/intel: make intel-gtt.c into a real source file Daniel Vetter
2010-04-13 22:29 ` [PATCH 7/8] agp/intel-gtt: kill intel_i830_tlbflush Daniel Vetter
2010-04-13 22:29 ` Daniel Vetter [this message]
2010-04-19 0:42 ` [PATCH 0/8] split intel-agp.c into gtt and agp port driver - rebased Eric Anholt
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=1271197798-4581-9-git-send-email-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=eric@anholt.net \
--cc=intel-gfx@lists.freedesktop.org \
/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.