diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-03-30 05:26:35 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-03-30 11:37:57 -0400 |
| commit | 44debe7a123cc760fc90ccbe253210798c917fa7 (patch) | |
| tree | 6f5328a9790cb8d7d992be2b708f32119a2359bb /drivers/gpu/drm/virtio | |
| parent | aa2e2996b1518b3e4b72dab5c2cb6cd082e3002e (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/virtio')
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_drv.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c index 7f898cfdc746..3cc7afa77a35 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.c +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c | |||
| @@ -42,10 +42,8 @@ module_param_named(modeset, virtio_gpu_modeset, int, 0400); | |||
| 42 | 42 | ||
| 43 | static int virtio_gpu_probe(struct virtio_device *vdev) | 43 | static int virtio_gpu_probe(struct virtio_device *vdev) |
| 44 | { | 44 | { |
| 45 | #ifdef CONFIG_VGA_CONSOLE | ||
| 46 | if (vgacon_text_force() && virtio_gpu_modeset == -1) | 45 | if (vgacon_text_force() && virtio_gpu_modeset == -1) |
| 47 | return -EINVAL; | 46 | return -EINVAL; |
| 48 | #endif | ||
| 49 | 47 | ||
| 50 | if (virtio_gpu_modeset == 0) | 48 | if (virtio_gpu_modeset == 0) |
| 51 | return -EINVAL; | 49 | return -EINVAL; |
