2002-07-17 18:34:29

by Greg KH

[permalink] [raw]
Subject: [BK PATCH] agpgart changes for 2.5.26

Hi,

These changesets have the latest agpgart code from the -dj tree, and
I've tried to rename the files to something that makes more sense.


Pull from: http://linuxusb.bkbits.net/agpgart-2.5

drivers/char/agp/agp.c | 1664 +++++++++++++
drivers/char/agp/agpgart_be-ali.c | 265 --
drivers/char/agp/agpgart_be-ali.c | 265 ++
drivers/char/agp/agpgart_be-amd.c | 408 ---
drivers/char/agp/agpgart_be-amd.c | 408 +++
drivers/char/agp/agpgart_be.c | 1662 -------------
drivers/char/agp/agpgart_be.c | 4470 +++--------------------------------
drivers/char/agp/agpgart_be-hp.c | 394 ---
drivers/char/agp/agpgart_be-hp.c | 394 +++
drivers/char/agp/agpgart_be-i460.c | 595 ----
drivers/char/agp/agpgart_be-i460.c | 595 ++++
drivers/char/agp/agpgart_be-i810.c | 594 ----
drivers/char/agp/agpgart_be-i810.c | 594 ++++
drivers/char/agp/agpgart_be-i8x0.c | 726 -----
drivers/char/agp/agpgart_be-i8x0.c | 728 +++++
drivers/char/agp/agpgart_be-sis.c | 142 -
drivers/char/agp/agpgart_be-sis.c | 142 +
drivers/char/agp/agpgart_be-sworks.c | 626 ----
drivers/char/agp/agpgart_be-sworks.c | 626 ++++
drivers/char/agp/agpgart_be-via.c | 151 -
drivers/char/agp/agpgart_be-via.c | 151 +
drivers/char/agp/agpgart_fe.c | 1086 --------
drivers/char/agp/agpgart_fe.c | 15
drivers/char/agp/agp.h | 348 +-
drivers/char/agp/ali.c | 265 ++
drivers/char/agp/amd.c | 408 +++
drivers/char/agp/Config.help | 88
drivers/char/agp/Config.in | 14
drivers/char/agp/frontend.c | 1086 ++++++++
drivers/char/agp/hp.c | 394 +++
drivers/char/agp/i460.c | 595 ++++
drivers/char/agp/i810.c | 594 ++++
drivers/char/agp/i8x0.c | 726 +++++
drivers/char/agp/Makefile | 35
drivers/char/agp/sis.c | 142 +
drivers/char/agp/sworks.c | 626 ++++
drivers/char/agp/via.c | 151 +
include/linux/agp_backend.h | 6
include/linux/agpgart.h | 10
39 files changed, 11400 insertions(+), 10789 deletions(-)
------

[email protected], 2002-07-15 11:54:20-07:00, [email protected]
agpgart: added agp prefix to the debug printk

drivers/char/agp/agp.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
------

[email protected], 2002-07-15 11:46:17-07:00, [email protected]
agpgart: renamed the agp files to make more sense

drivers/char/agp/agpgart_be-ali.c | 265 -----
drivers/char/agp/agpgart_be-amd.c | 408 --------
drivers/char/agp/agpgart_be-hp.c | 394 --------
drivers/char/agp/agpgart_be-i460.c | 595 ------------
drivers/char/agp/agpgart_be-i810.c | 594 ------------
drivers/char/agp/agpgart_be-i8x0.c | 726 ---------------
drivers/char/agp/agpgart_be-sis.c | 142 --
drivers/char/agp/agpgart_be-sworks.c | 626 -------------
drivers/char/agp/agpgart_be-via.c | 151 ---
drivers/char/agp/agpgart_be.c | 1662 -----------------------------------
drivers/char/agp/agpgart_fe.c | 1086 ----------------------
drivers/char/agp/Makefile | 22
drivers/char/agp/agp.c | 1662 +++++++++++++++++++++++++++++++++++
drivers/char/agp/ali.c | 265 +++++
drivers/char/agp/amd.c | 408 ++++++++
drivers/char/agp/frontend.c | 1086 ++++++++++++++++++++++
drivers/char/agp/hp.c | 394 ++++++++
drivers/char/agp/i460.c | 595 ++++++++++++
drivers/char/agp/i810.c | 594 ++++++++++++
drivers/char/agp/i8x0.c | 726 +++++++++++++++
drivers/char/agp/sis.c | 142 ++
drivers/char/agp/sworks.c | 626 +++++++++++++
drivers/char/agp/via.c | 151 +++
23 files changed, 6660 insertions(+), 6660 deletions(-)
------

[email protected], 2002-07-15 10:33:27-07:00, [email protected]
agpgart: fix syntax error in the i8x0 file.

drivers/char/agp/agpgart_be-i8x0.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
------

[email protected], 2002-07-15 10:26:18-07:00, [email protected]
agpgart: Split agpgart code into separate files.

The majority of this work was done by Dave Jones, I merely converted the
driver to the "new" pci api.

drivers/char/agp/Config.help | 88
drivers/char/agp/Config.in | 14
drivers/char/agp/Makefile | 13
drivers/char/agp/agp.h | 348 +-
drivers/char/agp/agpgart_be-ali.c | 265 ++
drivers/char/agp/agpgart_be-amd.c | 408 +++
drivers/char/agp/agpgart_be-hp.c | 394 +++
drivers/char/agp/agpgart_be-i460.c | 595 ++++
drivers/char/agp/agpgart_be-i810.c | 594 ++++
drivers/char/agp/agpgart_be-i8x0.c | 726 +++++
drivers/char/agp/agpgart_be-sis.c | 142 +
drivers/char/agp/agpgart_be-sworks.c | 626 ++++
drivers/char/agp/agpgart_be-via.c | 151 +
drivers/char/agp/agpgart_be.c | 4470 +++--------------------------------
drivers/char/agp/agpgart_fe.c | 15
include/linux/agp_backend.h | 6
include/linux/agpgart.h | 10
17 files changed, 4738 insertions(+), 4127 deletions(-)
------


2002-07-17 19:27:58

by Dave Jones

[permalink] [raw]
Subject: Re: [BK PATCH] agpgart changes for 2.5.26

On Wed, Jul 17, 2002 at 11:36:15AM -0700, Greg KH wrote:
> Hi,
>
> These changesets have the latest agpgart code from the -dj tree, and
> I've tried to rename the files to something that makes more sense.
>
>
> Pull from: http://linuxusb.bkbits.net/agpgart-2.5
>
> drivers/char/agp/agp.h | 348 +-
> drivers/char/agp/ali.c | 265 ++
> drivers/char/agp/amd.c | 408 +++
> drivers/char/agp/Config.help | 88
> drivers/char/agp/Config.in | 14
> drivers/char/agp/frontend.c | 1086 ++++++++
> drivers/char/agp/hp.c | 394 +++
> drivers/char/agp/i460.c | 595 ++++
> drivers/char/agp/i810.c | 594 ++++
> drivers/char/agp/i8x0.c | 726 +++++
> drivers/char/agp/Makefile | 35
> drivers/char/agp/sis.c | 142 +
> drivers/char/agp/sworks.c | 626 ++++
> drivers/char/agp/via.c | 151 +

Linus last comment mentioned via-agp.c, and the likes,
which I did in my tree, but haven't put up a diff yet.
I could dig those out for you, but you could probably
'mv' them faster than I can chunk up the diff into pieces.

Dave

--
| Dave Jones. http://www.codemonkey.org.uk
| SuSE Labs

2002-07-17 20:34:15

by Greg KH

[permalink] [raw]
Subject: Re: [BK PATCH] agpgart changes for 2.5.26

On Wed, Jul 17, 2002 at 09:30:56PM +0200, Dave Jones wrote:
> > drivers/char/agp/via.c | 151 +
>
> Linus last comment mentioned via-agp.c, and the likes,
> which I did in my tree, but haven't put up a diff yet.
> I could dig those out for you, but you could probably
> 'mv' them faster than I can chunk up the diff into pieces.

But that would make:
drivers/char/agp/via-agp.c
which is redundant, as that file does not compile to a separate module,
but gets linked to the larger agpgart.o like before.

Or at least that's why I chose the name, Linus if you like via-agp.c,
I'd be glad to change it.

thanks,

greg k-h

2002-07-17 20:41:04

by Dave Jones

[permalink] [raw]
Subject: Re: [BK PATCH] agpgart changes for 2.5.26

On Wed, Jul 17, 2002 at 01:36:01PM -0700, Greg KH wrote:
> But that would make:
> drivers/char/agp/via-agp.c
> which is redundant, as that file does not compile to a separate module,
> but gets linked to the larger agpgart.o like before.

That's exactly what I said 8-)
But... http://www.lib.uaa.alaska.edu/linux-kernel/archive/2002-Week-28/0125.html

Dave

--
| Dave Jones. http://www.codemonkey.org.uk
| SuSE Labs

2002-07-17 22:07:41

by Alan

[permalink] [raw]
Subject: Re: [BK PATCH] agpgart changes for 2.5.26

On Wed, 2002-07-17 at 21:36, Greg KH wrote:
> On Wed, Jul 17, 2002 at 09:30:56PM +0200, Dave Jones wrote:
> > > drivers/char/agp/via.c | 151 +
> >
> > Linus last comment mentioned via-agp.c, and the likes,
> > which I did in my tree, but haven't put up a diff yet.
> > I could dig those out for you, but you could probably
> > 'mv' them faster than I can chunk up the diff into pieces.
>
> But that would make:
> drivers/char/agp/via-agp.c
> which is redundant, as that file does not compile to a separate module,
> but gets linked to the larger agpgart.o like before.

Its only redundant until they day AGP does become a set of loadable
modules rather than one.

2002-07-17 23:30:23

by Greg KH

[permalink] [raw]
Subject: [BK PATCH] agpgart changes for 2.5.26 - take 2

Hi,

Ok, I've changed the resulting filenames based on everyone's comments.
Sorry for not catching that email from you the first time around.
Yes, the difftool output for these changes is quite messy, but they are
just 'bk mv' commands :)

These changesets have the latest agpgart code from the -dj tree, and
I've tried to rename the files to something that makes more sense.


Pull from: http://linuxusb.bkbits.net/agpgart-2.5

drivers/char/agp/agp.c | 1664 +++++++++++++
drivers/char/agp/agpgart_be-ali.c | 265 --
drivers/char/agp/agpgart_be-ali.c | 265 ++
drivers/char/agp/agpgart_be-amd.c | 408 ---
drivers/char/agp/agpgart_be-amd.c | 408 +++
drivers/char/agp/agpgart_be.c | 1662 -------------
drivers/char/agp/agpgart_be.c | 4470 +++--------------------------------
drivers/char/agp/agpgart_be-hp.c | 394 ---
drivers/char/agp/agpgart_be-hp.c | 394 +++
drivers/char/agp/agpgart_be-i460.c | 595 ----
drivers/char/agp/agpgart_be-i460.c | 595 ++++
drivers/char/agp/agpgart_be-i810.c | 594 ----
drivers/char/agp/agpgart_be-i810.c | 594 ++++
drivers/char/agp/agpgart_be-i8x0.c | 726 -----
drivers/char/agp/agpgart_be-i8x0.c | 728 +++++
drivers/char/agp/agpgart_be-sis.c | 142 -
drivers/char/agp/agpgart_be-sis.c | 142 +
drivers/char/agp/agpgart_be-sworks.c | 626 ----
drivers/char/agp/agpgart_be-sworks.c | 626 ++++
drivers/char/agp/agpgart_be-via.c | 151 -
drivers/char/agp/agpgart_be-via.c | 151 +
drivers/char/agp/agpgart_fe.c | 1086 --------
drivers/char/agp/agpgart_fe.c | 15
drivers/char/agp/agp.h | 348 +-
drivers/char/agp/ali-agp.c | 265 ++
drivers/char/agp/ali.c | 265 --
drivers/char/agp/ali.c | 265 ++
drivers/char/agp/amd-agp.c | 408 +++
drivers/char/agp/amd.c | 408 ---
drivers/char/agp/amd.c | 408 +++
drivers/char/agp/Config.help | 88
drivers/char/agp/Config.in | 14
drivers/char/agp/frontend.c | 1086 ++++++++
drivers/char/agp/hp-agp.c | 394 +++
drivers/char/agp/hp.c | 394 ---
drivers/char/agp/hp.c | 394 +++
drivers/char/agp/i460-agp.c | 595 ++++
drivers/char/agp/i460.c | 595 ----
drivers/char/agp/i460.c | 595 ++++
drivers/char/agp/i810-agp.c | 594 ++++
drivers/char/agp/i810.c | 594 ----
drivers/char/agp/i810.c | 594 ++++
drivers/char/agp/i8x0-agp.c | 726 +++++
drivers/char/agp/i8x0.c | 726 -----
drivers/char/agp/i8x0.c | 726 +++++
drivers/char/agp/Makefile | 53
drivers/char/agp/sis-agp.c | 142 +
drivers/char/agp/sis.c | 142 -
drivers/char/agp/sis.c | 142 +
drivers/char/agp/sworks-agp.c | 626 ++++
drivers/char/agp/sworks.c | 626 ----
drivers/char/agp/sworks.c | 626 ++++
drivers/char/agp/via-agp.c | 151 +
drivers/char/agp/via.c | 151 -
drivers/char/agp/via.c | 151 +
include/linux/agp_backend.h | 6
include/linux/agpgart.h | 10
57 files changed, 15310 insertions(+), 14699 deletions(-)
------

[email protected], 2002-07-17 16:16:42-07:00, [email protected]
agpgart: added "-agp" to the .c files that are for specific hardware types, based on mailing list comments.

drivers/char/agp/ali.c | 265 ---------------
drivers/char/agp/amd.c | 408 -----------------------
drivers/char/agp/hp.c | 394 ----------------------
drivers/char/agp/i460.c | 595 ----------------------------------
drivers/char/agp/i810.c | 594 ----------------------------------
drivers/char/agp/i8x0.c | 726 ------------------------------------------
drivers/char/agp/sis.c | 142 --------
drivers/char/agp/sworks.c | 626 ------------------------------------
drivers/char/agp/via.c | 151 --------
drivers/char/agp/Makefile | 18 -
drivers/char/agp/ali-agp.c | 265 +++++++++++++++
drivers/char/agp/amd-agp.c | 408 +++++++++++++++++++++++
drivers/char/agp/hp-agp.c | 394 ++++++++++++++++++++++
drivers/char/agp/i460-agp.c | 595 ++++++++++++++++++++++++++++++++++
drivers/char/agp/i810-agp.c | 594 ++++++++++++++++++++++++++++++++++
drivers/char/agp/i8x0-agp.c | 726 ++++++++++++++++++++++++++++++++++++++++++
drivers/char/agp/sis-agp.c | 142 ++++++++
drivers/char/agp/sworks-agp.c | 626 ++++++++++++++++++++++++++++++++++++
drivers/char/agp/via-agp.c | 151 ++++++++
19 files changed, 3910 insertions(+), 3910 deletions(-)
------

[email protected], 2002-07-15 11:54:20-07:00, [email protected]
agpgart: added agp prefix to the debug printk

drivers/char/agp/agp.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
------

[email protected], 2002-07-15 11:46:17-07:00, [email protected]
agpgart: renamed the agp files to make more sense

drivers/char/agp/agpgart_be-ali.c | 265 -----
drivers/char/agp/agpgart_be-amd.c | 408 --------
drivers/char/agp/agpgart_be-hp.c | 394 --------
drivers/char/agp/agpgart_be-i460.c | 595 ------------
drivers/char/agp/agpgart_be-i810.c | 594 ------------
drivers/char/agp/agpgart_be-i8x0.c | 726 ---------------
drivers/char/agp/agpgart_be-sis.c | 142 --
drivers/char/agp/agpgart_be-sworks.c | 626 -------------
drivers/char/agp/agpgart_be-via.c | 151 ---
drivers/char/agp/agpgart_be.c | 1662 -----------------------------------
drivers/char/agp/agpgart_fe.c | 1086 ----------------------
drivers/char/agp/Makefile | 22
drivers/char/agp/agp.c | 1662 +++++++++++++++++++++++++++++++++++
drivers/char/agp/ali.c | 265 +++++
drivers/char/agp/amd.c | 408 ++++++++
drivers/char/agp/frontend.c | 1086 ++++++++++++++++++++++
drivers/char/agp/hp.c | 394 ++++++++
drivers/char/agp/i460.c | 595 ++++++++++++
drivers/char/agp/i810.c | 594 ++++++++++++
drivers/char/agp/i8x0.c | 726 +++++++++++++++
drivers/char/agp/sis.c | 142 ++
drivers/char/agp/sworks.c | 626 +++++++++++++
drivers/char/agp/via.c | 151 +++
23 files changed, 6660 insertions(+), 6660 deletions(-)
------

[email protected], 2002-07-15 10:33:27-07:00, [email protected]
agpgart: fix syntax error in the i8x0 file.

drivers/char/agp/agpgart_be-i8x0.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
------

[email protected], 2002-07-15 10:26:18-07:00, [email protected]
agpgart: Split agpgart code into separate files.

The majority of this work was done by Dave Jones, I merely converted the
driver to the "new" pci api.

drivers/char/agp/Config.help | 88
drivers/char/agp/Config.in | 14
drivers/char/agp/Makefile | 13
drivers/char/agp/agp.h | 348 +-
drivers/char/agp/agpgart_be-ali.c | 265 ++
drivers/char/agp/agpgart_be-amd.c | 408 +++
drivers/char/agp/agpgart_be-hp.c | 394 +++
drivers/char/agp/agpgart_be-i460.c | 595 ++++
drivers/char/agp/agpgart_be-i810.c | 594 ++++
drivers/char/agp/agpgart_be-i8x0.c | 726 +++++
drivers/char/agp/agpgart_be-sis.c | 142 +
drivers/char/agp/agpgart_be-sworks.c | 626 ++++
drivers/char/agp/agpgart_be-via.c | 151 +
drivers/char/agp/agpgart_be.c | 4470 +++--------------------------------
drivers/char/agp/agpgart_fe.c | 15
include/linux/agp_backend.h | 6
include/linux/agpgart.h | 10
17 files changed, 4738 insertions(+), 4127 deletions(-)
------