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: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 78a78c6ea576c209c352f2c063e9f94e5a479755..2c2316a59b6c780f9840e234dd5b7703cf9c43ab 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -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",

diff --git a/drivers/video/omap2/dss/output.c b/drivers/video/omap2/dss/output.c
index cc81fec1626f6bd53125db63c4e06619402ebb71..9ad7d2175a7b2dbba920ef651b99943e4b3193f7 100644 (file)
--- a/drivers/video/omap2/dss/output.c
+++ b/drivers/video/omap2/dss/output.c
@@ -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;
@@ -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;
@@ -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);