Fix build break and warnings
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index 8423d94..9ee38db 100644
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -586,6 +586,9 @@
bool enlarge_update_area;
struct callback_states cb; /* callback data for the last 3 states */
+
+ bool cpr_enable;
+ struct omap_dss_cpr_coefs cpr_coefs;
bool skip_init;
};
@@ -1110,10 +1113,9 @@
} else {
dispc_enable_alpha_blending(channel, c->alpha_enabled);
}
-
if (dss_has_feature(FEAT_CPR)) {
- dispc_enable_cpr(channel, mi->cpr_enable);
- dispc_set_cpr_coef(channel, &mi->cpr_coefs);
+ dispc_enable_cpr(channel, c->cpr_enable);
+ dispc_set_cpr_coef(channel, &c->cpr_coefs);
}
}
@@ -1638,11 +1640,8 @@
dss_cache.irq_enabled = true;
}
- if (!r_get) {
+ if (!r_get)
r = configure_dispc();
- if (r)
- pr_info("mgr_blank while GO is set");
- }
if (r_get || !wait_for_go) {
/* pretend that programming has happened */
@@ -1722,8 +1721,6 @@
spin_lock_irqsave(&dss_cache.lock, flags);
if (!mgr->device || mgr->device->state != OMAP_DSS_DISPLAY_ACTIVE) {
- pr_info_ratelimited("cannot apply mgr(%s) on inactive device\n",
- mgr->name);
r = -ENODEV;
goto done;
}
@@ -1847,6 +1844,8 @@
mc->trans_key = mgr->info.trans_key;
mc->trans_enabled = mgr->info.trans_enabled;
mc->alpha_enabled = mgr->info.alpha_enabled;
+ mc->cpr_coefs = mgr->info.cpr_coefs;
+ mc->cpr_enable = mgr->info.cpr_enable;
mc->manual_upd_display =
dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
diff --git a/drivers/video/omap2/dsscomp/queue.c b/drivers/video/omap2/dsscomp/queue.c
index c25d655..4b7b823 100644
--- a/drivers/video/omap2/dsscomp/queue.c
+++ b/drivers/video/omap2/dsscomp/queue.c
@@ -592,8 +592,6 @@
r = -ENODEV;
} else {
r = mgr->apply(mgr);
- if (r)
- dev_err(DEV(cdev), "failed while applying %d", r);
/* keep error if set_mgr_info failed */
if (!r && !cb_programmed)
r = -EINVAL;
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index ab16f01..89cc3b9 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -22,6 +22,7 @@
#include <linux/kobject.h>
#include <linux/device.h>
#include <linux/fb.h>
+#include <linux/module.h>
#define DISPC_IRQ_FRAMEDONE (1 << 0)
#define DISPC_IRQ_VSYNC (1 << 1)
