Skip to content

L
linux
Commit 5719d35c authored by Amber Jain's avatar Amber Jain Committed by Tomi Valkeinen
Browse files
Options

OMAP: DSS2: Use for loop where ever possible in SR(), RR() 

Use for loop instead of individual entries for OVL_FIR_COEF_H, OVL_FIR_COEF_HV,
OVL_FIR_COEF_V and OVL_CONV_COEF in SR() and  RR().
Signed-off-by: default avatarAmber Jain <amber@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent ed14a3ce
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 128 deletions
drivers/video/omap2/dss/dispc.c
View file @ 5719d35c
...@@ -129,6 +129,7 @@ static inline u32 dispc_read_reg(const u16 idx) ...@@ -129,6 +129,7 @@ static inline u32 dispc_read_reg(const u16 idx)
void dispc_save_context(void) void dispc_save_context(void)
{ {
int i;
if (cpu_is_omap24xx()) if (cpu_is_omap24xx())
return; return;
...@@ -204,38 +205,17 @@ void dispc_save_context(void) ...@@ -204,38 +205,17 @@ void dispc_save_context(void)
SR(OVL_ACCU0(OMAP_DSS_VIDEO1)); SR(OVL_ACCU0(OMAP_DSS_VIDEO1));
SR(OVL_ACCU1(OMAP_DSS_VIDEO1)); SR(OVL_ACCU1(OMAP_DSS_VIDEO1));
SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 0)); for (i = 0; i < 8; i++)
SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 1)); SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, i));
SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 2));
SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 3)); for (i = 0; i < 8; i++)
SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 4)); SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, i));
SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 5));
SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 6)); for (i = 0; i < 5; i++)
SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 7)); SR(OVL_CONV_COEF(OMAP_DSS_VIDEO1, i));
SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 0)); for (i = 0; i < 8; i++)
SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 1)); SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, i));
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));
SR(OVL_PRELOAD(OMAP_DSS_VIDEO1)); SR(OVL_PRELOAD(OMAP_DSS_VIDEO1));
...@@ -253,38 +233,17 @@ void dispc_save_context(void) ...@@ -253,38 +233,17 @@ void dispc_save_context(void)
SR(OVL_ACCU0(OMAP_DSS_VIDEO2)); SR(OVL_ACCU0(OMAP_DSS_VIDEO2));
SR(OVL_ACCU1(OMAP_DSS_VIDEO2)); SR(OVL_ACCU1(OMAP_DSS_VIDEO2));
SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 0)); for (i = 0; i < 8; i++)
SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 1)); SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, i));
SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 2));
SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 3)); for (i = 0; i < 8; i++)
SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 4)); SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, i));
SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 5));
SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 6)); for (i = 0; i < 5; i++)
SR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 7)); SR(OVL_CONV_COEF(OMAP_DSS_VIDEO2, i));
SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 0)); for (i = 0; i < 8; i++)
SR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 1)); SR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, i));
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));
SR(OVL_PRELOAD(OMAP_DSS_VIDEO2)); SR(OVL_PRELOAD(OMAP_DSS_VIDEO2));
...@@ -294,6 +253,7 @@ void dispc_save_context(void) ...@@ -294,6 +253,7 @@ void dispc_save_context(void)
void dispc_restore_context(void) void dispc_restore_context(void)
{ {
int i;
RR(SYSCONFIG); RR(SYSCONFIG);
/*RR(IRQENABLE);*/ /*RR(IRQENABLE);*/
/*RR(CONTROL);*/ /*RR(CONTROL);*/
...@@ -366,38 +326,17 @@ void dispc_restore_context(void) ...@@ -366,38 +326,17 @@ void dispc_restore_context(void)
RR(OVL_ACCU0(OMAP_DSS_VIDEO1)); RR(OVL_ACCU0(OMAP_DSS_VIDEO1));
RR(OVL_ACCU1(OMAP_DSS_VIDEO1)); RR(OVL_ACCU1(OMAP_DSS_VIDEO1));
RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 0)); for (i = 0; i < 8; i++)
RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 1)); RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, i));
RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 2));
RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 3)); for (i = 0; i < 8; i++)
RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 4)); RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, i));
RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 5));
RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 6)); for (i = 0; i < 5; i++)
RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO1, 7)); RR(OVL_CONV_COEF(OMAP_DSS_VIDEO1, i));
RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 0)); for (i = 0; i < 8; i++)
RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO1, 1)); RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO1, i));
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));
RR(OVL_PRELOAD(OMAP_DSS_VIDEO1)); RR(OVL_PRELOAD(OMAP_DSS_VIDEO1));
...@@ -415,38 +354,17 @@ void dispc_restore_context(void) ...@@ -415,38 +354,17 @@ void dispc_restore_context(void)
RR(OVL_ACCU0(OMAP_DSS_VIDEO2)); RR(OVL_ACCU0(OMAP_DSS_VIDEO2));
RR(OVL_ACCU1(OMAP_DSS_VIDEO2)); RR(OVL_ACCU1(OMAP_DSS_VIDEO2));
RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 0)); for (i = 0; i < 8; i++)
RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 1)); RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, i));
RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 2));
RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 3)); for (i = 0; i < 8; i++)
RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 4)); RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, i));
RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 5));
RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 6)); for (i = 0; i < 5; i++)
RR(OVL_FIR_COEF_H(OMAP_DSS_VIDEO2, 7)); RR(OVL_CONV_COEF(OMAP_DSS_VIDEO2, i));
RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 0)); for (i = 0; i < 8; i++)
RR(OVL_FIR_COEF_HV(OMAP_DSS_VIDEO2, 1)); RR(OVL_FIR_COEF_V(OMAP_DSS_VIDEO2, i));
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));
RR(OVL_PRELOAD(OMAP_DSS_VIDEO2)); RR(OVL_PRELOAD(OMAP_DSS_VIDEO2));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7