Commit 4894f662 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: a, somehow, missed hunk of "fix regression on agp boards" 



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

drivers/gpu/drm/nouveau/nouveau_chan.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -285,7 +285,6 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart) 
	struct nouveau_software_chan *swch;

	struct nouveau_software_chan *swch;

	struct nv_dma_v0 args = {};

	struct nv_dma_v0 args = {};

	int ret, i;

	int ret, i;

	bool save;





	nvif_object_map(chan->object);

	nvif_object_map(chan->object);
@@ -387,11 +386,7 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart) 
	}

	}





	/* initialise synchronisation */

	/* initialise synchronisation */

	save = cli->base.super;

	return nouveau_fence(chan->drm)->context_new(chan);

	cli->base.super = true; /* hack until fencenv50 fixed */

	ret = nouveau_fence(chan->drm)->context_new(chan);

	cli->base.super = save;

	return ret;

}

}





int

int