lkml.org 
[lkml]   [2016]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 036/129] drm/vmwgfx: respect 'nomodeset'
    Date
    3.16.7-ckt25 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    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: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 +++++++
    1 file changed, 7 insertions(+)

    diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
    index 9a03ee69f756..cda0c1106c7c 100644
    --- 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"
    @@ -1471,6 +1472,12 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
    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-02-26 12:41    [W:4.095 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site