From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas Hellstrom <thellstrom@vmware.com>
Subject: Re: [PATCH] drm/vmwgfx: respect 'nomodeset'
Date: Wed, 15 Oct 2014 21:24:42 +0200
Message-ID: <543EC9FA.3000705@vmware.com>
References: <1413399647-26998-1-git-send-email-robdclark@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <dri-devel-bounces@lists.freedesktop.org>
Received: from smtp-outbound-1.vmware.com (smtp-outbound-1.vmware.com
 [208.91.2.12])
 by gabe.freedesktop.org (Postfix) with ESMTP id CFF2F6E1B7
 for <dri-devel@lists.freedesktop.org>; Wed, 15 Oct 2014 12:24:48 -0700 (PDT)
In-Reply-To: <1413399647-26998-1-git-send-email-robdclark@gmail.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: Rob Clark <robdclark@gmail.com>
Cc: dri-devel@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

On 10/15/2014 09:00 PM, Rob Clark wrote:
> Signed-off-by: Rob Clark <robdclark@gmail.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 18b54ac..f0267b8 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"
> @@ -1453,6 +1454,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
> +

Hmm,

>>From the function name vgacon_text_force() it sounds like this should
just stop the driver from initializing fbcon? Not refuse to load?

/Thomas

>  	ret = drm_pci_init(&driver, &vmw_pci_driver);
>  	if (ret)
>  		DRM_ERROR("Failed initializing DRM.\n");