lkml.org 
[lkml]   [2016]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 171/342] drm/vmwgfx: respect nomodeset
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Rob Clark <robdclark@gmail.com>

    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 +++++++
    1 file changed, 7 insertions(+)

    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
    @@ -25,6 +25,7 @@
    *
    **************************************************************************/
    #include <linux/module.h>
    +#include <linux/console.h>

    #include <drm/drmP.h>
    #include "vmwgfx_drv.h"
    @@ -1538,6 +1539,12 @@ static int vmw_probe(struct pci_dev *pde
    static int __init vmwgfx_init(void)
    {
    int ret;
    +
    +#ifdef CONFIG_VGA_CONSOLE
    + if (vgacon_text_force())
    + return -EINVAL;
    +#endif
    +
    ret = drm_pci_init(&driver, &vmw_pci_driver);
    if (ret)
    DRM_ERROR("Failed initializing DRM.\n");
    \
     
     \ /
      Last update: 2016-03-02 02:21    [W:4.045 / U:0.428 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site