| Message ID | 75e516de4cb0787d52e4a9173d123df6903d561a.1343912533.git.cmahapatra@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Aug 07, 2012 at 01:58:17PM +0530, Chandrabhanu Mahapatra wrote: > OMAP4 checks are removed from VENC to provide it a cleaner interface. These > checks were introduced by patches "HACK: OMAP: DSS2: VENC: disable VENC on OMAP4 > to prevent crash" (ba02fa37de) by Tomi Valkeinen <tomi.valkeinen@ti.com> and > "OMAPDSS: VENC: fix NULL pointer dereference in DSS2 VENC sysfs debug attr on > OMAP4" (cc1d3e032d) by Danny Kukawka <danny.kukawka@bisect.de> to prevent VENC > from crashing OMAP4 kernel. An alternative approach is used to do the same in > later patches. in later patches ? This means you're causing a regression here. Just swap the patches around to avoid it.
On Tuesday 07 August 2012 02:21 PM, Felipe Balbi wrote: > On Tue, Aug 07, 2012 at 01:58:17PM +0530, Chandrabhanu Mahapatra wrote: >> OMAP4 checks are removed from VENC to provide it a cleaner interface. These >> checks were introduced by patches "HACK: OMAP: DSS2: VENC: disable VENC on OMAP4 >> to prevent crash" (ba02fa37de) by Tomi Valkeinen <tomi.valkeinen@ti.com> and >> "OMAPDSS: VENC: fix NULL pointer dereference in DSS2 VENC sysfs debug attr on >> OMAP4" (cc1d3e032d) by Danny Kukawka <danny.kukawka@bisect.de> to prevent VENC >> from crashing OMAP4 kernel. An alternative approach is used to do the same in >> later patches. > in later patches ? This means you're causing a regression here. Just > swap the patches around to avoid it. > Hi! Yes I do agree with you. But as VENC is disabled on omap4, the basic idea here was to remove unnecessary cpu_is checks and achieve the same through a better approach.
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index 3a22087..8fc165a 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -752,11 +752,6 @@ static void venc_dump_regs(struct seq_file *s) { #define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, venc_read_reg(r)) - if (cpu_is_omap44xx()) { - seq_printf(s, "VENC currently disabled on OMAP44xx\n"); - return; - } - if (venc_runtime_get()) return; @@ -971,16 +966,10 @@ static struct platform_driver omap_venchw_driver = { int __init venc_init_platform_driver(void) { - if (cpu_is_omap44xx()) - return 0; - return platform_driver_probe(&omap_venchw_driver, omap_venchw_probe); } void __exit venc_uninit_platform_driver(void) { - if (cpu_is_omap44xx()) - return; - platform_driver_unregister(&omap_venchw_driver); }
OMAP4 checks are removed from VENC to provide it a cleaner interface. These checks were introduced by patches "HACK: OMAP: DSS2: VENC: disable VENC on OMAP4 to prevent crash" (ba02fa37de) by Tomi Valkeinen <tomi.valkeinen@ti.com> and "OMAPDSS: VENC: fix NULL pointer dereference in DSS2 VENC sysfs debug attr on OMAP4" (cc1d3e032d) by Danny Kukawka <danny.kukawka@bisect.de> to prevent VENC from crashing OMAP4 kernel. An alternative approach is used to do the same in later patches. Signed-off-by: Chandrabhanu Mahapatra <cmahapatra@ti.com> --- drivers/video/omap2/dss/venc.c | 11 ----------- 1 file changed, 11 deletions(-)