radeon: make DRI1 one work with new CS mechanism

8 files changed, 110 insertions, 57 deletions

diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
index 9d0ed698e16..ca9d36a8b66 100644
--- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c
+++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
@@ -234,7 +234,7 @@ void r300EmitState(r300ContextPtr r300)
 
 static unsigned packet0_count(r300ContextPtr r300, uint32_t *pkt)
 {
-    if (r300->radeon.radeonScreen->driScreen->dri2.enabled) {
+    if (r300->radeon.radeonScreen->kernel_mm) {
         return ((((*pkt) >> 16) & 0x3FFF) + 1);
     } else {
         drm_r300_cmd_header_t *t = (drm_r300_cmd_header_t*)pkt;
@@ -252,7 +252,7 @@ void emit_vpu(r300ContextPtr r300, struct r300_state_atom * atom)
 	drm_r300_cmd_header_t cmd;
     uint32_t addr, ndw, i;
 
-    if (!r300->radeon.radeonScreen->driScreen->dri2.enabled) {
+    if (!r300->radeon.radeonScreen->kernel_mm) {
         uint32_t dwords;
     	dwords = (*atom->check) (r300, atom);
         BEGIN_BATCH_NO_AUTOSTATE(dwords);
@@ -744,7 +744,7 @@ void r300InitCmdBuf(r300ContextPtr r300)
 			size * 4, r300->hw.max_state_size * 4);
 	}
 
-    if (r300->radeon.radeonScreen->driScreen->dri2.enabled) {
+    if (r300->radeon.radeonScreen->kernel_mm) {
         int fd = r300->radeon.radeonScreen->driScreen->fd;
         r300->cmdbuf.csm = radeon_cs_manager_gem_ctor(fd);
     } else {
@@ -770,7 +770,7 @@ void r300DestroyCmdBuf(r300ContextPtr r300)
 	foreach(atom, &r300->hw.atomlist) {
 		FREE(atom->cmd);
 	}
-    if (r300->radeon.radeonScreen->driScreen->dri2.enabled) {
+    if (r300->radeon.radeonScreen->driScreen->dri2.enabled || r300->radeon.radeonScreen->kernel_mm) {
         radeon_cs_manager_gem_dtor(r300->cmdbuf.csm);
     } else {
         radeon_cs_manager_legacy_dtor(r300->cmdbuf.csm);
diff --git a/src/mesa/drivers/dri/r300/r300_emit.c b/src/mesa/drivers/dri/r300/r300_emit.c
index 4405b7a3f50..a984f552bdf 100644
--- a/src/mesa/drivers/dri/r300/r300_emit.c
+++ b/src/mesa/drivers/dri/r300/r300_emit.c
@@ -436,10 +436,10 @@ int r300EmitArrays(GLcontext * ctx)
 	}
 
 	/* Setup INPUT_ROUTE. */
-    if (rmesa->radeon.radeonScreen->driScreen->dri2.enabled) {
-	R300_STATECHANGE(rmesa, vir[0]);
-    rmesa->hw.vir[0].cmd[0] &= 0xC000FFFF;
-    rmesa->hw.vir[1].cmd[0] &= 0xC000FFFF;
+    if (rmesa->radeon.radeonScreen->kernel_mm) {
+      R300_STATECHANGE(rmesa, vir[0]);
+      rmesa->hw.vir[0].cmd[0] &= 0xC000FFFF;
+      rmesa->hw.vir[1].cmd[0] &= 0xC000FFFF;
 	rmesa->hw.vir[0].cmd[0] |=
         (r300VAPInputRoute0(&rmesa->hw.vir[0].cmd[R300_VIR_CNTL_0],
                             vb->AttribPtr, inputs, tab, nr) & 0x3FFF) << 16;
diff --git a/src/mesa/drivers/dri/r300/r300_emit.h b/src/mesa/drivers/dri/r300/r300_emit.h
index bf34ced86e6..db43cc3beed 100644
--- a/src/mesa/drivers/dri/r300/r300_emit.h
+++ b/src/mesa/drivers/dri/r300/r300_emit.h
@@ -54,7 +54,7 @@
 static INLINE uint32_t cmdpacket0(struct radeon_screen *rscrn,
                                   int reg, int count)
 {
-    if (!rscrn->driScreen->dri2.enabled) {
+    if (!rscrn->kernel_mm) {
 	    drm_r300_cmd_header_t cmd;
 
     	cmd.packet0.cmd_type = R300_CMD_PACKET0;
@@ -158,7 +158,7 @@ static INLINE uint32_t cmdpacify(struct radeon_screen *rscrn)
  * Outputs 2 dwords and expects (num_extra+1) additional dwords afterwards.
  */
 #define OUT_BATCH_PACKET3(packet, num_extra) do {\
-    if (!b_l_r300->radeon.radeonScreen->driScreen->dri2.enabled) { \
+    if (!b_l_r300->radeon.radeonScreen->kernel_mm) { \
     	OUT_BATCH(cmdpacket3(b_l_r300->radeon.radeonScreen,\
                   R300_CMD_PACKET3_RAW)); \
     }\
@@ -172,7 +172,7 @@ void static INLINE end_3d(r300ContextPtr rmesa)
 {
 	BATCH_LOCALS(rmesa);
 
-    if (!rmesa->radeon.radeonScreen->driScreen->dri2.enabled) {
+    if (!rmesa->radeon.radeonScreen->kernel_mm) {
     	BEGIN_BATCH(1);
 	    OUT_BATCH(cmdpacify(rmesa->radeon.radeonScreen));
     	END_BATCH();
@@ -183,7 +183,7 @@ void static INLINE cp_delay(r300ContextPtr rmesa, unsigned short count)
 {
 	BATCH_LOCALS(rmesa);
 
-    if (!rmesa->radeon.radeonScreen->driScreen->dri2.enabled) {
+    if (!rmesa->radeon.radeonScreen->kernel_mm) {
     	BEGIN_BATCH(1);
 	    OUT_BATCH(cmdcpdelay(rmesa->radeon.radeonScreen, count));
     	END_BATCH();
@@ -195,7 +195,7 @@ void static INLINE cp_wait(r300ContextPtr rmesa, unsigned char flags)
 	BATCH_LOCALS(rmesa);
     uint32_t wait_until;
 
-    if (!rmesa->radeon.radeonScreen->driScreen->dri2.enabled) {
+    if (!rmesa->radeon.radeonScreen->kernel_mm) {
     	BEGIN_BATCH_NO_AUTOSTATE(1);
     	OUT_BATCH(cmdwait(rmesa->radeon.radeonScreen, flags));
 	    END_BATCH();
diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index 5202248ab77..a86841cea41 100644
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -168,7 +168,7 @@ static void r300ClearBuffer(r300ContextPtr r300, int flags,
         END_BATCH();
 	}
 
-    if (!rmesa->radeon.radeonScreen->driScreen->dri2.enabled) {
+    if (!rmesa->radeon.radeonScreen->kernel_mm) {
     	BEGIN_BATCH_NO_AUTOSTATE(9);
     	OUT_BATCH(cmdpacket3(r300->radeon.radeonScreen, R300_CMD_PACKET3_CLEAR));
     	OUT_BATCH_FLOAT32(dPriv->w / 2.0);
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index a8d42a2391e..dd9da80fd01 100644
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -199,7 +199,7 @@ static void r300FireEB(r300ContextPtr rmesa, int vertex_count, int type)
                   type |
                   R300_VAP_VF_CNTL__INDEX_SIZE_32bit);
 
-    if (!rmesa->radeon.radeonScreen->driScreen->dri2.enabled) {
+    if (!rmesa->radeon.radeonScreen->kernel_mm) {
     	OUT_BATCH_PACKET3(R300_PACKET3_INDX_BUFFER, 2);
 	    OUT_BATCH(R300_EB_UNK1 | (0 << 16) | R300_EB_UNK2);
     	OUT_BATCH_RELOC(rmesa->state.elt_dma_offset,
@@ -238,7 +238,7 @@ static void r300EmitAOS(r300ContextPtr rmesa, GLuint nr, GLuint offset)
 	OUT_BATCH(nr);
 
     
-    if (!rmesa->radeon.radeonScreen->driScreen->dri2.enabled) {
+    if (!rmesa->radeon.radeonScreen->kernel_mm) {
 	for (i = 0; i + 1 < nr; i += 2) {
 		OUT_BATCH((rmesa->state.aos[i].components << 0) |
 			  (rmesa->state.aos[i].stride << 8) |
diff --git a/src/mesa/drivers/dri/r300/radeon_context.c b/src/mesa/drivers/dri/r300/radeon_context.c
index 2f4d06110f9..2bb679b4793 100644
--- a/src/mesa/drivers/dri/r300/radeon_context.c
+++ b/src/mesa/drivers/dri/r300/radeon_context.c
@@ -303,55 +303,107 @@ void radeonCopySubBuffer(__DRIdrawablePrivate * dPriv,
 }
 
 static void
+radeon_make_kernel_renderbuffer_current(radeonContextPtr radeon,
+					GLframebuffer *draw)
+{
+	/* if radeon->fake */
+	struct radeon_renderbuffer *rb;
+
+	if ((rb = (void *)draw->Attachment[BUFFER_FRONT_LEFT].Renderbuffer)) {
+
+		if (!rb->bo) {
+			rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
+						radeon->radeonScreen->frontOffset,
+						0,
+						0,
+						RADEON_GEM_DOMAIN_VRAM,
+						0);
+		}
+		rb->cpp = radeon->radeonScreen->cpp;
+		rb->pitch = radeon->radeonScreen->frontPitch * rb->cpp;
+	}
+	if ((rb = (void *)draw->Attachment[BUFFER_BACK_LEFT].Renderbuffer)) {
+		if (!rb->bo) {
+			rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
+						radeon->radeonScreen->backOffset,
+						0,
+						0,
+						RADEON_GEM_DOMAIN_VRAM,
+						0);
+		}
+		rb->cpp = radeon->radeonScreen->cpp;
+		rb->pitch = radeon->radeonScreen->backPitch * rb->cpp;
+	}
+	if ((rb = (void *)draw->Attachment[BUFFER_DEPTH].Renderbuffer)) {
+		if (!rb->bo) {
+			rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
+						radeon->radeonScreen->depthOffset,
+						0,
+						0,
+						RADEON_GEM_DOMAIN_VRAM,
+						0);
+		}
+		rb->cpp = radeon->radeonScreen->cpp;
+		rb->pitch = radeon->radeonScreen->depthPitch * rb->cpp;
+	}
+}
+
+static void
 radeon_make_renderbuffer_current(radeonContextPtr radeon,
-				 GLframebuffer *draw)
+					GLframebuffer *draw)
 {
 	int size = 4096*4096*4;
 	/* if radeon->fake */
 	struct radeon_renderbuffer *rb;
 
-	if ((rb = (void *)draw->Attachment[BUFFER_FRONT_LEFT].Renderbuffer)) {
+	if (radeon->radeonScreen->kernel_mm) {
+		radeon_make_kernel_renderbuffer_current(radeon, draw);
+		return;
+	}
+			
 
+	if ((rb = (void *)draw->Attachment[BUFFER_FRONT_LEFT].Renderbuffer)) {
 		if (!rb->bo) {
-            rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
-                                    radeon->radeonScreen->frontOffset +
-                                    radeon->radeonScreen->fbLocation,
-                                    size,
-                                    4096,
-                                    RADEON_GEM_DOMAIN_VRAM,
-                                    0);
-        }
+			rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
+						radeon->radeonScreen->frontOffset +
+						radeon->radeonScreen->fbLocation,
+						size,
+						4096,
+						RADEON_GEM_DOMAIN_VRAM,
+						0);
+		}
 		rb->cpp = radeon->radeonScreen->cpp;
 		rb->pitch = radeon->radeonScreen->frontPitch * rb->cpp;
 	}
 	if ((rb = (void *)draw->Attachment[BUFFER_BACK_LEFT].Renderbuffer)) {
 		if (!rb->bo) {
-            rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
-                                    radeon->radeonScreen->backOffset +
-                                    radeon->radeonScreen->fbLocation,
-                                    size,
-                                    4096,
-                                    RADEON_GEM_DOMAIN_VRAM,
-                                    0);
-        }
+			rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
+						radeon->radeonScreen->backOffset +
+						radeon->radeonScreen->fbLocation,
+						size,
+						4096,
+						RADEON_GEM_DOMAIN_VRAM,
+						0);
+		}
 		rb->cpp = radeon->radeonScreen->cpp;
 		rb->pitch = radeon->radeonScreen->backPitch * rb->cpp;
 	}
 	if ((rb = (void *)draw->Attachment[BUFFER_DEPTH].Renderbuffer)) {
 		if (!rb->bo) {
-            rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
-                                    radeon->radeonScreen->depthOffset +
-                                    radeon->radeonScreen->fbLocation,
-                                    size,
-                                    4096,
-                                    RADEON_GEM_DOMAIN_VRAM,
-                                    0);
-        }
+			rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
+						radeon->radeonScreen->depthOffset +
+						radeon->radeonScreen->fbLocation,
+						size,
+						4096,
+						RADEON_GEM_DOMAIN_VRAM,
+						0);
+		}
 		rb->cpp = radeon->radeonScreen->cpp;
 		rb->pitch = radeon->radeonScreen->depthPitch * rb->cpp;
 	}
 }
 
+
 void
 radeon_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable)
 {
@@ -496,15 +548,15 @@ GLboolean radeonMakeCurrent(__DRIcontextPrivate * driContextPriv,
 	dfb = driDrawPriv->driverPrivate;
 	rfb = driReadPriv->driverPrivate;
 
-    if (driContextPriv->driScreenPriv->dri2.enabled) {    
-        radeon_update_renderbuffers(driContextPriv, driDrawPriv);
-        if (driDrawPriv != driReadPriv)
-            radeon_update_renderbuffers(driContextPriv, driReadPriv);
-        radeon->state.color.rrb =
-            (void *)dfb->Attachment[BUFFER_BACK_LEFT].Renderbuffer;
-        radeon->state.depth_buffer =
-            (void *)dfb->Attachment[BUFFER_DEPTH].Renderbuffer;
-    }
+	if (driContextPriv->driScreenPriv->dri2.enabled) {    
+		radeon_update_renderbuffers(driContextPriv, driDrawPriv);
+		if (driDrawPriv != driReadPriv)
+			radeon_update_renderbuffers(driContextPriv, driReadPriv);
+		radeon->state.color.rrb =
+			(void *)dfb->Attachment[BUFFER_BACK_LEFT].Renderbuffer;
+		radeon->state.depth_buffer =
+			(void *)dfb->Attachment[BUFFER_DEPTH].Renderbuffer;
+	}
 
 
 	if (RADEON_DEBUG & DEBUG_DRI)
@@ -514,10 +566,10 @@ GLboolean radeonMakeCurrent(__DRIcontextPrivate * driContextPriv,
 	if (driReadPriv != driDrawPriv)
 		driUpdateFramebufferSize(radeon->glCtx, driReadPriv);
 
-    if (!driContextPriv->driScreenPriv->dri2.enabled) {    
-    	radeon_make_renderbuffer_current(radeon, dfb);
-    }
-
+	if (!driContextPriv->driScreenPriv->dri2.enabled) {
+		radeon_make_renderbuffer_current(radeon, dfb);
+	}
+	
 	_mesa_make_current(radeon->glCtx, dfb, rfb);
 
 	if (radeon->dri.drawable != driDrawPriv) {
diff --git a/src/mesa/drivers/dri/r300/radeon_lock.c b/src/mesa/drivers/dri/r300/radeon_lock.c
index bef8db1d0f4..a1b21634410 100644
--- a/src/mesa/drivers/dri/r300/radeon_lock.c
+++ b/src/mesa/drivers/dri/r300/radeon_lock.c
@@ -121,7 +121,8 @@ void radeonGetLock(radeonContextPtr rmesa, GLuint flags)
 
 	if (sarea->ctx_owner != rmesa->dri.hwContext) {
 		sarea->ctx_owner = rmesa->dri.hwContext;
-        radeon_bo_legacy_texture_age(rmesa->radeonScreen->bom);
+		if (!rmesa->radeonScreen->kernel_mm)
+		    radeon_bo_legacy_texture_age(rmesa->radeonScreen->bom);
 	}
 
 	rmesa->lost_context = GL_TRUE;
diff --git a/src/mesa/drivers/dri/r300/radeon_state.c b/src/mesa/drivers/dri/r300/radeon_state.c
index 9cce179308b..14d489bf1aa 100644
--- a/src/mesa/drivers/dri/r300/radeon_state.c
+++ b/src/mesa/drivers/dri/r300/radeon_state.c
@@ -153,7 +153,7 @@ void radeonSetCliprects(radeonContextPtr radeon)
 	GLframebuffer *const draw_fb = (GLframebuffer*)drawable->driverPrivate;
 	GLframebuffer *const read_fb = (GLframebuffer*)readable->driverPrivate;
 
-    if (!radeon->radeonScreen->driScreen->dri2.enabled) {    
+    if (!radeon->radeonScreen->driScreen->dri2.enabled) {
 	if (draw_fb->_ColorDrawBufferIndexes[0] == BUFFER_BACK_LEFT) {
 		/* Can't ignore 2d windows if we are page flipping. */
 		if (drawable->numBackClipRects == 0 || radeon->doPageFlip ||