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

Commit e0d2e320 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

* 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: inform userspace of relaxed kernel subchannel requirements
  Revert "drm/nouveau: inform userspace of new kernel subchannel requirements"
  drm/nouveau: oops, create m2mf for nvd9 too
parents dd775ae2 02bfc288

drivers/gpu/drm/nouveau/nouveau_channel.c

+5 −5
Original line number Diff line number Diff line
@@ -436,11 +436,11 @@ nouveau_ioctl_fifo_alloc(struct drm_device *dev, void *data, 
	}



	if (dev_priv->card_type < NV_C0) {

		init->subchan[0].handle = NvSw;

		init->subchan[0].grclass = NV_SW;

		init->nr_subchan = 1;

	} else {

		init->nr_subchan = 0;

		init->subchan[0].handle = 0x00000000;

		init->subchan[0].grclass = 0x0000;

		init->subchan[1].handle = NvSw;

		init->subchan[1].grclass = NV_SW;

		init->nr_subchan = 2;

	}



	/* Named memory object area */

drivers/gpu/drm/nouveau/nouveau_dma.h

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ void nv50_dma_push(struct nouveau_channel *, struct nouveau_bo *, 


/* Hardcoded object assignments to subchannels (subchannel id). */

enum {

	NvSubSw		= 0,

	NvSubM2MF	= 1,

	NvSubM2MF	= 0,

	NvSubSw		= 1,

	NvSub2D		= 2,

	NvSubCtxSurf2D  = 2,

	NvSubGdiRect    = 3,

drivers/gpu/drm/nouveau/nouveau_state.c

+1 −1
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ nouveau_card_channel_init(struct drm_device *dev) 
		OUT_RING  (chan, chan->vram_handle);

		OUT_RING  (chan, chan->gart_handle);

	} else

	if (dev_priv->card_type <= NV_C0) {

	if (dev_priv->card_type <= NV_D0) {

		ret = nouveau_gpuobj_gr_new(chan, 0x9039, 0x9039);

		if (ret)

			goto error;