A simple patch for SIS (documentation and kbuild)

A simple patch for SIS (documentation and kbuild)

[Jean Paul Sartre]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 530 bytes --]

	Hello, all.

	As I've spoken with Alan Cox and Christoph Pittracher, there's a
problem with the dependency. I do not know who takes care of the
documentation stuff and kbuild procedures, but here they are.

	(okay. Building FB_SIS as module and DRM_SIS as builtin completely
*breaks* dependencies, so I did this to enforce them both as modules or
both as builtin)

	The patch is very simple, adds the Config.in 'if' and the
CONFIG_DRM_SIS description in Documentation/Configure.help.

	Thanks,
	Cesar Suga <sartre@linuxbr.com>



[-- Attachment #2: Type: TEXT/PLAIN, Size: 1123 bytes --]

--- linux/drivers/char/drm/Config.in	Tue Feb 19 23:32:56 2002
+++ linux/drivers/char/drm/Config.in	Tue Feb 19 23:32:46 2002
@@ -12,4 +12,6 @@
 dep_tristate '  Intel I810' CONFIG_DRM_I810 $CONFIG_AGP
 dep_tristate '  Intel 830M' CONFIG_DRM_I830 $CONFIG_AGP
 dep_tristate '  Matrox g200/g400' CONFIG_DRM_MGA $CONFIG_AGP
-dep_tristate '  SiS' CONFIG_DRM_SIS $CONFIG_AGP
+if [ "$CONFIG_FB_SIS" = "y" -o "$CONFIG_FB_SIS" = "m" ]; then
+  dep_tristate '  SiS' CONFIG_DRM_SIS $CONFIG_AGP $CONFIG_FB_SIS
+fi

--- linux/Documentation/Configure.help	Tue Feb 19 23:39:44 2002
+++ linux/Documentation/Configure.help	Tue Feb 19 23:38:48 2002
@@ -17166,6 +17166,12 @@
   card.  If M is selected, the module will be called mga.o.  AGP
   support is required for this driver to work.
 
+SiS 300/540/630
+CONFIG_DRM_SIS
+  Choose this option if you have a SIS 300, 540 or 630 graphics card.
+  If M is selected, the module will be called sis.o.  AGP support is
+  required for this driver to work.
+
 3dfx Banshee/Voodoo3+
 CONFIG_DRM40_TDFX
   Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),

Re: A simple patch for SIS (documentation and kbuild)

[Thomas Winischhofer]

Jean Paul Sartre wrote:

+SiS 300/540/630
+CONFIG_DRM_SIS
+  Choose this option if you have a SIS 300, 540 or 630 graphics card.
+  If M is selected, the module will be called sis.o.  AGP support is
+  required for this driver to work.

Before posting patches you'd better inform yourself. 

AGP is *not* required.

Thomas

-- 
Thomas Winischhofer
Vienna/Austria
mailto:tw@webit.com                  *** http://www.webit.com/tw

Re: A simple patch for SIS (documentation and kbuild)

[Cesar Suga]

On Wed, 20 Feb 2002, Thomas Winischhofer wrote:

> +SiS 300/540/630
> +CONFIG_DRM_SIS
> +  Choose this option if you have a SIS 300, 540 or 630 graphics card.
> +  If M is selected, the module will be called sis.o.  AGP support is
> +  required for this driver to work.

> Before posting patches you'd better inform yourself.

> AGP is *not* required.

	Ah, sorry. I didn't notice __MUST_HAVE_AGP to be zero. I'll take
care.

	Regards,
	Cesar Suga <sartre@linuxbr.com>

Re: A simple patch for SIS (documentation and kbuild)

[Thomas Winischhofer]

Cesar Suga wrote:
> 
> On Wed, 20 Feb 2002, Thomas Winischhofer wrote:
> 
> > +SiS 300/540/630
> > +CONFIG_DRM_SIS
> > +  Choose this option if you have a SIS 300, 540 or 630 graphics card.
> > +  If M is selected, the module will be called sis.o.  AGP support is
> > +  required for this driver to work.
> 
> > Before posting patches you'd better inform yourself.
> 
> > AGP is *not* required.
> 
>         Ah, sorry. I didn't notice __MUST_HAVE_AGP to be zero. I'll take
> care.

I'd recommend the following dependencies:

Rule 1:
If SiS DRM is selected, SiS framebuffer *MUST* be selected as well

Rule 2:
If SiS framebuffer is a MODULE, SiS DRM *MUST* be a MODULE, too

Rule 3:
If SiS DRM is compiled into the kernel (which I don't recommend), sisfb
*MUST* be compiled into the kernel, too.

(SiS framebuffer can be inside the kernel, in this case DRM can be a
module)

Thomas


-- 
Thomas Winischhofer
Vienna/Austria
mailto:tw@webit.com                  *** http://www.webit.com/tw