[PATCH] fix undefined reference for sis drm.

[PATCH] fix undefined reference for sis drm.

[Geoffrey Lee]

[-- Attachment #1: Type: text/plain, Size: 442 bytes --]

Hi all,


This fixes a bug where where if sis fb is not set and sis drm is
selected then there will be undefined references to sis_malloc() and
sis_free().

What I've done is a sort of a bandaid because I don't have hardware
to fix and test. 


	-- G.
-- 
char p[] = "\xeb\x1f\x5e\x89\x76\x08\x31\xc0\x88\x46\x07\x89\x46\x0c\xb0\x0b"
  "\x89\xf3\x8d\x4e\x08\x8d\x56\x0c\xcd\x80\x31\xdb\x89\xd8\x40\xcd"
  "\x80\xe8\xdc\xff\xff\xff/bin/sh";



[-- Attachment #2: Config.in.patch --]
[-- Type: text/plain, Size: 529 bytes --]

--- linux-2.4.21/drivers/char/drm/Config.in.orig	Thu Mar  6 21:06:47 2003
+++ linux-2.4.21/drivers/char/drm/Config.in	Thu Mar  6 21:09:26 2003
@@ -13,4 +13,6 @@
 dep_mbool    '    Enabled XFree 4.1 ioctl interface by default' CONFIG_DRM_I810_XFREE_41 $CONFIG_DRM_I810
 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" ]; then
+   dep_tristate '  SiS' CONFIG_DRM_SIS $CONFIG_AGP
+fi

[-- Attachment #3: Configure.help.patch --]
[-- Type: text/plain, Size: 536 bytes --]

--- linux-2.4.21/Documentation/Configure.help.orig	Thu Mar  6 21:07:02 2003
+++ linux-2.4.21/Documentation/Configure.help	Thu Mar  6 21:08:26 2003
@@ -26277,6 +26277,9 @@
   Choose this option if you have a SIS graphics card. AGP support is
   required for this driver to work.
 
+  You will also be required to have support for SIS frame buffer as
+  it requires a few routines from it.
+
 Etrax Ethernet slave support (over lp0/1)
 CONFIG_ETRAX_ETHERNET_LPSLAVE
   This option enables a slave ETRAX 100 or ETRAX 100LX, connected to a

Re: [PATCH] fix undefined reference for sis drm.

[Geoffrey Lee]

> 
> Direct render occurs before the frame buffer so it doesn't work
> In addition you can have both modular so you'd want to make it
> 
> dep_tristate '   SiS' CONFIG_DRM_SIS $CONFIG_AGP $CONFIG_FB_SIS
> 
> even if the order worked out.


Hm, yes indeed.  Please apply the correct fix to your tree.

Sorry about the botched fix.


	-- G.

-- 
char p[] = "\xeb\x1f\x5e\x89\x76\x08\x31\xc0\x88\x46\x07\x89\x46\x0c\xb0\x0b"
  "\x89\xf3\x8d\x4e\x08\x8d\x56\x0c\xcd\x80\x31\xdb\x89\xd8\x40\xcd"
  "\x80\xe8\xdc\xff\xff\xff/bin/sh";

Re: [PATCH] fix undefined reference for sis drm.

[Alan Cox]

On Thu, 2003-03-06 at 10:10, Geoffrey Lee wrote:
> Hi all,
> 
> 
> This fixes a bug where where if sis fb is not set and sis drm is
> selected then there will be undefined references to sis_malloc() and
> sis_free().
> 
> What I've done is a sort of a bandaid because I don't have hardware
> to fix and test. 

Direct render occurs before the frame buffer so it doesn't work
In addition you can have both modular so you'd want to make it

dep_tristate '   SiS' CONFIG_DRM_SIS $CONFIG_AGP $CONFIG_FB_SIS

even if the order worked out.