Commit fc162088 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms: enable for non-vga pci classes 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 5495e39f

drivers/gpu/drm/nouveau/nouveau_display.c

+15 −20
Original line number Diff line number Diff line
@@ -278,7 +278,6 @@ nouveau_display_create(struct drm_device *dev) 
{

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_display *disp;

	u32 pclass = dev->pdev->class >> 8;

	int ret, gen;



	disp = drm->display = kzalloc(sizeof(*disp), GFP_KERNEL);
@@ -340,8 +339,6 @@ nouveau_display_create(struct drm_device *dev) 
	drm_kms_helper_poll_init(dev);

	drm_kms_helper_poll_disable(dev);



	if (nouveau_modeset == 1 ||

	    (nouveau_modeset < 0 && pclass == PCI_CLASS_DISPLAY_VGA)) {

	if (drm->vbios.dcb.entries) {

		if (nv_device(drm->device)->card_type < NV_50)

			ret = nv04_display_create(dev);
@@ -361,8 +358,6 @@ nouveau_display_create(struct drm_device *dev) 
	}



	nouveau_backlight_init(dev);

	}



	return 0;



vblank_err:

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+2 −1
Original line number Diff line number Diff line
@@ -454,7 +454,8 @@ nouveau_fbcon_init(struct drm_device *dev) 
	int preferred_bpp;

	int ret;



	if (!dev->mode_config.num_crtc)

	if (!dev->mode_config.num_crtc ||

	    (dev->pdev->class >> 8) != PCI_CLASS_DISPLAY_VGA)

		return 0;



	fbcon = kzalloc(sizeof(struct nouveau_fbdev), GFP_KERNEL);