linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: linux-kernel@vger.kernel.org, torvalds@osdl.org
Subject: PATCH: re-enable SiS direct render
Date: Sun, 27 Jul 2003 21:01:36 +0100	[thread overview]
Message-ID: <200307272001.h6RK1aNo029580@hraefn.swansea.linux.org.uk> (raw)

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 2126 bytes --]

((Gaël Le Mignot)
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/drivers/char/drm/Kconfig linux-2.6.0-test2-ac1/drivers/char/drm/Kconfig
--- linux-2.6.0-test2/drivers/char/drm/Kconfig	2003-07-10 21:13:38.000000000 +0100
+++ linux-2.6.0-test2-ac1/drivers/char/drm/Kconfig	2003-07-23 18:48:09.000000000 +0100
@@ -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
+	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
+          support is required for this driver to work.
+
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/drivers/char/drm/Makefile linux-2.6.0-test2-ac1/drivers/char/drm/Makefile
--- linux-2.6.0-test2/drivers/char/drm/Makefile	2003-07-10 21:14:54.000000000 +0100
+++ linux-2.6.0-test2-ac1/drivers/char/drm/Makefile	2003-07-23 18:48:09.000000000 +0100
@@ -10,6 +10,7 @@
 i830-objs   := i830_drv.o i830_dma.o i830_irq.o
 radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o
 ffb-objs    := ffb_drv.o ffb_context.o
+sis-objs    := sis_drv.o sis_ds.o sis_mm.o
 
 obj-$(CONFIG_DRM_GAMMA) += gamma.o
 obj-$(CONFIG_DRM_TDFX)	+= tdfx.o
@@ -19,3 +20,5 @@
 obj-$(CONFIG_DRM_I810)	+= i810.o
 obj-$(CONFIG_DRM_I830)	+= i830.o
 obj-$(CONFIG_DRM_FFB)   += ffb.o
+obj-$(CONFIG_DRM_SIS)   += sis.o
+
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/drivers/char/drm/sis_mm.c linux-2.6.0-test2-ac1/drivers/char/drm/sis_mm.c
--- linux-2.6.0-test2/drivers/char/drm/sis_mm.c	2003-07-10 21:12:16.000000000 +0100
+++ linux-2.6.0-test2-ac1/drivers/char/drm/sis_mm.c	2003-07-23 18:48:09.000000000 +0100
@@ -28,8 +28,9 @@
  * 
  */
 
+#include <linux/config.h>
 #include "sis.h"
-#include <linux/sisfb.h>
+#include "video/sisfb.h"
 #include "drmP.h"
 #include "sis_drm.h"
 #include "sis_drv.h"

                 reply	other threads:[~2003-07-28  2:25 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200307272001.h6RK1aNo029580@hraefn.swansea.linux.org.uk \
    --to=alan@lxorguk.ukuu.org.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).