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

Commit a5027ccd authored by Francisco Jerez's avatar Francisco Jerez Committed by Dave Airlie
Browse files

drm/nouveau: Use the software object for fencing. 



This should avoid a race condition on nv0x, if we're doing it with
actual PGRAPH objects and a there's a fence within the FIFO DMA fetch
area when a context switch kicks in.

In that case we get an ILLEGAL_MTHD interrupt as expected, but the
values in PGRAPH_TRAPPED_ADDR aren't calculated correctly and they're
almost useless (e.g. you can see ILLEGAL_MTHDs for the now inactive
channel, with a wrong offset/data pair).

Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
parent ca4362ad

drivers/gpu/drm/nouveau/nouveau_fence.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ nouveau_fence_emit(struct nouveau_fence *fence) 
	list_add_tail(&fence->entry, &chan->fence.pending);

	spin_unlock_irqrestore(&chan->fence.lock, flags);



	BEGIN_RING(chan, NvSubM2MF, USE_REFCNT ? 0x0050 : 0x0150, 1);

	BEGIN_RING(chan, NvSubSw, USE_REFCNT ? 0x0050 : 0x0150, 1);

	OUT_RING(chan, fence->sequence);

	FIRE_RING(chan);

drivers/gpu/drm/nouveau/nv04_graph.c

+3 −2
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ nv04_graph_mthd_set_operation(struct nouveau_channel *chan, int grclass, 
	return 0;

}



static struct nouveau_pgraph_object_method nv04_graph_mthds_m2mf[] = {

static struct nouveau_pgraph_object_method nv04_graph_mthds_sw[] = {

	{ 0x0150, nv04_graph_mthd_set_ref },

	{}

};
@@ -558,7 +558,7 @@ static struct nouveau_pgraph_object_method nv04_graph_mthds_set_operation[] = { 
};



struct nouveau_pgraph_object_class nv04_graph_grclass[] = {

	{ 0x0039, false, nv04_graph_mthds_m2mf },

	{ 0x0039, false, NULL },

	{ 0x004a, false, nv04_graph_mthds_set_operation }, /* gdirect */

	{ 0x005f, false, nv04_graph_mthds_set_operation }, /* imageblit */

	{ 0x0061, false, nv04_graph_mthds_set_operation }, /* ifc */
@@ -574,6 +574,7 @@ struct nouveau_pgraph_object_class nv04_graph_grclass[] = { 
	{ 0x0053, false, NULL }, /* surf3d */

	{ 0x0054, false, NULL }, /* tex_tri */

	{ 0x0055, false, NULL }, /* multitex_tri */

	{ 0x506e, true, nv04_graph_mthds_sw },

	{}

};