From 91e46ebcbb8901588a832495dd2231fd68eaf39f Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sun, 20 May 2012 10:09:25 +0100 Subject: [PATCH] --- yaml --- r: 307406 b: refs/heads/master c: 64172ccbe22ad85f9e6ac7ec47af2a350f00e0da h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/ast/Kconfig | 1 + trunk/drivers/gpu/drm/cirrus/Kconfig | 7 ++++--- trunk/drivers/gpu/drm/mgag200/Kconfig | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ac907aa2dec7..318b79b464ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4688a69dd197fd225cca669c40d67b79f669a5a6 +refs/heads/master: 64172ccbe22ad85f9e6ac7ec47af2a350f00e0da diff --git a/trunk/drivers/gpu/drm/ast/Kconfig b/trunk/drivers/gpu/drm/ast/Kconfig index e43ff8dc0320..a277b1257888 100644 --- a/trunk/drivers/gpu/drm/ast/Kconfig +++ b/trunk/drivers/gpu/drm/ast/Kconfig @@ -6,6 +6,7 @@ config DRM_AST select FB_SYS_FILLRECT select FB_SYS_IMAGEBLIT select DRM_KMS_HELPER + select DRM_TTM help Say yes for experimental AST GPU driver. Do not enable this driver without having a working -modesetting, diff --git a/trunk/drivers/gpu/drm/cirrus/Kconfig b/trunk/drivers/gpu/drm/cirrus/Kconfig index 0303257ca136..fc154dd75296 100644 --- a/trunk/drivers/gpu/drm/cirrus/Kconfig +++ b/trunk/drivers/gpu/drm/cirrus/Kconfig @@ -1,10 +1,11 @@ config DRM_CIRRUS_QEMU tristate "Cirrus driver for QEMU emulated device" depends on DRM && PCI && EXPERIMENTAL - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT select DRM_KMS_HELPER + select DRM_TTM help This is a KMS driver for emulated cirrus device in qemu. It is *NOT* intended for real cirrus devices. This requires diff --git a/trunk/drivers/gpu/drm/mgag200/Kconfig b/trunk/drivers/gpu/drm/mgag200/Kconfig index ffffafa1d6d1..d63013497f66 100644 --- a/trunk/drivers/gpu/drm/mgag200/Kconfig +++ b/trunk/drivers/gpu/drm/mgag200/Kconfig @@ -5,6 +5,7 @@ config DRM_MGAG200 select FB_SYS_COPYAREA select FB_SYS_IMAGEBLIT select DRM_KMS_HELPER + select DRM_TTM help This is a KMS driver for the MGA G200 server chips, it does not support the original MGA G200 or any of the desktop