| Message ID | a07a3a216827e830cfa249f4f39ad26e75dc0afd.1345468541.git.cmahapatra@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 2012-08-20 at 18:54 +0530, Chandrabhanu Mahapatra wrote: > This is a alternative to "HACK: OMAP: DSS2: VENC: disable VENC on OMAP4 to > prevent crash" (ba02fa37de) by Tomi Valkeinen <tomi.valkeinen@ti.com> to prevent > VENC from crashing OMAP4 kernel. This prevents OMAPDSS from initial registration > of a device for VENC on OMAP4. > > Signed-off-by: Chandrabhanu Mahapatra <cmahapatra@ti.com> > --- > arch/arm/mach-omap2/display.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c > index af1ed7d..ee40739 100644 > --- a/arch/arm/mach-omap2/display.c > +++ b/arch/arm/mach-omap2/display.c > @@ -95,7 +95,6 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = { > { "dss_core", "omapdss_dss", -1 }, > { "dss_dispc", "omapdss_dispc", -1 }, > { "dss_rfbi", "omapdss_rfbi", -1 }, > - { "dss_venc", "omapdss_venc", -1 }, > { "dss_dsi1", "omapdss_dsi", 0 }, > { "dss_dsi2", "omapdss_dsi", 1 }, > { "dss_hdmi", "omapdss_hdmi", -1 }, You need to reorder this and the previous patch. If you first remove the workaround from the previous patch, the kernel will crash if after that patch. So this one should be before the previous patch. Tomi
On Tue, Aug 21, 2012 at 4:02 PM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote: > On Mon, 2012-08-20 at 18:54 +0530, Chandrabhanu Mahapatra wrote: >> This is a alternative to "HACK: OMAP: DSS2: VENC: disable VENC on OMAP4 to >> prevent crash" (ba02fa37de) by Tomi Valkeinen <tomi.valkeinen@ti.com> to prevent >> VENC from crashing OMAP4 kernel. This prevents OMAPDSS from initial registration >> of a device for VENC on OMAP4. >> >> Signed-off-by: Chandrabhanu Mahapatra <cmahapatra@ti.com> >> --- >> arch/arm/mach-omap2/display.c | 1 - >> 1 file changed, 1 deletion(-) >> >> diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c >> index af1ed7d..ee40739 100644 >> --- a/arch/arm/mach-omap2/display.c >> +++ b/arch/arm/mach-omap2/display.c >> @@ -95,7 +95,6 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = { >> { "dss_core", "omapdss_dss", -1 }, >> { "dss_dispc", "omapdss_dispc", -1 }, >> { "dss_rfbi", "omapdss_rfbi", -1 }, >> - { "dss_venc", "omapdss_venc", -1 }, >> { "dss_dsi1", "omapdss_dsi", 0 }, >> { "dss_dsi2", "omapdss_dsi", 1 }, >> { "dss_hdmi", "omapdss_hdmi", -1 }, > > You need to reorder this and the previous patch. If you first remove the > workaround from the previous patch, the kernel will crash if after that > patch. So this one should be before the previous patch. > > Tomi > Ok.
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index af1ed7d..ee40739 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -95,7 +95,6 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = { { "dss_core", "omapdss_dss", -1 }, { "dss_dispc", "omapdss_dispc", -1 }, { "dss_rfbi", "omapdss_rfbi", -1 }, - { "dss_venc", "omapdss_venc", -1 }, { "dss_dsi1", "omapdss_dsi", 0 }, { "dss_dsi2", "omapdss_dsi", 1 }, { "dss_hdmi", "omapdss_hdmi", -1 },
This is a alternative to "HACK: OMAP: DSS2: VENC: disable VENC on OMAP4 to prevent crash" (ba02fa37de) by Tomi Valkeinen <tomi.valkeinen@ti.com> to prevent VENC from crashing OMAP4 kernel. This prevents OMAPDSS from initial registration of a device for VENC on OMAP4. Signed-off-by: Chandrabhanu Mahapatra <cmahapatra@ti.com> --- arch/arm/mach-omap2/display.c | 1 - 1 file changed, 1 deletion(-)