nouveau: decapitalise dev_priv->Engine

10 files changed, 34 insertions, 34 deletions

diff --git a/shared-core/nouveau_drv.h b/shared-core/nouveau_drv.h
index 7a4cf582..ac22c5c6 100644
--- a/shared-core/nouveau_drv.h
+++ b/shared-core/nouveau_drv.h
@@ -278,7 +278,7 @@ struct drm_nouveau_private {
 	int fifo_alloc_count;
 	struct nouveau_channel *fifos[NOUVEAU_MAX_CHANNEL_NR];
 
-	struct nouveau_engine Engine;
+	struct nouveau_engine engine;
 	struct nouveau_channel *channel;
 
 	/* RAMIN configuration, RAMFC, RAMHT and RAMRO offsets */
diff --git a/shared-core/nouveau_fifo.c b/shared-core/nouveau_fifo.c
index e244a897..7efd9416 100644
--- a/shared-core/nouveau_fifo.c
+++ b/shared-core/nouveau_fifo.c
@@ -262,7 +262,7 @@ nouveau_fifo_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret,
 {
 	int ret;
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 	struct nouveau_channel *chan;
 	int channel;
 
@@ -417,7 +417,7 @@ nouveau_channel_idle(struct nouveau_channel *chan)
 {
 	struct drm_device *dev = chan->dev;
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 	uint32_t caches;
 	int idle;
 
@@ -456,7 +456,7 @@ void nouveau_fifo_free(struct nouveau_channel *chan)
 {
 	struct drm_device *dev = chan->dev;
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 	uint64_t t_start;
 
 	DRM_INFO("%s: freeing fifo %d\n", __func__, chan->id);
@@ -522,7 +522,7 @@ void nouveau_fifo_free(struct nouveau_channel *chan)
 void nouveau_fifo_cleanup(struct drm_device *dev, struct drm_file *file_priv)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 	int i;
 
 	DRM_DEBUG("clearing FIFO enables from file_priv\n");
@@ -539,7 +539,7 @@ nouveau_fifo_owner(struct drm_device *dev, struct drm_file *file_priv,
 		   int channel)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 
 	if (channel >= engine->fifo.channels)
 		return 0;
diff --git a/shared-core/nouveau_irq.c b/shared-core/nouveau_irq.c
index cc7a03c5..427ef474 100644
--- a/shared-core/nouveau_irq.c
+++ b/shared-core/nouveau_irq.c
@@ -77,7 +77,7 @@ static void
 nouveau_fifo_irq_handler(struct drm_device *dev)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 	uint32_t status, reassign;
 
 	reassign = nv_rd32(NV03_PFIFO_CACHES) & 1;
@@ -205,14 +205,14 @@ nouveau_graph_chid_from_grctx(struct drm_device *dev)
 	int i;
 
 	if (dev_priv->card_type < NV_40)
-		return dev_priv->Engine.fifo.channels;
+		return dev_priv->engine.fifo.channels;
 	else
 	if (dev_priv->card_type < NV_50)
 		inst = (nv_rd32(0x40032c) & 0xfffff) << 4;
 	else
 		inst = nv_rd32(0x40032c) & 0xfffff;
 
-	for (i = 0; i < dev_priv->Engine.fifo.channels; i++) {
+	for (i = 0; i < dev_priv->engine.fifo.channels; i++) {
 		struct nouveau_channel *chan = dev_priv->fifos[i];
 
 		if (!chan || !chan->ramin_grctx)
@@ -234,7 +234,7 @@ static int
 nouveau_graph_trapped_channel(struct drm_device *dev, int *channel_ret)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 	int channel;
 
 	if (dev_priv->card_type < NV_10)
@@ -380,7 +380,7 @@ static inline void
 nouveau_pgraph_intr_context_switch(struct drm_device *dev)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 	uint32_t chid;
 
 	chid = engine->fifo.channel_id(dev);
diff --git a/shared-core/nouveau_object.c b/shared-core/nouveau_object.c
index 10e715d6..14b24cb4 100644
--- a/shared-core/nouveau_object.c
+++ b/shared-core/nouveau_object.c
@@ -196,7 +196,7 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan,
 		   struct nouveau_gpuobj **gpuobj_ret)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 	struct nouveau_gpuobj *gpuobj;
 	struct mem_block *pramin = NULL;
 	int ret;
@@ -336,7 +336,7 @@ int
 nouveau_gpuobj_del(struct drm_device *dev, struct nouveau_gpuobj **pgpuobj)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 	struct nouveau_gpuobj *gpuobj;
 
 	DRM_DEBUG("gpuobj %p\n", pgpuobj ? *pgpuobj : NULL);
diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c
index 22ab6883..d91adb86 100644
--- a/shared-core/nouveau_state.c
+++ b/shared-core/nouveau_state.c
@@ -37,7 +37,7 @@ static void nouveau_stub_takedown(struct drm_device *dev) {}
 static int nouveau_init_engine_ptrs(struct drm_device *dev)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 
 	switch (dev_priv->chipset & 0xf0) {
 	case 0x00:
@@ -253,7 +253,7 @@ nouveau_card_init(struct drm_device *dev)
 	/* Initialise internal driver API hooks */
 	ret = nouveau_init_engine_ptrs(dev);
 	if (ret) return ret;
-	engine = &dev_priv->Engine;
+	engine = &dev_priv->engine;
 	dev_priv->init_state = NOUVEAU_CARD_INIT_FAILED;
 
 	ret = nouveau_gpuobj_early_init(dev);
@@ -344,7 +344,7 @@ nouveau_card_init(struct drm_device *dev)
 static void nouveau_card_takedown(struct drm_device *dev)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 
 	DRM_DEBUG("prev state = %d\n", dev_priv->init_state);
 
@@ -726,7 +726,7 @@ bool nouveau_wait_until(struct drm_device *dev, uint64_t timeout,
 			uint32_t reg, uint32_t mask, uint32_t val)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nouveau_timer_engine *ptimer = &dev_priv->Engine.timer;
+	struct nouveau_timer_engine *ptimer = &dev_priv->engine.timer;
 	uint64_t start = ptimer->read(dev);
 
 	do {
@@ -761,7 +761,7 @@ static int nouveau_suspend(struct drm_device *dev)
 	struct mem_block *p;
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	struct nouveau_suspend_resume *susres = &dev_priv->susres;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 	int i;
 
 	drm_free(susres->ramin_copy, susres->ramin_size, DRM_MEM_DRIVER);
@@ -830,7 +830,7 @@ static int nouveau_resume(struct drm_device *dev)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	struct nouveau_suspend_resume *susres = &dev_priv->susres;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 	int i;
 
 	if (!susres->ramin_copy)
diff --git a/shared-core/nv04_graph.c b/shared-core/nv04_graph.c
index a1342f7d..62ef1cf5 100644
--- a/shared-core/nv04_graph.c
+++ b/shared-core/nv04_graph.c
@@ -353,7 +353,7 @@ struct graph_state {
 void nouveau_nv04_context_switch(struct drm_device *dev)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 	struct nouveau_channel *next, *last;
 	int chid;
 
diff --git a/shared-core/nv04_instmem.c b/shared-core/nv04_instmem.c
index fb4a178c..62685299 100644
--- a/shared-core/nv04_instmem.c
+++ b/shared-core/nv04_instmem.c
@@ -43,7 +43,7 @@ static void
 nv04_instmem_configure_fixed_tables(struct drm_device *dev)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 
 	/* FIFO hash table (RAMHT)
 	 *   use 4k hash table at RAMIN+0x10000
@@ -143,7 +143,7 @@ nv04_instmem_clear(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
 
 	if (gpuobj && gpuobj->im_backing) {
 		if (gpuobj->im_bound)
-			dev_priv->Engine.instmem.unbind(dev, gpuobj);
+			dev_priv->engine.instmem.unbind(dev, gpuobj);
 		gpuobj->im_backing = NULL;
 	}
 }
diff --git a/shared-core/nv10_graph.c b/shared-core/nv10_graph.c
index b2b2e4b5..791e08bb 100644
--- a/shared-core/nv10_graph.c
+++ b/shared-core/nv10_graph.c
@@ -709,7 +709,7 @@ void nouveau_nv10_context_switch(struct drm_device *dev)
 		DRM_DEBUG("Invalid drm_nouveau_private->fifos\n");
 		return;
 	}
-	engine = &dev_priv->Engine;
+	engine = &dev_priv->engine;
 
 	chid = (nv_rd32(NV04_PGRAPH_TRAPPED_ADDR) >> 20) &
 		(engine->fifo.channels - 1);
@@ -831,7 +831,7 @@ void nv10_graph_destroy_context(struct nouveau_channel *chan)
 {
 	struct drm_device *dev = chan->dev;
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nouveau_engine *engine = &dev_priv->Engine;
+	struct nouveau_engine *engine = &dev_priv->engine;
 	struct graph_state* pgraph_ctx = chan->pgraph_ctx;
 	int chid;
 
diff --git a/shared-core/nv50_fifo.c b/shared-core/nv50_fifo.c
index 07d6b9d8..b8150b61 100644
--- a/shared-core/nv50_fifo.c
+++ b/shared-core/nv50_fifo.c
@@ -39,7 +39,7 @@ static void
 nv50_fifo_init_thingo(struct drm_device *dev)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nv50_fifo_priv *priv = dev_priv->Engine.fifo.priv;
+	struct nv50_fifo_priv *priv = dev_priv->engine.fifo.priv;
 	struct nouveau_gpuobj_ref *cur;
 	int i, nr;
 
@@ -171,7 +171,7 @@ nv50_fifo_init(struct drm_device *dev)
 	priv = drm_calloc(1, sizeof(*priv), DRM_MEM_DRIVER);
 	if (!priv)
 		return -ENOMEM;
-	dev_priv->Engine.fifo.priv = priv;
+	dev_priv->engine.fifo.priv = priv;
 
 	nv50_fifo_init_reset(dev);
 	nv50_fifo_init_intr(dev);
@@ -201,7 +201,7 @@ void
 nv50_fifo_takedown(struct drm_device *dev)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	struct nv50_fifo_priv *priv = dev_priv->Engine.fifo.priv;
+	struct nv50_fifo_priv *priv = dev_priv->engine.fifo.priv;
 
 	DRM_DEBUG("\n");
 
@@ -211,7 +211,7 @@ nv50_fifo_takedown(struct drm_device *dev)
 	nouveau_gpuobj_ref_del(dev, &priv->thingo[0]);
 	nouveau_gpuobj_ref_del(dev, &priv->thingo[1]);
 
-	dev_priv->Engine.fifo.priv = NULL;
+	dev_priv->engine.fifo.priv = NULL;
 	drm_free(priv, sizeof(*priv), DRM_MEM_DRIVER);
 }
 
diff --git a/shared-core/nv50_instmem.c b/shared-core/nv50_instmem.c
index e89df2e5..393d5570 100644
--- a/shared-core/nv50_instmem.c
+++ b/shared-core/nv50_instmem.c
@@ -67,7 +67,7 @@ nv50_instmem_init(struct drm_device *dev)
 	priv = drm_calloc(1, sizeof(*priv), DRM_MEM_DRIVER);
 	if (!priv)
 		return -ENOMEM;
-	dev_priv->Engine.instmem.priv = priv;
+	dev_priv->engine.instmem.priv = priv;
 
 	/* Save state, will restore at takedown. */
 	for (i = 0x1700; i <= 0x1710; i+=4)
@@ -201,7 +201,7 @@ void
 nv50_instmem_takedown(struct drm_device *dev)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	nv50_instmem_priv *priv = dev_priv->Engine.instmem.priv;
+	nv50_instmem_priv *priv = dev_priv->engine.instmem.priv;
 	struct nouveau_channel *chan = dev_priv->fifos[0];
 	int i;
 
@@ -228,7 +228,7 @@ nv50_instmem_takedown(struct drm_device *dev)
 		drm_free(chan, sizeof(*chan), DRM_MEM_DRIVER);
 	}
 
-	dev_priv->Engine.instmem.priv = NULL;
+	dev_priv->engine.instmem.priv = NULL;
 	drm_free(priv, sizeof(*priv), DRM_MEM_DRIVER);
 }
 
@@ -261,7 +261,7 @@ nv50_instmem_clear(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
 
 	if (gpuobj && gpuobj->im_backing) {
 		if (gpuobj->im_bound)
-			dev_priv->Engine.instmem.unbind(dev, gpuobj);
+			dev_priv->engine.instmem.unbind(dev, gpuobj);
 		nouveau_mem_free(dev, gpuobj->im_backing);
 		gpuobj->im_backing = NULL;
 	}
@@ -271,7 +271,7 @@ int
 nv50_instmem_bind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	nv50_instmem_priv *priv = dev_priv->Engine.instmem.priv;
+	nv50_instmem_priv *priv = dev_priv->engine.instmem.priv;
 	uint32_t pte, pte_end, vram;
 
 	if (!gpuobj->im_backing || !gpuobj->im_pramin || gpuobj->im_bound)
@@ -312,7 +312,7 @@ int
 nv50_instmem_unbind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
-	nv50_instmem_priv *priv = dev_priv->Engine.instmem.priv;
+	nv50_instmem_priv *priv = dev_priv->engine.instmem.priv;
 	uint32_t pte, pte_end;
 
 	if (gpuobj->im_bound == 0)