Skip to contentSkip to conversation

drm: sis depends on FB_SIS

PATCH In review Randy Dunlap 3 participants 8 messages Aug 7, 2008 – Aug 19, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm: sis depends on FB_SIS

From: Randy Dunlap <[email protected]>
cc: [email protected]

drm/sis calls mm functions in fb/sis, so make the former depend on the latter.

This one happened with FB_SIS=m, AGP_SIS=y, DRM_SYS=y.

sis1.out:sis_mm.c:(.text+0x70014): undefined reference to sis_free' sis1.out:sis_mm.c:(.text+0x7002a): undefined reference to sis_malloc'

---
 drivers/gpu/drm/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/Kconfig +1 -1
@@ -86,7 +86,7 @@ config DRM_MGA
 
 config DRM_SIS
 	tristate "SiS video cards"
-	depends on DRM && AGP
+	depends on DRM && AGP && FB_SIS
 	help
 	  Choose this option if you have a SiS 630 or compatible video
           chipset. If M is selected the module will be called sis. AGP

---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/

#1 lore raw
Quoted 7 lines

From: Randy Dunlap <[email protected]>
cc: [email protected]

drm/sis calls mm functions in fb/sis, so make the former depend on the latter.

Quoted 6 lines

This one happened with FB_SIS=m, AGP_SIS=y, DRM_SYS=y.

sis1.out:sis_mm.c:(.text+0x70014): undefined reference to sis_free' sis1.out:sis_mm.c:(.text+0x7002a): undefined reference to sis_malloc'

NAK but I've no idea what the right answer is.

If someone asks for sisfb then sis drm uses code from it, if they don't ask for it it doesn't. So I want sisfb to be built in if its selected and sis drm is built-in.

Maybe I should just rip the dependency out completely, but this patch will break stuff badly, if someone was using the SIS DRM without sisfb.

Dave.

Quoted 23 lines
---
 drivers/gpu/drm/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/Kconfig +1 -2
@@ -86,7 +86,7 @@ config DRM_MGA
 
 config DRM_SIS
 	tristate "SiS video cards"
-	depends on DRM && AGP
+	depends on DRM && AGP && FB_SIS
 	help
 	  Choose this option if you have a SiS 630 or compatible video
           chipset. If M is selected the module will be called sis. AGP
 
 
---

~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/

#2 lore raw
Quoted 7 lines · On Fri, 8 Aug 2008 00:09:42 +0100 (IST) Dave Airlie wrote:
Quoted 7 lines

From: Randy Dunlap <[email protected]>
cc: [email protected]

drm/sis calls mm functions in fb/sis, so make the former depend on the latter.

Quoted 8 lines
Quoted 6 lines

This one happened with FB_SIS=m, AGP_SIS=y, DRM_SYS=y.

sis1.out:sis_mm.c:(.text+0x70014): undefined reference to sis_free' sis1.out:sis_mm.c:(.text+0x7002a): undefined reference to sis_malloc'

NAK but I've no idea what the right answer is.

I sort of expected a NAK. Is OK.

Quoted 3 lines

If someone asks for sisfb then sis drm uses code from it, if they don't ask for it it doesn't. So I want sisfb to be built in if its selected and sis drm is built-in.

config DRM_SIS
select FB_SIS

might do it.

Quoted 13 lines

Maybe I should just rip the dependency out completely, but this patch will break stuff badly, if someone was using the SIS DRM without sisfb.

Dave.

Quoted 8 lines
---
 drivers/gpu/drm/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/Kconfig +0 -0
@@ -86,7 +86,7 @@ config DRM_MGA
 
Quoted 7 lines

drivers/gpu/drm/Kconfig config DRM_MGA · line 92

Quoted 7 lines
drivers/gpu/drm/Kconfig +1 -1
 config DRM_SIS
 	tristate "SiS video cards"
-	depends on DRM && AGP
+	depends on DRM && AGP && FB_SIS
 	help
 	  Choose this option if you have a SiS 630 or compatible video
           chipset. If M is selected the module will be called sis. AGP

---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/

#3 lore raw
Quoted 7 lines
Quoted 4 lines

If someone asks for sisfb then sis drm uses code from it, if they don't ask for it it doesn't. So I want sisfb to be built in if its selected and sis drm is built-in.

config DRM_SIS
select FB_SIS

Maybe the other way around, I don't want DRM_SIS influencing whether FB_SIS is on or off, if the user wants sisfb on, then when they select it, DRM_SIS should be built in the same way. But if sisfb isn't selected by the user, then selecting DRM_SIS shouldn't enable it.

Dave.

Quoted 30 lines

might do it.

Quoted 13 lines

Maybe I should just rip the dependency out completely, but this patch will break stuff badly, if someone was using the SIS DRM without sisfb.

Dave.

Quoted 8 lines
---
 drivers/gpu/drm/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/Kconfig +0 -0
@@ -86,7 +86,7 @@ config DRM_MGA
 
Quoted 7 lines

drivers/gpu/drm/Kconfig config DRM_MGA · line 92

Quoted 7 lines
drivers/gpu/drm/Kconfig +1 -1
 config DRM_SIS
 	tristate "SiS video cards"
-	depends on DRM && AGP
+	depends on DRM && AGP && FB_SIS
 	help
 	  Choose this option if you have a SiS 630 or compatible video
           chipset. If M is selected the module will be called sis. AGP

---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/

#4 lore raw
Quoted 5 lines · Dave Airlie
Quoted 5 lines
Quoted 4 lines

If someone asks for sisfb then sis drm uses code from it, if they don't ask for it it doesn't. So I want sisfb to be built in if its selected and sis drm is built-in.

Quoted 7 lines
Quoted 2 lines

config DRM_SIS
select FB_SIS

Maybe the other way around, I don't want DRM_SIS influencing whether FB_SIS is on or off, if the user wants sisfb on, then when they select it, DRM_SIS should be built in the same way. But if sisfb isn't selected by the user, then selecting DRM_SIS shouldn't enable it.

If FB_SIS=m, should DRM_SIS=y be allowed or should in this case DRM_SIS be restricted to n/m?

Quoted 1 line

Dave.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#5 lore raw
Quoted 9 lines
Quoted 6 lines

Maybe the other way around, I don't want DRM_SIS influencing whether FB_SIS is on or off, if the user wants sisfb on, then when they select it, DRM_SIS should be built in the same way. But if sisfb isn't selected by the user, then selecting DRM_SIS shouldn't enable it.

If FB_SIS=m, should DRM_SIS=y be allowed or should in this case DRM_SIS be restricted to n/m?

Probably not. if FB_SIS is selected at all, DRM_SIS should match it, if FB_SIS isn't selected, DRM_SIS should not select it.

Dave.

#6 lore raw

RFC PATCH 1/1 don't allow FB_SIS=m, DRM_SIS=y

Quoted 7 lines · Dave Airlie
Quoted 7 lines
Quoted 6 lines

Maybe the other way around, I don't want DRM_SIS influencing whether FB_SIS is on or off, if the user wants sisfb on, then when they select it, DRM_SIS should be built in the same way. But if sisfb isn't selected by the user, then selecting DRM_SIS shouldn't enable it.

Quoted 5 lines
Quoted 2 lines

If FB_SIS=m, should DRM_SIS=y be allowed or should in this case DRM_SIS be restricted to n/m?

Probably not. if FB_SIS is selected at all, DRM_SIS should match it, if FB_SIS isn't selected, DRM_SIS should not select it.

I assume FB_SIS=y, DRM_SIS=m should still be possible?

If this assumption is correct the fix is below.

Quoted 1 line

Dave.

cu
Adrian

<-- snip -->

FB_SIS=m, DRM_SIS=y is not a legal configuration.

---
c303119b9561e13be97f3d4b0d7eaa6930fc21d8

drivers/gpu/drm/Kconfig +1 -0
index 610d6fd..bf9003e 100644
@@ -87,6 +87,7 @@ config DRM_MGA
 config DRM_SIS
 	tristate "SiS video cards"
 	depends on DRM && AGP
+	depends on FB_SIS || FB_SIS=n
 	help
 	  Choose this option if you have a SiS 630 or compatible video
           chipset. If M is selected the module will be called sis. AGP
#7 lore raw

Re: [RFC: -next patch] don't allow FB_SIS=m, DRM_SIS=y

Quoted 39 lines · On Thu, 14 Aug 2008 00:57:28 +0300 Adrian Bunk wrote:
Quoted 7 lines · Dave Airlie
Quoted 7 lines
Quoted 6 lines

Maybe the other way around, I don't want DRM_SIS influencing whether FB_SIS is on or off, if the user wants sisfb on, then when they select it, DRM_SIS should be built in the same way. But if sisfb isn't selected by the user, then selecting DRM_SIS shouldn't enable it.

Quoted 5 lines
Quoted 2 lines

If FB_SIS=m, should DRM_SIS=y be allowed or should in this case DRM_SIS be restricted to n/m?

Probably not. if FB_SIS is selected at all, DRM_SIS should match it, if FB_SIS isn't selected, DRM_SIS should not select it.

I assume FB_SIS=y, DRM_SIS=m should still be possible?

If this assumption is correct the fix is below.

Quoted 1 line

Dave.

cu
Adrian

<-- snip -->

FB_SIS=m, DRM_SIS=y is not a legal configuration.

---
c303119b9561e13be97f3d4b0d7eaa6930fc21d8

drivers/gpu/drm/Kconfig +0 -0
index 610d6fd..bf9003e 100644

drivers/gpu/drm/Kconfig config DRM_MGA

Quoted 9 lines
drivers/gpu/drm/Kconfig +1 -1
@@ -87,6 +87,7 @@ config DRM_MGA
 config DRM_SIS
 	tristate "SiS video cards"
 	depends on DRM && AGP
+	depends on FB_SIS || FB_SIS=n
 	help
 	  Choose this option if you have a SiS 630 or compatible video
           chipset. If M is selected the module will be called sis. AGP
 
--

Thanks, Adrian.

I don't know if that's the proper fix, but something needs to be fixed/merged. :(

---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/