Re: 2.6.11-rc2-mm1

[Brice Goglin]

Dave Jones a écrit :
> This is needed too on top of -mm1.
>
> diff -Nru a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
> --- a/drivers/char/agp/generic.c	2005-01-25 14:34:24 -05:00
> +++ b/drivers/char/agp/generic.c	2005-01-25 14:34:24 -05:00
> @@ -324,9 +324,9 @@
>  	info->chipset = agp_bridge->type;
>  	info->device = agp_bridge->dev;
>  	if (check_bridge_mode(agp_bridge->dev))
> -		info->mode = agp_bridge->mode & AGP3_RESERVED_MASK;
> +		info->mode = agp_bridge->mode & ~AGP3_RESERVED_MASK;
>  	else
> -		info->mode = agp_bridge->mode & AGP2_RESERVED_MASK;
> +		info->mode = agp_bridge->mode & ~AGP2_RESERVED_MASK;
>  	info->aper_base = agp_bridge->gart_bus_addr;
>  	info->aper_size = agp_return_size();
>  	info->max_memory = agp_bridge->max_memory_agp;

Maybe that's not important, but on top of my -rc2-mm1, your patch looks like the
one I attached to this mail.

Regards,
Brice
diff -Nru a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
--- a/drivers/char/agp/generic.c	2005-01-25 14:34:24 -05:00
+++ b/drivers/char/agp/generic.c	2005-01-25 14:34:24 -05:00
@@ -328,9 +328,9 @@
 	info->chipset = SUPPORTED;
 	info->device = bridge->dev;
 	if (check_bridge_mode(bridge->dev))
-		info->mode = bridge->mode & AGP3_RESERVED_MASK;
+		info->mode = bridge->mode & ~AGP3_RESERVED_MASK;
 	else
-		info->mode = bridge->mode & AGP2_RESERVED_MASK;
+		info->mode = bridge->mode & ~AGP2_RESERVED_MASK;
 	info->mode = bridge->mode;
 	info->aper_base = bridge->gart_bus_addr;
 	info->aper_size = agp_return_size();