PATCH: re-enable SiS direct render

From: Alan Cox (alan_at_lxorguk.ukuu.org.uk)
Date: 07/27/03

  • Next message: Rusty Russell: "Re: [PATCH] Remove module reference counting." 
    Date:	Sun, 27 Jul 2003 21:01:36 +0100
To: linux-kernel@vger.kernel.org, torvalds@osdl.org

    ((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"
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  • Next message: Rusty Russell: "Re: [PATCH] Remove module reference counting."

    Relevant Pages

    • Re: 2.5/2.6 NVidia (was Re: 2.4 vs 2.6 version of ioport.h)
      ... NVIDIA: AGP 4X successfully initialized ... IIRC, but possibly not the case in the 2.6 .config yet, is that any ... Copyright 2003 by Maurice Eugene Heskett, ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • [PATCH 2/2] ide: remove obsolete CONFIG_BLK_DEV_ADMA - cleanup arch
      ... Cleans up default config for various archs, removing ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Re: 2.6.12 Performance problems
      ... > The kernel is the standard kernel.org dowload ... > config with SMP turned off and the intel ethernet ... > card drivers as modules without any other ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Re: 2.6.12 Performance problems
      ... > The kernel is the standard kernel.org dowload ... > config with SMP turned off and the intel ethernet ... > card drivers as modules without any other ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Re: [PATCH] make miniconfig (take 2)
      ... script intercept signals and restore .config on the way out, ... fully reliable because kconfig overwrites .config and ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)