Re: Revert intel_agp: fix stolen mem range on G33
On 10/06/2007 07:42 AM, Kyle McMartin wrote:
This reverts commit f443675affe3f16dd428e46f0f7fd3f4d703eeab, which
breaks horribly if you aren't running an unreleased xf86-video-intel
driver out of git.
I guess, this will break my graphics, no?
http://lkml.org/lkml/2007/9/20/447
Conflicts:
drivers/char/agp/intel-agp.c
Signed-off-by: Kyle McMartin [EMAIL PROTECTED]
---
drivers/char/agp/intel-agp.c |5 -
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index a5d0e95..141ca17 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -506,11 +506,6 @@ static void intel_i830_init_gtt_entries(void)
break;
}
} else {
- /* G33's GTT stolen memory is separate from gfx data
- * stolen memory.
- */
- if (IS_G33)
- size = 0;
switch (gmch_ctrl I855_GMCH_GMS_MASK) {
case I855_GMCH_GMS_STOLEN_1M:
gtt_entries = MB(1) - KB(size);
--
Jiri Slaby ([EMAIL PROTECTED])
Faculty of Informatics, Masaryk University
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: Revert intel_agp: fix stolen mem range on G33
On 10/06/2007 09:29 PM, Keith Packard wrote: On Sat, 2007-10-06 at 08:59 -0700, Linus Torvalds wrote: We do have a rule about no regressions, so I think we'll have to do the revert, but it would be nice to hear what the consequences for the revert is for the affected hardware and new X.org.. Agree with the first part. Here comes the X log diff: --- orig2007-10-07 11:57:50.0 +0200 +++ agp 2007-10-07 11:56:07.0 +0200 @@ -3,7 +3,7 @@ Release Date: 19 April 2007 X Protocol Version 11, Revision 0, Release 1.3 Build Operating System: Fedora Core 7 Red Hat, Inc. -Current Operating System: Linux bellona 2.6.23-rc8-mm2_64 #58 SMP Fri Sep 28 08:52:12 CEST 2007 x86_64 +Current Operating System: Linux bellona 2.6.23-rc8-mm2_64 #59 SMP Sun Oct 7 11:43:55 CEST 2007 x86_64 Build Date: 11 June 2007 Build ID: xorg-x11-server 1.3.0.0-9.fc7 Before reporting problems, check http://wiki.x.org @@ -12,7 +12,7 @@ Markers: (--) probed, (**) from config file, (==) default setting, (++) from command line, (!!) notice, (II) informational, (WW) warning, (EE) error, (NI) not implemented, (??) unknown. -(==) Log file: /var/log/Xorg.0.log, Time: Sun Oct 7 11:57:20 2007 +(==) Log file: /var/log/Xorg.0.log, Time: Sun Oct 7 11:54:36 2007 (==) Using config file: /etc/X11/xorg.conf (==) ServerLayout Default Layout (**) |--Screen Screen0 (0) @@ -34,7 +34,8 @@ (**) Option BlankTime 8 (**) Option StandbyTime 10 (**) Extension Composite is enabled -(II) Open ACPI successful (/var/run/acpid.socket) +(WW) Open ACPI failed (/var/run/acpid.socket) (No such file or directory) +(II) No APM support in BIOS or kernel (II) Loader magic: 0x7be760 (II) Module ABI versions: X.Org ANSI C Emulation: 0.3 @@ -760,18 +761,18 @@ (II) intel(0): 0x0800-0x09ff: textures (32768 kB) (II) intel(0): 0x1000:end of aperture drmOpenDevice: node name is /dev/dri/card0 -drmOpenDevice: open result is 10, (OK) +drmOpenDevice: open result is 9, (OK) drmOpenDevice: node name is /dev/dri/card0 -drmOpenDevice: open result is 10, (OK) +drmOpenDevice: open result is 9, (OK) drmOpenByBusid: Searching for BusID pci::00:02.0 drmOpenDevice: node name is /dev/dri/card0 -drmOpenDevice: open result is 10, (OK) -drmOpenByBusid: drmOpenMinor returns 10 +drmOpenDevice: open result is 9, (OK) +drmOpenByBusid: drmOpenMinor returns 9 drmOpenByBusid: drmGetBusid reports pci::00:02.0 (II) intel(0): [drm] DRM interface version 1.3 (II) intel(0): [drm] created i915 driver at busid pci::00:02.0 (II) intel(0): [drm] added 8192 byte SAREA at 0x2efff000 -(II) intel(0): [drm] mapped SAREA 0x2efff000 to 0x7f794b3bb000 +(II) intel(0): [drm] mapped SAREA 0x2efff000 to 0x7fd637f76000 (II) intel(0): [drm] framebuffer handle = 0xd400 (II) intel(0): [drm] added 1 reserved context for kernel (II) intel(0): [drm] Registers = 0xffa8 @@ -838,11 +839,11 @@ (II) Initializing built-in extension DAMAGE (II) Initializing built-in extension XEVIE drmOpenDevice: node name is /dev/dri/card0 -drmOpenDevice: open result is 11, (OK) +drmOpenDevice: open result is 10, (OK) drmOpenByBusid: Searching for BusID pci::00:02.0 drmOpenDevice: node name is /dev/dri/card0 -drmOpenDevice: open result is 11, (OK) -drmOpenByBusid: drmOpenMinor returns 11 +drmOpenDevice: open result is 10, (OK) +drmOpenByBusid: drmOpenMinor returns 10 drmOpenByBusid: drmGetBusid reports pci::00:02.0 (WW) AIGLX: 3D driver claims to not support visual 0x23 (WW) AIGLX: 3D driver claims to not support visual 0x24 @@ -906,7 +907,7 @@ (II) default pointer: ps2EnableDataReporting: succeeded (II) Mouse0-usb-:00:1d.0-1.2/input0: Off (II) intel(0): [drm] removed 1 reserved context for kernel -(II) intel(0): [drm] unmapping 8192 bytes of SAREA 0x2efff000 at 0x7f794b3bb000 +(II) intel(0): [drm] unmapping 8192 bytes of SAREA 0x2efff000 at 0x7fd637f76000 (EE) intel(0): I830 Vblank Pipe Setup Failed 0 (EE) intel(0): I830 Vblank Pipe Setup Failed 0 (EE) intel(0): I830 Vblank Pipe Setup Failed 0 And it seems to work, so I think no regression here. regards, -- Jiri Slaby ([EMAIL PROTECTED]) Faculty of Informatics, Masaryk University - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: Revert intel_agp: fix stolen mem range on G33
On Sat, Oct 06, 2007 at 12:41:21PM +0200, Jiri Slaby wrote: On 10/06/2007 07:42 AM, Kyle McMartin wrote: This reverts commit f443675affe3f16dd428e46f0f7fd3f4d703eeab, which breaks horribly if you aren't running an unreleased xf86-video-intel driver out of git. I guess, this will break my graphics, no? http://lkml.org/lkml/2007/9/20/447 You need to upgrade Mesa. Cheers, Daniel signature.asc Description: Digital signature - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/-- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: Revert intel_agp: fix stolen mem range on G33
On Sat, 6 Oct 2007, Jiri Slaby wrote: I guess, this will break my graphics, no? http://lkml.org/lkml/2007/9/20/447 Can you try it? We do have a rule about no regressions, so I think we'll have to do the revert, but it would be nice to hear what the consequences for the revert is for the affected hardware and new X.org.. Linus - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: Revert intel_agp: fix stolen mem range on G33
On Sat, 2007-10-06 at 08:59 -0700, Linus Torvalds wrote: We do have a rule about no regressions, so I think we'll have to do the revert, but it would be nice to hear what the consequences for the revert is for the affected hardware and new X.org.. No regressions is more important than making new X.org bits work. I'll make sure that any future fixes for this are tested against older X versions before having them sent along. -- [EMAIL PROTECTED] signature.asc Description: This is a digitally signed message part - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/-- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
Revert intel_agp: fix stolen mem range on G33
This reverts commit f443675affe3f16dd428e46f0f7fd3f4d703eeab, which
breaks horribly if you aren't running an unreleased xf86-video-intel
driver out of git.
Conflicts:
drivers/char/agp/intel-agp.c
Signed-off-by: Kyle McMartin [EMAIL PROTECTED]
---
drivers/char/agp/intel-agp.c |5 -
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index a5d0e95..141ca17 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -506,11 +506,6 @@ static void intel_i830_init_gtt_entries(void)
break;
}
} else {
- /* G33's GTT stolen memory is separate from gfx data
-* stolen memory.
-*/
- if (IS_G33)
- size = 0;
switch (gmch_ctrl I855_GMCH_GMS_MASK) {
case I855_GMCH_GMS_STOLEN_1M:
gtt_entries = MB(1) - KB(size);
--
1.5.3.3
On Sat, Oct 06, 2007 at 01:34:10AM -0400, Kyle McMartin wrote:
On Sat, Oct 06, 2007 at 12:42:21AM -0400, Kyle McMartin wrote:
commit f443675affe3f16dd428e46f0f7fd3f4d703eeab
intel_agp: fix stolen mem range on G33
G33 GTT stolen memory is below graphics data stolen memory and be
seperate,
so don't subtract it in stolen mem counting.
Found it, without this corresponding change to xf86-video-intel, this
breaks utterly:
commit 2a8592f2ebcba86b1127aa889155d58a3dc186ca
Author: Zhenyu Wang [EMAIL PROTECTED]
Date: Wed Sep 5 14:52:56 2007 +0800
Fix G33 GTT stolen mem range
G33 GTT table lives in seperate stolen mem with
graphics data stolen mem.
I think this should be reverted for 2.6.23, it certainly doesn't seem to have
been appropriate for 2.6.23-rc6.
Cheers,
Kyle M.
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
