From 53622108b1502363e937151d939d8b0dccc49f32 Mon Sep 17 00:00:00 2001 From: Amber Jain Date: Thu, 19 May 2011 19:47:52 +0530 Subject: [PATCH] --- yaml --- r: 251089 b: refs/heads/master c: 5719d35cce5b8f7c09cbf6860a37e9762b3bda72 h: refs/heads/master i: 251087: 676d36615282a112737df7bb5cbfec121b789fec v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dispc.c | 174 +++++++------------------- 2 files changed, 47 insertions(+), 129 deletions(-) diff --git a/[refs] b/[refs] index da82fddb6719..068de4a1c2cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed14a3ce9878185ea8348cc2f2e9b53129f84dc7 +refs/heads/master: 5719d35cce5b8f7c09cbf6860a37e9762b3bda72 diff --git a/trunk/drivers/video/omap2/dss/dispc.c b/trunk/drivers/video/omap2/dss/dispc.c index fd8f68e616d0..d16eb70bf5b5 100644 --- a/trunk/drivers/video/omap2/dss/dispc.c +++ b/trunk/drivers/video/omap2/dss/dispc.c @@ -129,6 +129,7 @@ static inline u32 dispc_read_reg(const u16 idx) void dispc_save_context(void) { + int i; if (cpu_is_omap24xx()) return; @@ -204,38 +205,17 @@ void dispc_save_context(void) SR(OVL_ACCU0(OMAP_DSS_VIDEO1)); SR(OVL_ACCU1(OMAP_DSS_VIDEO1)); - SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 0)); - SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 1)); - SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 2)); - SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 3)); - SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 4)); - SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 5)); - SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 6)); - SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 7)); - - SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 0)); - SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 1)); - SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 2)); - SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 3)); - SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 4)); - SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 5)); - SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 6)); - SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 7)); - - SR(OVL_CONV_COEF(OMAP_DSS_VIDEO1, 0)); - SR(OVL_CONV_COEF(OMAP_DSS_VIDEO1, 1)); - SR(OVL_CONV_COEF(OMAP_DSS_VIDEO1, 2)); - SR(OVL_CONV_COEF(OMAP_DSS_VIDEO1, 3)); - SR(OVL_CONV_COEF(OMAP_DSS_VIDEO1, 4)); - - SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, 0)); - SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, 1)); - SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, 2)); - SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, 3)); - SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, 4)); - SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, 5)); - SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, 6)); - SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, 7)); + for (i = 0; i < 8; i++) + SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, i)); + + for (i = 0; i < 8; i++) + SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, i)); + + for (i = 0; i < 5; i++) + SR(OVL_CONV_COEF(OMAP_DSS_VIDEO1, i)); + + for (i = 0; i < 8; i++) + SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, i)); SR(OVL_PRELOAD(OMAP_DSS_VIDEO1)); @@ -253,38 +233,17 @@ void dispc_save_context(void) SR(OVL_ACCU0(OMAP_DSS_VIDEO2)); SR(OVL_ACCU1(OMAP_DSS_VIDEO2)); - SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 0)); - SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 1)); - SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 2)); - SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 3)); - SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 4)); - SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 5)); - SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 6)); - SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 7)); - - SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 0)); - SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 1)); - SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 2)); - SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 3)); - SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 4)); - SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 5)); - SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 6)); - SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 7)); - - SR(OVL_CONV_COEF(OMAP_DSS_VIDEO2, 0)); - SR(OVL_CONV_COEF(OMAP_DSS_VIDEO2, 1)); - SR(OVL_CONV_COEF(OMAP_DSS_VIDEO2, 2)); - SR(OVL_CONV_COEF(OMAP_DSS_VIDEO2, 3)); - SR(OVL_CONV_COEF(OMAP_DSS_VIDEO2, 4)); - - SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, 0)); - SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, 1)); - SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, 2)); - SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, 3)); - SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, 4)); - SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, 5)); - SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, 6)); - SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, 7)); + for (i = 0; i < 8; i++) + SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, i)); + + for (i = 0; i < 8; i++) + SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, i)); + + for (i = 0; i < 5; i++) + SR(OVL_CONV_COEF(OMAP_DSS_VIDEO2, i)); + + for (i = 0; i < 8; i++) + SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, i)); SR(OVL_PRELOAD(OMAP_DSS_VIDEO2)); @@ -294,6 +253,7 @@ void dispc_save_context(void) void dispc_restore_context(void) { + int i; RR(SYSCONFIG); /*RR(IRQENABLE);*/ /*RR(CONTROL);*/ @@ -366,38 +326,17 @@ void dispc_restore_context(void) RR(OVL_ACCU0(OMAP_DSS_VIDEO1)); RR(OVL_ACCU1(OMAP_DSS_VIDEO1)); - RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 0)); - RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 1)); - RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 2)); - RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 3)); - RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 4)); - RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 5)); - RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 6)); - RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 7)); - - RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 0)); - RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 1)); - RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 2)); - RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 3)); - RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 4)); - RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 5)); - RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 6)); - RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 7)); - - RR(OVL_CONV_COEF(OMAP_DSS_VIDEO1, 0)); - RR(OVL_CONV_COEF(OMAP_DSS_VIDEO1, 1)); - RR(OVL_CONV_COEF(OMAP_DSS_VIDEO1, 2)); - RR(OVL_CONV_COEF(OMAP_DSS_VIDEO1, 3)); - RR(OVL_CONV_COEF(OMAP_DSS_VIDEO1, 4)); - - RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, 0)); - RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, 1)); - RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, 2)); - RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, 3)); - RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, 4)); - RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, 5)); - RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, 6)); - RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, 7)); + for (i = 0; i < 8; i++) + RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, i)); + + for (i = 0; i < 8; i++) + RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, i)); + + for (i = 0; i < 5; i++) + RR(OVL_CONV_COEF(OMAP_DSS_VIDEO1, i)); + + for (i = 0; i < 8; i++) + RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, i)); RR(OVL_PRELOAD(OMAP_DSS_VIDEO1)); @@ -415,38 +354,17 @@ void dispc_restore_context(void) RR(OVL_ACCU0(OMAP_DSS_VIDEO2)); RR(OVL_ACCU1(OMAP_DSS_VIDEO2)); - RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 0)); - RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 1)); - RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 2)); - RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 3)); - RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 4)); - RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 5)); - RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 6)); - RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 7)); - - RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 0)); - RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 1)); - RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 2)); - RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 3)); - RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 4)); - RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 5)); - RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 6)); - RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 7)); - - RR(OVL_CONV_COEF(OMAP_DSS_VIDEO2, 0)); - RR(OVL_CONV_COEF(OMAP_DSS_VIDEO2, 1)); - RR(OVL_CONV_COEF(OMAP_DSS_VIDEO2, 2)); - RR(OVL_CONV_COEF(OMAP_DSS_VIDEO2, 3)); - RR(OVL_CONV_COEF(OMAP_DSS_VIDEO2, 4)); - - RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, 0)); - RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, 1)); - RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, 2)); - RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, 3)); - RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, 4)); - RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, 5)); - RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, 6)); - RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, 7)); + for (i = 0; i < 8; i++) + RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, i)); + + for (i = 0; i < 8; i++) + RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, i)); + + for (i = 0; i < 5; i++) + RR(OVL_CONV_COEF(OMAP_DSS_VIDEO2, i)); + + for (i = 0; i < 8; i++) + RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, i)); RR(OVL_PRELOAD(OMAP_DSS_VIDEO2));