From 4181f6d8e71686f32a7d458db1d518cb0449574f Mon Sep 17 00:00:00 2001
From: Archit Taneja <archit@ti.com>
Date: Wed, 29 Aug 2012 13:30:15 +0530
Subject: [PATCH] --- yaml --- r: 333577 b: refs/heads/master c:
 6d71b923e53184808b0206ebd74159c41a2dcf38 h: refs/heads/master i:   333575:
 1d3b8915d41e46dfc2ce876be2b787f927fd1bc0 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/video/omap2/dss/output.c | 67 ++++++++++++++++++++++++++
 trunk/include/video/omapdss.h          |  4 ++
 3 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 502297d9aa89..cf055816115d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81b87f515f6abbbe4eef42835065db9d0831ef35
+refs/heads/master: 6d71b923e53184808b0206ebd74159c41a2dcf38
diff --git a/trunk/drivers/video/omap2/dss/output.c b/trunk/drivers/video/omap2/dss/output.c
index 388a6c997b9c..1a84b79d5580 100644
--- a/trunk/drivers/video/omap2/dss/output.c
+++ b/trunk/drivers/video/omap2/dss/output.c
@@ -16,6 +16,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
@@ -24,6 +25,72 @@
 #include "dss.h"
 
 static LIST_HEAD(output_list);
+static DEFINE_MUTEX(output_lock);
+
+int omapdss_output_set_device(struct omap_dss_output *out,
+		struct omap_dss_device *dssdev)
+{
+	int r;
+
+	mutex_lock(&output_lock);
+
+	if (out->device) {
+		DSSERR("output already has device %s connected to it\n",
+			out->device->name);
+		r = -EINVAL;
+		goto err;
+	}
+
+	if (out->type != dssdev->type) {
+		DSSERR("output type and display type don't match\n");
+		r = -EINVAL;
+		goto err;
+	}
+
+	out->device = dssdev;
+	dssdev->output = out;
+
+	mutex_unlock(&output_lock);
+
+	return 0;
+err:
+	mutex_unlock(&output_lock);
+
+	return r;
+}
+EXPORT_SYMBOL(omapdss_output_set_device);
+
+int omapdss_output_unset_device(struct omap_dss_output *out)
+{
+	int r;
+
+	mutex_lock(&output_lock);
+
+	if (!out->device) {
+		DSSERR("output doesn't have a device connected to it\n");
+		r = -EINVAL;
+		goto err;
+	}
+
+	if (out->device->state != OMAP_DSS_DISPLAY_DISABLED) {
+		DSSERR("device %s is not disabled, cannot unset device\n",
+				out->device->name);
+		r = -EINVAL;
+		goto err;
+	}
+
+	out->device->output = NULL;
+	out->device = NULL;
+
+	mutex_unlock(&output_lock);
+
+	return 0;
+err:
+	mutex_unlock(&output_lock);
+
+	return r;
+}
+EXPORT_SYMBOL(omapdss_output_unset_device);
 
 void dss_register_output(struct omap_dss_output *out)
 {
diff --git a/trunk/include/video/omapdss.h b/trunk/include/video/omapdss.h
index e202648166d2..6d08cf55e5e2 100644
--- a/trunk/include/video/omapdss.h
+++ b/trunk/include/video/omapdss.h
@@ -620,6 +620,7 @@ struct omap_dss_device {
 	enum omap_display_caps caps;
 
 	struct omap_overlay_manager *manager;
+	struct omap_dss_output *output;
 
 	enum omap_dss_display_state state;
 
@@ -731,6 +732,9 @@ int omap_dss_get_num_overlays(void);
 struct omap_overlay *omap_dss_get_overlay(int num);
 
 struct omap_dss_output *omap_dss_get_output(enum omap_dss_output_id id);
+int omapdss_output_set_device(struct omap_dss_output *out,
+		struct omap_dss_device *dssdev);
+int omapdss_output_unset_device(struct omap_dss_output *out);
 
 void omapdss_default_get_resolution(struct omap_dss_device *dssdev,
 		u16 *xres, u16 *yres);