Hi Linus,
Please pull the 'agp-patches' branch from
ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git agp-patches
This contains a fix for a mapping race from Jan, some pci ids from via
via Greg, Intel bugfix + new pci ids, and bool/whitespace cleanups.
Dave.
drivers/char/agp/agp.h | 6 +-
drivers/char/agp/alpha-agp.c | 4 +-
drivers/char/agp/amd-k7-agp.c | 4 +-
drivers/char/agp/amd64-agp.c | 4 +-
drivers/char/agp/ati-agp.c | 4 +-
drivers/char/agp/backend.c | 16 ++--
drivers/char/agp/compat_ioctl.c | 2 +-
drivers/char/agp/efficeon-agp.c | 6 +-
drivers/char/agp/frontend.c | 12 +-
drivers/char/agp/generic.c | 35 +++---
drivers/char/agp/hp-agp.c | 6 +-
drivers/char/agp/i460-agp.c | 2 +-
drivers/char/agp/intel-agp.c | 235 +++++++++++++++++++++++++--------------
drivers/char/agp/nvidia-agp.c | 4 +-
drivers/char/agp/parisc-agp.c | 6 +-
drivers/char/agp/sgi-agp.c | 8 +-
drivers/char/agp/sworks-agp.c | 6 +-
drivers/char/agp/uninorth-agp.c | 10 +-
drivers/char/agp/via-agp.c | 13 ++-
include/linux/agp_backend.h | 16 +--
include/linux/agpgart.h | 4 +-
21 files changed, 235 insertions(+), 168 deletions(-)
commit 62c96b9d0917894c164aa3e474a3ff3bca1554ae
Author: Dave Airlie <[email protected]>
Date: Thu Jun 19 14:27:53 2008 +1000
agp/intel: cleanup some serious whitespace badness
Signed-off-by: Dave Airlie <[email protected]>
commit 25ce77abf8be3a96b3673e46722a9bd05f149584
Author: Zhenyu Wang <[email protected]>
Date: Thu Jun 19 14:17:58 2008 +1000
[AGP] intel_agp: Add support for Intel 4 series chipsets
Signed-off-by: Zhenyu Wang <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
commit 598d14482380312939a3e3a4ae0657eb6b50a532
Author: Zhenyu Wang <[email protected]>
Date: Thu Jun 19 14:00:37 2008 +1000
[AGP] intel_agp: extra stolen mem size available for IGD_GM chipset
This adds missing stolen memory size detect for IGD_GM, be sure to
detect right size as current X intel driver (2.3.2) which has already
worked out.
Signed-off-by: Zhenyu Wang <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
commit 9516b030b484fc99cf24213caf88df01f99248dd
Author: Dave Airlie <[email protected]>
Date: Thu Jun 19 10:42:17 2008 +1000
agp: more boolean conversions.
Signed-off-by: Dave Airlie <[email protected]>
commit c72580129209aaa509ace81c1f2ee1caa9c9774b
Author: Joe Perches <[email protected]>
Date: Wed Mar 26 14:10:02 2008 -0700
drivers/char/agp - use bool
Use boolean in AGP instead of having own TRUE/FALSE
--
Signed-off-by: Joe Perches <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
commit da503fa60b84d5945deb3ab74efdd0bec61df4a1
Author: Jan Beulich <[email protected]>
Date: Wed Jun 18 09:28:00 2008 +0100
agp: two-stage page destruction issue
besides it apparently being useful only in 2.6.24 (the changes in 2.6.25
really mean that it could be converted back to a single-stage mechanism),
I'm seeing an issue in Xen Dom0 kernels, which is caused by the calling
of gart_to_virt() in the second stage invocations of the destroy function.
I think that besides this being a real issue with Xen (where
unmap_page_from_agp() is not just a page table attribute change), this
also is invalid from a theoretical perspective: One should not assume that
gart_to_virt() is still valid after unmapping a page. So minimally (keeping
the 2-stage mechanism) a patch like the one below would be needed.
Jan
Signed-off-by: Dave Airlie <[email protected]>
commit dcd981a77b2b35d169656d4b9cee208096ed7ccf
Author: Greg KH <[email protected]>
Date: Thu Jun 19 09:52:26 2008 +1000
agp/via: fixup pci ids
add a new PCI ID and remove an old dodgy one, include the explaination
in the commented code so nobody readds later.
(davej also sent the pci id addition).
Signed-off-by: Dave Airlie <[email protected]>
On Thu, 19 Jun 2008, Dave Airlie wrote:
>
> commit 62c96b9d0917894c164aa3e474a3ff3bca1554ae
> Author: Dave Airlie <[email protected]>
> Date: Thu Jun 19 14:27:53 2008 +1000
>
> agp/intel: cleanup some serious whitespace badness
>
> Signed-off-by: Dave Airlie <[email protected]>
Aarghh!
This one does _not_ just clean up whitespace. It also does
@@ -1959,8 +1959,6 @@ static const struct agp_bridge_driver intel_i965_driver = {
.size_type = FIXED_APER_SIZE,
.num_aperture_sizes = 4,
.needs_scratch_page = true,
- .configure = intel_i915_configure,
- .fetch_size = intel_i9xx_fetch_size,
.cleanup = intel_i915_cleanup,
.tlb_flush = intel_i810_tlbflush,
.mask_memory = intel_i965_mask_memory,
which may well be all good, but it doesn't match the commit message.
I merged it, but please be more careful.
Linus
> On Thu, 19 Jun 2008, Dave Airlie wrote:
> >
> > commit 62c96b9d0917894c164aa3e474a3ff3bca1554ae
> > Author: Dave Airlie <[email protected]>
> > Date: Thu Jun 19 14:27:53 2008 +1000
> >
> > agp/intel: cleanup some serious whitespace badness
> >
> > Signed-off-by: Dave Airlie <[email protected]>
>
> Aarghh!
>
> This one does _not_ just clean up whitespace. It also does
>
> @@ -1959,8 +1959,6 @@ static const struct agp_bridge_driver intel_i965_driver = {
> .size_type = FIXED_APER_SIZE,
> .num_aperture_sizes = 4,
> .needs_scratch_page = true,
> - .configure = intel_i915_configure,
> - .fetch_size = intel_i9xx_fetch_size,
> .cleanup = intel_i915_cleanup,
> .tlb_flush = intel_i810_tlbflush,
> .mask_memory = intel_i965_mask_memory,
>
> which may well be all good, but it doesn't match the commit message.
>
> I merged it, but please be more careful.
>
DAMNIT.
I can't believe that happened, I going to stop doing whitespace cleanups
now, I just got shocked when I realised how much 7 space indents that file
has.
You are right please put back the two lines as per the attached patch.
Dave.
On 2008.06.19 05:41:27 +0100, Dave Airlie wrote:
>
> Hi Linus,
>
> Please pull the 'agp-patches' branch from
> ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git agp-patches
>
> This contains a fix for a mapping race from Jan, some pci ids from via
> via Greg, Intel bugfix + new pci ids, and bool/whitespace cleanups.
>
> Dave.
>
I'm sorry, Dave. This one seems missing from 4 series chipset enabling
patch, sorry I forgot those chipset flush setup, pls apply this.
Thanks.
[AGP] intel_agp: setup chipset flush like i965 for 4 series chipsets
Signed-off-by: Zhenyu Wang <[email protected]>
---
drivers/char/agp/intel-agp.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 1ae64bb..acc4bd5 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -947,8 +947,7 @@ static void intel_i9xx_setup_flush(void)
intel_private.ifp_resource.name = "Intel Flush Page";
intel_private.ifp_resource.flags = IORESOURCE_MEM;
- /* Setup chipset flush for 915 */
- if (IS_I965 || IS_G33) {
+ if (IS_I965 || IS_G33 || IS_G4X) {
intel_i965_g33_setup_chipset_flush();
} else {
intel_i915_setup_chipset_flush();
--
1.5.4
--
Open Source Technology Center, Intel ltd.
$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827