Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f20d9eb authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-nouveau-fixes' of... 

Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

These just silence some printks that we are seeing that we shouldn't

* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nvc0/ltcg: mask off intr 0x10
  drm/nouveau: silence a debug message triggered by newer userspace
parents 6f0f9b6b 79eee7aa

drivers/gpu/drm/nouveau/nouveau_abi16.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ nouveau_abi16_ioctl_grobj_alloc(ABI16_IOCTL_ARGS) 
			return 0;

	} else

	if (init->class == 0x906e) {

		NV_ERROR(dev, "906e not supported yet\n");

		NV_DEBUG(dev, "906e not supported yet\n");

		return -EINVAL;

	}

drivers/gpu/drm/nouveau/nvc0_fb.c

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ nvc0_fb_init(struct drm_device *dev) 
	priv = dev_priv->engine.fb.priv;



	nv_wr32(dev, 0x100c10, priv->r100c10 >> 8);

	nv_mask(dev, 0x17e820, 0x00100000, 0x00000000); /* NV_PLTCG_INTR_EN */

	return 0;

}