drm/vmwgfx: respect 'nomodeset'
authorRob Clark <robdclark@gmail.com>
Wed, 15 Oct 2014 19:00:47 +0000 (15:00 -0400)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 27 Feb 2016 14:28:44 +0000 (14:28 +0000)
commit 96c5d076f0a5e2023ecdb44d8261f87641ee71e0 upstream.

Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

Simple merge