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

Commit 966a5b7d authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nvc0: implement pgraph engine hooks 



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

drivers/gpu/drm/nouveau/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ 
             nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o nvc0_fifo.o \

             nv04_graph.o nv10_graph.o nv20_graph.o \

             nv40_graph.o nv50_graph.o nvc0_graph.o \

             nv40_grctx.o nv50_grctx.o \

             nv40_grctx.o nv50_grctx.o nvc0_grctx.o \

             nv84_crypt.o \

             nv04_instmem.o nv50_instmem.o nvc0_instmem.o \

             nv50_evo.o nv50_crtc.o nv50_dac.o nv50_sor.o \

drivers/gpu/drm/nouveau/nouveau_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr, 
	}



	/* Software copy if the card isn't up and running yet. */

	if (!dev_priv->channel) {

	if (!dev_priv->channel || dev_priv->card_type == NV_C0) {

		ret = ttm_bo_move_memcpy(bo, evict, no_wait_reserve, no_wait_gpu, new_mem);

		goto out;

	}

drivers/gpu/drm/nouveau/nouveau_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ struct nouveau_pgraph_engine { 
	bool accel_blocked;

	bool registered;

	int grctx_size;

	void *priv;



	/* NV2x/NV3x context table (0x400780) */

	struct nouveau_gpuobj *ctx_table;

drivers/gpu/drm/nouveau/nvc0_graph.c

+708 −1

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/nouveau/nvc0_graph.h

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2010 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: Ben Skeggs

 */



#ifndef __NVC0_GRAPH_H__

#define __NVC0_GRAPH_H__



#define GPC_MAX 4

#define TP_MAX 32



#define ROP_BCAST(r)   (0x408800 + (r))

#define ROP_UNIT(u,r)  (0x410000 + (u) * 0x400 + (r))

#define GPC_BCAST(r)   (0x418000 + (r))

#define GPC_UNIT(t,r)  (0x500000 + (t) * 0x8000 + (r))

#define TP_UNIT(t,m,r) (0x504000 + (t) * 0x8000 + (m) * 0x800 + (r))



struct nvc0_graph_priv {

	u8 gpc_nr;

	u8 rop_nr;

	u8 tp_nr[GPC_MAX];

	u8 tp_total;



	u32  grctx_size;

	u32 *grctx_vals;

	struct nouveau_gpuobj *unk4188b4;

	struct nouveau_gpuobj *unk4188b8;



	u8  magic_not_rop_nr;

	u32 magic419bd0;

	u32 magic419be4;

	u32 magicgpc980[4];

	u32 magicgpc918;

};



struct nvc0_graph_chan {

	struct nouveau_gpuobj *grctx;

	struct nouveau_gpuobj *unk408004; // 0x418810 too

	struct nouveau_gpuobj *unk40800c; // 0x419004 too

	struct nouveau_gpuobj *unk418810; // 0x419848 too

	struct nouveau_gpuobj *mmio;

	int mmio_nr;

};



int nvc0_grctx_generate(struct nouveau_channel *);



#endif