Commit a1a5c3b9 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds

fbdev/drm: fix Kconfig submenu mess in "Graphics support"

Submenus of the graphics support "Support for frame buffer devices" and
"Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)" are
broken in half after latest changes for Intel 915 mode setting support.

The DRM subsection is broken because one option is put outside the choice
section it depends on.

The frame buffers part is broken then due to circular dependency.  Fix
this by make Intel frame buffers depend on CONFIG_INTEL_AGP.

Kconfigs are broken by d2f59357
("drm/i915: select framebuffer support automatically").

This is probably not only way to fix this.
Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Dave Airlie <airlied@linux.ie>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5a74db06
...@@ -80,8 +80,6 @@ config DRM_I915 ...@@ -80,8 +80,6 @@ config DRM_I915
XFree86 4.4 and above. If unsure, build this and i830 as modules and XFree86 4.4 and above. If unsure, build this and i830 as modules and
the X server will load the correct one. the X server will load the correct one.
endchoice
config DRM_I915_KMS config DRM_I915_KMS
bool "Enable modesetting on intel by default" bool "Enable modesetting on intel by default"
depends on DRM_I915 depends on DRM_I915
...@@ -92,6 +90,7 @@ config DRM_I915_KMS ...@@ -92,6 +90,7 @@ config DRM_I915_KMS
the driver to bind to PCI devices, which precludes loading things the driver to bind to PCI devices, which precludes loading things
like intelfb. like intelfb.
endchoice
config DRM_MGA config DRM_MGA
tristate "Matrox g200/g400" tristate "Matrox g200/g400"
......
...@@ -1054,10 +1054,7 @@ config FB_RIVA_BACKLIGHT ...@@ -1054,10 +1054,7 @@ config FB_RIVA_BACKLIGHT
config FB_I810 config FB_I810
tristate "Intel 810/815 support (EXPERIMENTAL)" tristate "Intel 810/815 support (EXPERIMENTAL)"
depends on EXPERIMENTAL && PCI && X86_32 depends on EXPERIMENTAL && FB && PCI && X86_32 && AGP_INTEL
select AGP
select AGP_INTEL
select FB
select FB_MODE_HELPERS select FB_MODE_HELPERS
select FB_CFB_FILLRECT select FB_CFB_FILLRECT
select FB_CFB_COPYAREA select FB_CFB_COPYAREA
...@@ -1120,10 +1117,7 @@ config FB_CARILLO_RANCH ...@@ -1120,10 +1117,7 @@ config FB_CARILLO_RANCH
config FB_INTEL config FB_INTEL
tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)" tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)"
depends on EXPERIMENTAL && PCI && X86 depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL
select FB
select AGP
select AGP_INTEL
select FB_MODE_HELPERS select FB_MODE_HELPERS
select FB_CFB_FILLRECT select FB_CFB_FILLRECT
select FB_CFB_COPYAREA select FB_CFB_COPYAREA
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment