aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2009-11-16 21:41:26 +0100
committerThomas White <taw@bitwiz.org.uk>2009-11-16 21:41:26 +0100
commit53cf49505d15824ebbb50aa3c86ba4b059c0ac64 (patch)
treee72b3bbec3bd459ccbb7788d49ee7580ce9c5d6b
parent7f45ee027a690bbdab4a7dd1530c38bc4e743e13 (diff)
Simplify fences somewhat
The "dummy blit" isn't actually needed. Leaving the scratch buffer there for the time being, since it nicely shows up things which need fixing in KMS. Signed-off-by: Thomas White <taw@bitwiz.org.uk>
-rw-r--r--drivers/mfd/glamo/glamo-fence.c43
1 files changed, 9 insertions, 34 deletions
diff --git a/drivers/mfd/glamo/glamo-fence.c b/drivers/mfd/glamo/glamo-fence.c
index 2222b230278..178de2ab282 100644
--- a/drivers/mfd/glamo/glamo-fence.c
+++ b/drivers/mfd/glamo/glamo-fence.c
@@ -78,46 +78,21 @@ struct glamo_fence
static void glamo_fence_emit(struct glamo_fence *fence)
{
- u16 fring[26];
- u32 addr;
-
- addr = GLAMO_OFFSET_FB + fence->gdrm->scratch->start;
-
- fring[0] = 0x8000 | GLAMO_REG_2D_DST_X;
- fring[1] = 11;
- fring[2] = 0; /* dest X */
- fring[3] = 0; /* dest Y */
- fring[4] = addr & 0xffff; /* dest buffer */
- fring[5] = (addr >> 16) & 0x7f; /* dest buffer */
- fring[6] = 1; /* dest pitch */
- fring[7] = 1; /* dest height */
- fring[8] = 1; /* rect width */
- fring[9] = 1; /* rect height */
- fring[10] = 0x0000; /* patt L */
- fring[11] = 0x0000; /* patt H */
- fring[12] = 0x0000; /* FG colour */
- fring[13] = 0x0000; /* Padding */
-
- fring[14] = 0x8000 | GLAMO_REG_2D_COMMAND1;
- fring[15] = 3;
- fring[16] = 0x0000;
- fring[17] = 0xf0 << 8;
- fring[18] = 0x0000;
- fring[19] = 0x0000; /* Padding */
-
- fring[20] = 0x8000 | GLAMO_REG_2D_ID1;
- fring[21] = 3;
+ u16 fring[6];
+
+ fring[0] = 0x8000 | GLAMO_REG_2D_ID1;
+ fring[1] = 3;
fence->seq = atomic_inc_return(&fence->gdrm->curr_seq);
if ( fence->seq > 1<<14 ) {
atomic_set(&fence->gdrm->curr_seq, 0);
fence->seq = atomic_inc_return(&fence->gdrm->curr_seq);
}
- fring[22] = 1<<15 | fence->seq;
- fring[23] = 0; /* Unused */
- fring[24] = 0; /* Unused */
- fring[25] = 0; /* Padding */
+ fring[2] = 1<<15 | fence->seq;
+ fring[3] = 0; /* Unused */
+ fring[4] = 0; /* Unused */
+ fring[5] = 0; /* Padding */
- glamo_add_to_ring(fence->gdrm, fring, 52);
+ glamo_add_to_ring(fence->gdrm, fring, 12);
}