Skip to content

Commit

Permalink
OMAPDSS: DISPC: Remove reduntant code for passing plane info
Browse files Browse the repository at this point in the history
overlay id is being retrived from overlay that was not initialized during probe.
This will cause NULL pointer exception when accessing the ovl->id
directly when initializing the DISPC without initializing the
overlas/managers during probe.

overlays/managers are being initialized during probe with a call
to omapdss_compat_init(). This call is being made from dsscomp or omapfb
probe. if either of these components are not used by the rendering engine
then it will cause NULL pointer exception when accessing overlays frmo DISPC.

Change-Id: I2c98aa5de4f3bf2a4ea6206f0f605d24343e9996
Signed-off-by: Srinivas Pulukuru <[email protected]>
  • Loading branch information
srinivas pulukuru authored and Gerrit Code Review committed Sep 24, 2013
1 parent 9f19590 commit 16b68af
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/video/omap2/dss/dispc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2445,7 +2445,6 @@ static int dispc_ovl_setup_common(enum omap_plane plane,
bool replication, const struct omap_video_timings *mgr_timings,
bool mem_to_mem, bool mflag_en)
{
struct omap_overlay *ovl = omap_dss_get_overlay(plane);
bool five_taps = true;
bool fieldmode = 0;
int r, cconv = 0;
Expand Down Expand Up @@ -2566,7 +2565,7 @@ static int dispc_ovl_setup_common(enum omap_plane plane,

if (dss_has_feature(FEAT_MFLAG)) {
mflag_en = true;
dispc_ovl_set_global_mflag(ovl->id, mflag_en);
dispc_ovl_set_global_mflag(plane, mflag_en);
} else if (plane == OMAP_DSS_GFX) {
dispc_enable_arbitration(plane,
channel == OMAP_DSS_CHANNEL_DIGIT);
Expand Down

0 comments on commit 16b68af

Please sign in to comment.