aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/qxl
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2016-03-30 05:26:35 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-03-30 11:37:57 -0400
commit44debe7a123cc760fc90ccbe253210798c917fa7 (patch)
tree6f5328a9790cb8d7d992be2b708f32119a2359bb /drivers/gpu/drm/qxl
parentaa2e2996b1518b3e4b72dab5c2cb6cd082e3002e (diff)
vgacon: dummy implementation for vgacon_text_force
This allows us to ditch a ton of ugly #ifdefs from a bunch of drm modeset drivers. v2: Make the dummy function actually return a sane value, spotted by Ville. v3: Because the patch is still in limbo there's no more drivers to convert, noticed by Emil. v4: Rebase once more, because hooray. I'll just go ahead an apply this one later on to drm-misc. Cc: Emil Velikov <emil.l.velikov@gmail.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/qxl')
-rw-r--r--drivers/gpu/drm/qxl/qxl_drv.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c
index 7307b07fe06b..dc9df5fe50ba 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.c
+++ b/drivers/gpu/drm/qxl/qxl_drv.c
@@ -272,10 +272,8 @@ static struct drm_driver qxl_driver = {
272 272
273static int __init qxl_init(void) 273static int __init qxl_init(void)
274{ 274{
275#ifdef CONFIG_VGA_CONSOLE
276 if (vgacon_text_force() && qxl_modeset == -1) 275 if (vgacon_text_force() && qxl_modeset == -1)
277 return -EINVAL; 276 return -EINVAL;
278#endif
279 277
280 if (qxl_modeset == 0) 278 if (qxl_modeset == 0)
281 return -EINVAL; 279 return -EINVAL;