aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/ast/ast_drv.c2
-rw-r--r--drivers/gpu/drm/cirrus/cirrus_drv.c2
-rw-r--r--drivers/gpu/drm/mgag200/mgag200_drv.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
index b56eac6b155f..d0c4574ef49c 100644
--- a/drivers/gpu/drm/ast/ast_drv.c
+++ b/drivers/gpu/drm/ast/ast_drv.c
@@ -221,8 +221,10 @@ static struct drm_driver driver = {
221 221
222static int __init ast_init(void) 222static int __init ast_init(void)
223{ 223{
224#ifdef CONFIG_VGA_CONSOLE
224 if (vgacon_text_force() && ast_modeset == -1) 225 if (vgacon_text_force() && ast_modeset == -1)
225 return -EINVAL; 226 return -EINVAL;
227#endif
226 228
227 if (ast_modeset == 0) 229 if (ast_modeset == 0)
228 return -EINVAL; 230 return -EINVAL;
diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.c b/drivers/gpu/drm/cirrus/cirrus_drv.c
index 2e1f925b5caf..d7038230b71e 100644
--- a/drivers/gpu/drm/cirrus/cirrus_drv.c
+++ b/drivers/gpu/drm/cirrus/cirrus_drv.c
@@ -84,8 +84,10 @@ static struct pci_driver cirrus_pci_driver = {
84 84
85static int __init cirrus_init(void) 85static int __init cirrus_init(void)
86{ 86{
87#ifdef CONFIG_VGA_CONSOLE
87 if (vgacon_text_force() && cirrus_modeset == -1) 88 if (vgacon_text_force() && cirrus_modeset == -1)
88 return -EINVAL; 89 return -EINVAL;
90#endif
89 91
90 if (cirrus_modeset == 0) 92 if (cirrus_modeset == 0)
91 return -EINVAL; 93 return -EINVAL;
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
index f03a636d769e..3c8e04f54713 100644
--- a/drivers/gpu/drm/mgag200/mgag200_drv.c
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
@@ -93,8 +93,10 @@ static struct pci_driver mgag200_pci_driver = {
93 93
94static int __init mgag200_init(void) 94static int __init mgag200_init(void)
95{ 95{
96#ifdef CONFIG_VGA_CONSOLE
96 if (vgacon_text_force() && mgag200_modeset == -1) 97 if (vgacon_text_force() && mgag200_modeset == -1)
97 return -EINVAL; 98 return -EINVAL;
99#endif
98 100
99 if (mgag200_modeset == 0) 101 if (mgag200_modeset == 0)
100 return -EINVAL; 102 return -EINVAL;