Re: [Dri-devel] Kernel tree CVS merge..
On Gwe, 2003-08-15 at 01:13, Dave Airlie wrote: > > +config DRM_SIS > > + tristate "SiS video cards" > > + depends on DRM && AGP && FB_SIS > > + help > > + Choose this option if you have a SiS 630 or compatibel video Typo - compaible, also only works with XFree 4.2 > > --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: [Dri-devel] Kernel tree CVS merge..
On Thu, 2003-08-14 at 22:31, Linus Torvalds wrote: > Ok, > I just did another kernel merge to pick up the i810 compatibility bits, > and decided it is time to try to merge back some of the stuff that has > accumulated in the standard kernel and that makes it more painful than > necessary to examine the diffs for differences. Looks good to me (even though some parts don't adhere to Werner's One True Style ;), I've committed everything that Dave didn't do already. Thanks! -- Earthling Michel Dänzer \ Debian (powerpc), XFree86 and DRI developer Software libre enthusiast \ http://svcs.affero.net/rm.php?r=daenzer --- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa0013ave/direct;at.aspnet_072303_01/01 ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: [Dri-devel] Kernel tree CVS merge..
Okay I've applied my piece along with a number of other similiar
whitespace cleanups .. to align with the kernel style ..
Dave.
On Fri, 15 Aug 2003, Dave Airlie wrote:
>
> okay I'm happy to apply the i810 portion and will do so soon, someone else
> want to look after the other pieces or should I do them also?
>
> Dave.
>
> On Thu, 14 Aug 2003, Linus Torvalds wrote:
>
> >
> > Ok,
> > I just did another kernel merge to pick up the i810 compatibility bits,
> > and decided it is time to try to merge back some of the stuff that has
> > accumulated in the standard kernel and that makes it more painful than
> > necessary to examine the diffs for differences.
> >
> > This is mostly whitespace changes (some of it new from Dave Jones, some of
> > it quite old), and some other minor things: moving some counter and lock
> > initializations slightly earlier to where the data structure they are in
> > are allocated and initialized, so that interrupts can't even by mistake
> > see them partially done.
> >
> > It also removes the printk() for the AGP version, since that is actually
> > done by the AGP layer anyway.
> >
> > I'd appreciate it if all (or even most) of this could find itself back
> > into the DRI CVS tree, to make it easier to read the code and merge it
> > (some of the whitespace fixes are literally broken whitespace in the DRI
> > tree - comments that end up being in strange columns etc).
> >
> > Apart from moving some initializations around and the aforementioned
> > printk removal, this should not actually affect semantics at all.
> >
> > Oh, and the thing will apply with a few offsets, since I edited the patch
> > to remove stuff that you don't want at this point. My tree doesn't contain
> > all of the 2.4.x compatibility crud etc.
> >
> > You can apply (or not apply) everything independently, so feel free to
> > cherry-pick the patches. I did edit out anything that looked even remotely
> > like it could cause discussion (ie this does _not_ contain the
> > "cpu_relax()" stuff that I have in my tree, for example).
> >
> > Thanks,
> >
> > Linus
> > -
> > diff -u --recursive /home/torvalds/dri-kernel/Kconfig ./Kconfig
> > --- /home/torvalds/dri-kernel/Kconfig 2003-04-22 14:30:23.0 -0700
> > +++ ./Kconfig 2003-08-14 13:05:45.137737925 -0700
> > @@ -24,10 +24,10 @@
> >
> > config DRM_GAMMA
> > tristate "3dlabs GMX 2000"
> > - depends on DRM && n
> > + depends on DRM
> > help
> > - This is the old gamma driver, disabled for now unless somebody
> > - tells me it actually might work.
> > + This is the old gamma driver, please tell me if it might actually
> > + work.
> >
> > config DRM_R128
> > tristate "ATI Rage 128"
> > @@ -49,7 +49,7 @@
> >
> > config DRM_I810
> > tristate "Intel I810"
> > - depends on DRM && AGP
> > + depends on DRM && AGP && AGP_INTEL
> > help
> > Choose this option if you have an Intel I810 graphics card. If M is
> > selected, the module will be called i810. AGP support is required
> > @@ -57,7 +57,7 @@
> >
> > config DRM_I830
> > tristate "Intel 830M, 845G, 852GM, 855GM, 865G"
> > - depends on DRM && AGP
> > + depends on DRM && AGP && AGP_INTEL
> > help
> > Choose this option if you have a system that has Intel 830M, 845G,
> > 852GM, 855GM or 865G integrated graphics. If M is selected, the
> > @@ -72,3 +72,12 @@
> > Choose this option if you have a Matrox G200, G400 or G450 graphics
> > card. If M is selected, the module will be called mga. AGP
> > support is required for this driver to work.
> > +
> > +config DRM_SIS
> > + tristate "SiS video cards"
> > + depends on DRM && AGP && FB_SIS
> > + help
> > + Choose this option if you have a SiS 630 or compatibel video
> > + chipset. If M is selected the module will be called sis. AGP
> > + and SiS FB support is required for this driver to work.
> > +
> > diff -u --recursive /home/torvalds/dri-kernel/drm_agpsupport.h ./drm_agpsupport.h
> > --- /home/torvalds/dri-kernel/drm_agpsupport.h 2003-07-25 20:04:22.0
> > -0700
> > +++ ./drm_agpsupport.h 2003-08-14 13:05:45.361704630 -0700
> > @@ -106,7 +105,8 @@
> > if ( dev->agp->cant_use_aperture )
> > return -EINVAL;
> > #endif
> > - if ((retcode = drm_agp->acquire())) return retcode;
> > + if ((retcode = drm_agp->acquire()))
> > + return retcode;
> > dev->agp->acquired = 1;
> > return 0;
> > }
> > @@ -147,7 +143,8 @@
> > */
> > void DRM(agp_do_release)(void)
> > {
> > - if (drm_agp->release) drm_agp->release();
> > + if (drm_agp->release)
> > + drm_agp->release();
> > }
> >
> > /**
> > @@ -201,7 +198,8 @@
> > unsigned longpages;
> > u32 type;
> >
> > - if (!dev->agp || !dev->agp->acquired) return -EINVAL;
> > + if (!dev->agp || !dev->agp->acquired)
> > + return -EINVAL;
> > if (copy_from_user(&reques
Re: [Dri-devel] Kernel tree CVS merge..
okay I'm happy to apply the i810 portion and will do so soon, someone else
want to look after the other pieces or should I do them also?
Dave.
On Thu, 14 Aug 2003, Linus Torvalds wrote:
>
> Ok,
> I just did another kernel merge to pick up the i810 compatibility bits,
> and decided it is time to try to merge back some of the stuff that has
> accumulated in the standard kernel and that makes it more painful than
> necessary to examine the diffs for differences.
>
> This is mostly whitespace changes (some of it new from Dave Jones, some of
> it quite old), and some other minor things: moving some counter and lock
> initializations slightly earlier to where the data structure they are in
> are allocated and initialized, so that interrupts can't even by mistake
> see them partially done.
>
> It also removes the printk() for the AGP version, since that is actually
> done by the AGP layer anyway.
>
> I'd appreciate it if all (or even most) of this could find itself back
> into the DRI CVS tree, to make it easier to read the code and merge it
> (some of the whitespace fixes are literally broken whitespace in the DRI
> tree - comments that end up being in strange columns etc).
>
> Apart from moving some initializations around and the aforementioned
> printk removal, this should not actually affect semantics at all.
>
> Oh, and the thing will apply with a few offsets, since I edited the patch
> to remove stuff that you don't want at this point. My tree doesn't contain
> all of the 2.4.x compatibility crud etc.
>
> You can apply (or not apply) everything independently, so feel free to
> cherry-pick the patches. I did edit out anything that looked even remotely
> like it could cause discussion (ie this does _not_ contain the
> "cpu_relax()" stuff that I have in my tree, for example).
>
> Thanks,
>
> Linus
> -
> diff -u --recursive /home/torvalds/dri-kernel/Kconfig ./Kconfig
> --- /home/torvalds/dri-kernel/Kconfig 2003-04-22 14:30:23.0 -0700
> +++ ./Kconfig 2003-08-14 13:05:45.137737925 -0700
> @@ -24,10 +24,10 @@
>
> config DRM_GAMMA
> tristate "3dlabs GMX 2000"
> - depends on DRM && n
> + depends on DRM
> help
> - This is the old gamma driver, disabled for now unless somebody
> - tells me it actually might work.
> + This is the old gamma driver, please tell me if it might actually
> + work.
>
> config DRM_R128
> tristate "ATI Rage 128"
> @@ -49,7 +49,7 @@
>
> config DRM_I810
> tristate "Intel I810"
> - depends on DRM && AGP
> + depends on DRM && AGP && AGP_INTEL
> help
> Choose this option if you have an Intel I810 graphics card. If M is
> selected, the module will be called i810. AGP support is required
> @@ -57,7 +57,7 @@
>
> config DRM_I830
> tristate "Intel 830M, 845G, 852GM, 855GM, 865G"
> - depends on DRM && AGP
> + depends on DRM && AGP && AGP_INTEL
> help
> Choose this option if you have a system that has Intel 830M, 845G,
> 852GM, 855GM or 865G integrated graphics. If M is selected, the
> @@ -72,3 +72,12 @@
> Choose this option if you have a Matrox G200, G400 or G450 graphics
> card. If M is selected, the module will be called mga. AGP
> support is required for this driver to work.
> +
> +config DRM_SIS
> + tristate "SiS video cards"
> + depends on DRM && AGP && FB_SIS
> + help
> + Choose this option if you have a SiS 630 or compatibel video
> + chipset. If M is selected the module will be called sis. AGP
> + and SiS FB support is required for this driver to work.
> +
> diff -u --recursive /home/torvalds/dri-kernel/drm_agpsupport.h ./drm_agpsupport.h
> --- /home/torvalds/dri-kernel/drm_agpsupport.h2003-07-25 20:04:22.0
> -0700
> +++ ./drm_agpsupport.h2003-08-14 13:05:45.361704630 -0700
> @@ -106,7 +105,8 @@
> if ( dev->agp->cant_use_aperture )
> return -EINVAL;
> #endif
> - if ((retcode = drm_agp->acquire())) return retcode;
> + if ((retcode = drm_agp->acquire()))
> + return retcode;
> dev->agp->acquired = 1;
> return 0;
> }
> @@ -147,7 +143,8 @@
> */
> void DRM(agp_do_release)(void)
> {
> - if (drm_agp->release) drm_agp->release();
> + if (drm_agp->release)
> + drm_agp->release();
> }
>
> /**
> @@ -201,7 +198,8 @@
> unsigned longpages;
> u32 type;
>
> - if (!dev->agp || !dev->agp->acquired) return -EINVAL;
> + if (!dev->agp || !dev->agp->acquired)
> + return -EINVAL;
> if (copy_from_user(&request, (drm_agp_buffer_t *)arg, sizeof(request)))
> return -EFAULT;
> if (!(entry = DRM(alloc)(sizeof(*entry), DRM_MEM_AGPLISTS)))
> @@ -227,11 +225,12 @@
> entry->pages = pages;
> entry->prev = NULL;
> entry->next = dev->agp->memory;
> - if (dev->agp->memory) dev->agp->memory->prev
[Dri-devel] Kernel tree CVS merge..
Ok,
I just did another kernel merge to pick up the i810 compatibility bits,
and decided it is time to try to merge back some of the stuff that has
accumulated in the standard kernel and that makes it more painful than
necessary to examine the diffs for differences.
This is mostly whitespace changes (some of it new from Dave Jones, some of
it quite old), and some other minor things: moving some counter and lock
initializations slightly earlier to where the data structure they are in
are allocated and initialized, so that interrupts can't even by mistake
see them partially done.
It also removes the printk() for the AGP version, since that is actually
done by the AGP layer anyway.
I'd appreciate it if all (or even most) of this could find itself back
into the DRI CVS tree, to make it easier to read the code and merge it
(some of the whitespace fixes are literally broken whitespace in the DRI
tree - comments that end up being in strange columns etc).
Apart from moving some initializations around and the aforementioned
printk removal, this should not actually affect semantics at all.
Oh, and the thing will apply with a few offsets, since I edited the patch
to remove stuff that you don't want at this point. My tree doesn't contain
all of the 2.4.x compatibility crud etc.
You can apply (or not apply) everything independently, so feel free to
cherry-pick the patches. I did edit out anything that looked even remotely
like it could cause discussion (ie this does _not_ contain the
"cpu_relax()" stuff that I have in my tree, for example).
Thanks,
Linus
-
diff -u --recursive /home/torvalds/dri-kernel/Kconfig ./Kconfig
--- /home/torvalds/dri-kernel/Kconfig 2003-04-22 14:30:23.0 -0700
+++ ./Kconfig 2003-08-14 13:05:45.137737925 -0700
@@ -24,10 +24,10 @@
config DRM_GAMMA
tristate "3dlabs GMX 2000"
- depends on DRM && n
+ depends on DRM
help
- This is the old gamma driver, disabled for now unless somebody
- tells me it actually might work.
+ This is the old gamma driver, please tell me if it might actually
+ work.
config DRM_R128
tristate "ATI Rage 128"
@@ -49,7 +49,7 @@
config DRM_I810
tristate "Intel I810"
- depends on DRM && AGP
+ depends on DRM && AGP && AGP_INTEL
help
Choose this option if you have an Intel I810 graphics card. If M is
selected, the module will be called i810. AGP support is required
@@ -57,7 +57,7 @@
config DRM_I830
tristate "Intel 830M, 845G, 852GM, 855GM, 865G"
- depends on DRM && AGP
+ depends on DRM && AGP && AGP_INTEL
help
Choose this option if you have a system that has Intel 830M, 845G,
852GM, 855GM or 865G integrated graphics. If M is selected, the
@@ -72,3 +72,12 @@
Choose this option if you have a Matrox G200, G400 or G450 graphics
card. If M is selected, the module will be called mga. AGP
support is required for this driver to work.
+
+config DRM_SIS
+ tristate "SiS video cards"
+ depends on DRM && AGP && FB_SIS
+ help
+ Choose this option if you have a SiS 630 or compatibel video
+ chipset. If M is selected the module will be called sis. AGP
+ and SiS FB support is required for this driver to work.
+
diff -u --recursive /home/torvalds/dri-kernel/drm_agpsupport.h ./drm_agpsupport.h
--- /home/torvalds/dri-kernel/drm_agpsupport.h 2003-07-25 20:04:22.0 -0700
+++ ./drm_agpsupport.h 2003-08-14 13:05:45.361704630 -0700
@@ -106,7 +105,8 @@
if ( dev->agp->cant_use_aperture )
return -EINVAL;
#endif
- if ((retcode = drm_agp->acquire())) return retcode;
+ if ((retcode = drm_agp->acquire()))
+ return retcode;
dev->agp->acquired = 1;
return 0;
}
@@ -147,7 +143,8 @@
*/
void DRM(agp_do_release)(void)
{
- if (drm_agp->release) drm_agp->release();
+ if (drm_agp->release)
+ drm_agp->release();
}
/**
@@ -201,7 +198,8 @@
unsigned longpages;
u32 type;
- if (!dev->agp || !dev->agp->acquired) return -EINVAL;
+ if (!dev->agp || !dev->agp->acquired)
+ return -EINVAL;
if (copy_from_user(&request, (drm_agp_buffer_t *)arg, sizeof(request)))
return -EFAULT;
if (!(entry = DRM(alloc)(sizeof(*entry), DRM_MEM_AGPLISTS)))
@@ -227,11 +225,12 @@
entry->pages = pages;
entry->prev = NULL;
entry->next = dev->agp->memory;
- if (dev->agp->memory) dev->agp->memory->prev = entry;
+ if (dev->agp->memory)
+ dev->agp->memory->prev = entry;
dev->agp->memory = entry;
request.handle = entry->handle;
-request.physical = memory->physical;
+ request.physical = memory->physical;
if (copy_to_user((drm_agp_buffer_t *)arg, &
