aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLajos Molnar <molnar@ti.com>2011-09-28 19:56:41 -0500
committerIliyan Malchev <malchev@google.com>2011-09-28 19:00:44 -0700
commitd5c489f15bc23891eb8f97e7aa337f595e9f43a8 (patch)
tree4f3ccd034dafedd357a19efb493878ad0ff88d95
parent3f7d597c1dfc8c1d0cfefe8980f31b163ee67b03 (diff)
downloadkernel_samsung_tuna-d5c489f15bc23891eb8f97e7aa337f595e9f43a8.zip
kernel_samsung_tuna-d5c489f15bc23891eb8f97e7aa337f595e9f43a8.tar.gz
kernel_samsung_tuna-d5c489f15bc23891eb8f97e7aa337f595e9f43a8.tar.bz2
Revert "OMAP:DSS:DSSCOMP: Workaround for displaying garbage on screen."
This is no longer needed due to resolving of the race condition in manager->apply() Signed-off-by: Lajos Molnar <molnar@ti.com>
-rw-r--r--drivers/video/omap2/dsscomp/gralloc.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/video/omap2/dsscomp/gralloc.c b/drivers/video/omap2/dsscomp/gralloc.c
index ed6691c..3c01bb5 100644
--- a/drivers/video/omap2/dsscomp/gralloc.c
+++ b/drivers/video/omap2/dsscomp/gralloc.c
@@ -49,14 +49,12 @@ static void unpin_tiler_blocks(struct list_head *slots)
/* unpin any tiler memory */
list_for_each_entry(slot, slots, q) {
- /* FIXME do not unpin yet as it still may be displaying */
- if (0)
- tiler_unpin_block(slot->slot);
+ tiler_unpin_block(slot->slot);
up(&free_slots_sem);
}
/* free tiler slots */
- list_splice_tail_init(slots, &free_slots);
+ list_splice_init(slots, &free_slots);
}
static void dsscomp_gralloc_cb(void *data, int status)
@@ -322,7 +320,6 @@ int dsscomp_gralloc_queue(struct dsscomp_setup_dispc_data *d,
}
mutex_lock(&mtx);
slot = list_first_entry(&free_slots, typeof(*slot), q);
- tiler_unpin_block(slot->slot);
list_move(&slot->q, &gsync->slots);
mutex_unlock(&mtx);
}