diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-09-29 16:46:16 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-10-22 04:33:13 -0400 |
commit | aba837a280ce9b9be70b172fa8bda3e40a679051 (patch) | |
tree | 7db08cfb1dc0ab74a808e5c4e775f0615f4c2ce5 | |
parent | 26450d452bef641d4863fcc9f905779844fc3353 (diff) |
OMAPDSS: fix dispc register dump for preload & mflag
Preload register is dumped twice for video overlays and mflag register
is not dumped for GFX.
Fix the register dump.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r-- | drivers/video/fbdev/omap2/dss/dispc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c index e67976bd0627..0e9a74bb9fc2 100644 --- a/drivers/video/fbdev/omap2/dss/dispc.c +++ b/drivers/video/fbdev/omap2/dss/dispc.c | |||
@@ -3290,8 +3290,11 @@ static void dispc_dump_regs(struct seq_file *s) | |||
3290 | DUMPREG(i, DISPC_OVL_FIFO_SIZE_STATUS); | 3290 | DUMPREG(i, DISPC_OVL_FIFO_SIZE_STATUS); |
3291 | DUMPREG(i, DISPC_OVL_ROW_INC); | 3291 | DUMPREG(i, DISPC_OVL_ROW_INC); |
3292 | DUMPREG(i, DISPC_OVL_PIXEL_INC); | 3292 | DUMPREG(i, DISPC_OVL_PIXEL_INC); |
3293 | |||
3293 | if (dss_has_feature(FEAT_PRELOAD)) | 3294 | if (dss_has_feature(FEAT_PRELOAD)) |
3294 | DUMPREG(i, DISPC_OVL_PRELOAD); | 3295 | DUMPREG(i, DISPC_OVL_PRELOAD); |
3296 | if (dss_has_feature(FEAT_MFLAG)) | ||
3297 | DUMPREG(i, DISPC_OVL_MFLAG_THRESHOLD); | ||
3295 | 3298 | ||
3296 | if (i == OMAP_DSS_GFX) { | 3299 | if (i == OMAP_DSS_GFX) { |
3297 | DUMPREG(i, DISPC_OVL_WINDOW_SKIP); | 3300 | DUMPREG(i, DISPC_OVL_WINDOW_SKIP); |
@@ -3312,10 +3315,6 @@ static void dispc_dump_regs(struct seq_file *s) | |||
3312 | } | 3315 | } |
3313 | if (dss_has_feature(FEAT_ATTR2)) | 3316 | if (dss_has_feature(FEAT_ATTR2)) |
3314 | DUMPREG(i, DISPC_OVL_ATTRIBUTES2); | 3317 | DUMPREG(i, DISPC_OVL_ATTRIBUTES2); |
3315 | if (dss_has_feature(FEAT_PRELOAD)) | ||
3316 | DUMPREG(i, DISPC_OVL_PRELOAD); | ||
3317 | if (dss_has_feature(FEAT_MFLAG)) | ||
3318 | DUMPREG(i, DISPC_OVL_MFLAG_THRESHOLD); | ||
3319 | } | 3318 | } |
3320 | 3319 | ||
3321 | #undef DISPC_REG | 3320 | #undef DISPC_REG |