summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/nouveau_drv.h6
-rw-r--r--shared-core/nouveau_irq.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/shared-core/nouveau_drv.h b/shared-core/nouveau_drv.h
index d35d670d..b881bead 100644
--- a/shared-core/nouveau_drv.h
+++ b/shared-core/nouveau_drv.h
@@ -106,6 +106,9 @@ struct nouveau_channel
/* mapping of the regs controling the fifo */
drm_local_map_t *regs;
+ /* Fencing */
+ uint32_t next_sequence;
+
/* DMA push buffer */
struct nouveau_gpuobj_ref *pushbuf;
struct mem_block *pushbuf_mem;
@@ -146,9 +149,6 @@ struct nouveau_drm_channel {
/* Notifiers */
uint32_t notify0_offset;
- /* Fences */
- uint32_t next_sequence;
-
/* Buffer moves */
uint32_t m2mf_dma_source;
uint32_t m2mf_dma_destin;
diff --git a/shared-core/nouveau_irq.c b/shared-core/nouveau_irq.c
index e3fb62f4..1a52a584 100644
--- a/shared-core/nouveau_irq.c
+++ b/shared-core/nouveau_irq.c
@@ -115,7 +115,7 @@ nouveau_fifo_irq_handler(struct drm_device *dev)
}
if (status) {
- DRM_INFO("Unhandled PFIFO_INTR - 0x%8x\n", status);
+ DRM_INFO("Unhandled PFIFO_INTR - 0x%08x\n", status);
NV_WRITE(NV03_PFIFO_INTR_0, status);
}
@@ -395,7 +395,7 @@ nouveau_pgraph_irq_handler(struct drm_device *dev)
}
if (status) {
- DRM_INFO("Unhandled PGRAPH_INTR - 0x%8x\n", status);
+ DRM_INFO("Unhandled PGRAPH_INTR - 0x%08x\n", status);
NV_WRITE(NV03_PGRAPH_INTR, status);
}