Skip to content

Commit

Permalink
OMAPDSS: output: increase refcount in find_output funcs
Browse files Browse the repository at this point in the history
Now that omap_dss_output has been combined into omap_dss_device, we can
add ref counting for the relevant output functions also.

This patch adds omap_dss_get_device() calls to the various find_output()
style functions. This, of course, means that the users of those
find_output functions need to do a omap_dss_put_device() after use.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Tomi Valkeinen committed Jun 17, 2013
1 parent b7328e1 commit 820caab
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/omapdrm/omap_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,8 @@ static int omap_modeset_init(struct drm_device *dev)
if (supported_outputs & output->id)
encoder->possible_crtcs |= (1 << id);
}

omap_dss_put_device(output);
}

DBG("registered %d planes, %d crtcs, %d encoders and %d connectors\n",
Expand Down
13 changes: 9 additions & 4 deletions drivers/video/omap2/dss/output.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ struct omap_dss_device *omap_dss_find_output(const char *name)

list_for_each_entry(out, &output_list, list) {
if (strcmp(out->name, name) == 0)
return out;
return omap_dss_get_device(out);
}

return NULL;
Expand All @@ -134,7 +134,7 @@ struct omap_dss_device *omap_dss_find_output_by_node(struct device_node *node)

list_for_each_entry(out, &output_list, list) {
if (out->dev->of_node == node)
return out;
return omap_dss_get_device(out);
}

return NULL;
Expand All @@ -143,20 +143,25 @@ EXPORT_SYMBOL(omap_dss_find_output_by_node);

struct omap_dss_device *omapdss_find_output_from_display(struct omap_dss_device *dssdev)
{
return dssdev->output;
return omap_dss_get_device(dssdev->output);
}
EXPORT_SYMBOL(omapdss_find_output_from_display);

struct omap_overlay_manager *omapdss_find_mgr_from_display(struct omap_dss_device *dssdev)
{
struct omap_dss_device *out;
struct omap_overlay_manager *mgr;

out = omapdss_find_output_from_display(dssdev);

if (out == NULL)
return NULL;

return out->manager;
mgr = out->manager;

omap_dss_put_device(out);

return mgr;
}
EXPORT_SYMBOL(omapdss_find_mgr_from_display);

Expand Down

0 comments on commit 820caab

Please sign in to comment.