Re: Revert "intel_agp: fix stolen mem range on G33"

Previous thread: [PATCH]dose it make get_swap_page(mm/swapfiles.c) good performance ?, kernel<2.6.22.9>. by ohyama_sec on Friday, October 5, 2007 - 8:04 pm. (2 messages)

Next thread: [Patch]Documentation/spi/spidev_test.c: constify some variables by WANG Cong on Friday, October 5, 2007 - 10:02 pm. (2 messages)
To: <dri-devel@...>, <linux-kernel@...>
Date: Friday, October 5, 2007 - 8:20 pm

I've got a new-ish system that I've been trying to get working that's
very close; the only things left are networking (which the latest e1000
driver from sf.net might fix) and graphics.

The system is a DG33TL micro ATX motherboard with a 2.13GHz Core 2 Duo
processor and 2GB RAM. The graphics adapter is:

00:02.0 VGA compatible controller: Intel Corporation 82G33/G31 Express
Integrated Graphics Controller (rev 02) (prog-if 00 [VGA])
Subsystem: Intel Corporation Unknown device 5044
Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop-
ParErr- Stepping- SERR- FastB2B-
Status: Cap+ 66MHz- UDF- FastB2B+ ParErr- DEVSEL=fast >TAbort-
<TAbort- <MAbort- >SERR- <PERR-
Latency: 0
Interrupt: pin A routed to IRQ 22
Region 0: Memory at 90280000 (32-bit, non-prefetchable) [size=512K]
Region 1: I/O ports at 2430 [size=8]
Region 2: Memory at 80000000 (32-bit, prefetchable) [size=256M]
Region 3: Memory at 90100000 (32-bit, non-prefetchable) [size=1M]
Capabilities: [90] Message Signalled Interrupts: Mask- 64bit-
Queue=0/0 Enable-
Address: 00000000 Data: 0000
Capabilities: [d0] Power Management version 2
Flags: PMEClk- DSI+ D1- D2- AuxCurrent=0mA
PME(D0-,D1-,D2-,D3hot-,D3cold-)
Status: D0 PME-Enable- DSel=0 DScale=0 PME-

It works fine in the Ubuntu kernels (pre 2.6.22-13) and in mainline through
2.6.23-rc6; since 2.6.23-rc7 (and Ubuntu 2.6.22-13), the X server won't
start up, and I get this at the end of my Xorg.log:

============================================
(II) intel(0): xf86BindGARTMemory: bind key 0 at 0x006ff000 (pgoffset 1791)
(WW) intel(0): xf86BindGARTMemory: binding of gart memory with key 0
at offset 0x6ff000 failed (Invalid argument)

Fatal server error:
Couldn't bind memory for front buffer

============================================

Up until that (II) line, the logs are basically identical, and the wo...

To: Matthew Reppert <arashi@...>
Cc: <dri-devel@...>, <linux-kernel@...>, <airlied@...>
Date: Saturday, October 6, 2007 - 12:42 am

AOL. And I was in the middle of watching a bloody movie too.

commit f443675affe3f16dd428e46f0f7fd3f4d703eeab
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Tue Sep 11 15:23:57 2007 -0700

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.

Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
Acked-by: Dave Airlie <airlied@linux.ie>
Cc: Dave Jones <davej@codemonkey.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Looks to be the commit that breaks things.

Regards,
Kyle M.
-

To: Matthew Reppert <arashi@...>
Cc: <dri-devel@...>, <linux-kernel@...>, <airlied@...>
Date: Saturday, October 6, 2007 - 1:34 am

Found it, without this corresponding change to xf86-video-intel, this
breaks utterly:

commit 2a8592f2ebcba86b1127aa889155d58a3dc186ca
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
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: Linus Torvalds <torvalds@...>
Cc: <dri-devel@...>, <linux-kernel@...>, <airlied@...>, <arashi@...>
Date: Saturday, October 6, 2007 - 1:42 am

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 <kyle@mcmartin.ca>
---

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

-

To: Kyle McMartin <kyle@...>
Cc: Linus Torvalds <torvalds@...>, <dri-devel@...>, <linux-kernel@...>, <airlied@...>, <arashi@...>
Date: Saturday, October 6, 2007 - 6:41 am

I guess, this will break my graphics, no?

--
Jiri Slaby (jirislaby@gmail.com)
Faculty of Informatics, Masaryk University
-

To: Jiri Slaby <jirislaby@...>
Cc: Kyle McMartin <kyle@...>, <airlied@...>, <dri-devel@...>, Linus Torvalds <torvalds@...>, <linux-kernel@...>, <arashi@...>
Date: Sunday, October 7, 2007 - 8:17 am

You need to upgrade Mesa.

Cheers,
Daniel

To: Jiri Slaby <jirislaby@...>
Cc: Kyle McMartin <kyle@...>, <dri-devel@...>, <linux-kernel@...>, <airlied@...>, <arashi@...>
Date: Saturday, October 6, 2007 - 11:59 am

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
-

To: Linus Torvalds <torvalds@...>
Cc: <keithp@...>, Jiri Slaby <jirislaby@...>, Kyle McMartin <kyle@...>, <airlied@...>, <dri-devel@...>, <linux-kernel@...>, <arashi@...>
Date: Saturday, October 6, 2007 - 3:29 pm

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.

--=20
keith.packard@intel.com

To: Keith Packard <keithp@...>
Cc: Linus Torvalds <torvalds@...>, Kyle McMartin <kyle@...>, <airlied@...>, <dri-devel@...>, <linux-kernel@...>, <arashi@...>
Date: Sunday, October 7, 2007 - 6:05 am

Agree with the first part. Here comes the X log diff:
--- orig 2007-10-07 11:57:50.000000000 +0200
+++ agp 2007-10-07 11:56:07.000000000 +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): 0x08000000-0x09ffffff: textures (32768 kB)
(II) intel(0): 0x10000000: 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:0000:00:02.0
drmOpenDevice: node name is /dev/dri/card0
-drmOpenDevice: open result is 10, (OK)
...

Previous thread: [PATCH]dose it make get_swap_page(mm/swapfiles.c) good performance ?, kernel<2.6.22.9>. by ohyama_sec on Friday, October 5, 2007 - 8:04 pm. (2 messages)

Next thread: [Patch]Documentation/spi/spidev_test.c: constify some variables by WANG Cong on Friday, October 5, 2007 - 10:02 pm. (2 messages)