Commit 820caabf authored by Tomi Valkeinen's avatar Tomi Valkeinen

OMAPDSS: output: increase refcount in find_output funcs

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent b7328e14
...@@ -277,6 +277,8 @@ static int omap_modeset_init(struct drm_device *dev) ...@@ -277,6 +277,8 @@ static int omap_modeset_init(struct drm_device *dev)
if (supported_outputs & output->id) if (supported_outputs & output->id)
encoder->possible_crtcs |= (1 << id); encoder->possible_crtcs |= (1 << id);
} }
omap_dss_put_device(output);
} }
DBG("registered %d planes, %d crtcs, %d encoders and %d connectors\n", DBG("registered %d planes, %d crtcs, %d encoders and %d connectors\n",
......
...@@ -121,7 +121,7 @@ struct omap_dss_device *omap_dss_find_output(const char *name) ...@@ -121,7 +121,7 @@ struct omap_dss_device *omap_dss_find_output(const char *name)
list_for_each_entry(out, &output_list, list) { list_for_each_entry(out, &output_list, list) {
if (strcmp(out->name, name) == 0) if (strcmp(out->name, name) == 0)
return out; return omap_dss_get_device(out);
} }
return NULL; return NULL;
...@@ -134,7 +134,7 @@ struct omap_dss_device *omap_dss_find_output_by_node(struct device_node *node) ...@@ -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) { list_for_each_entry(out, &output_list, list) {
if (out->dev->of_node == node) if (out->dev->of_node == node)
return out; return omap_dss_get_device(out);
} }
return NULL; return NULL;
...@@ -143,20 +143,25 @@ EXPORT_SYMBOL(omap_dss_find_output_by_node); ...@@ -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) 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); EXPORT_SYMBOL(omapdss_find_output_from_display);
struct omap_overlay_manager *omapdss_find_mgr_from_display(struct omap_dss_device *dssdev) struct omap_overlay_manager *omapdss_find_mgr_from_display(struct omap_dss_device *dssdev)
{ {
struct omap_dss_device *out; struct omap_dss_device *out;
struct omap_overlay_manager *mgr;
out = omapdss_find_output_from_display(dssdev); out = omapdss_find_output_from_display(dssdev);
if (out == NULL) if (out == NULL)
return NULL; return NULL;
return out->manager; mgr = out->manager;
omap_dss_put_device(out);
return mgr;
} }
EXPORT_SYMBOL(omapdss_find_mgr_from_display); EXPORT_SYMBOL(omapdss_find_mgr_from_display);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment