From: Archit Taneja <archit@ti.com> To: tomi.valkeinen@ti.com Cc: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, rob@ti.com, sumit.semwal@ti.com, Archit Taneja <archit@ti.com> Subject: [PATCH 03/23] OMAPDSS: output: Add set/unset device ops for omap_dss_output Date: Tue, 21 Aug 2012 06:10:10 +0000 [thread overview] Message-ID: <1345528711-27801-4-git-send-email-archit@ti.com> (raw) In-Reply-To: <1345528711-27801-1-git-send-email-archit@ti.com> An output entity represented by the struct omap_dss_output connects to a omap_dss_device entity. Add functions to set or unset an output's device. This is similar to how managers and devices were connected previously. An output can connect to a device without being connected to a manager. However, the output needs to eventually connect to a manager so that the connected panel can be enabled. Keep the omap_overlay_manager pointer in omap_dss_device for now to prevent breaking things. This will be removed later when outputs are supported completely. Signed-off-by: Archit Taneja <archit@ti.com> --- drivers/video/omap2/dss/output.c | 67 ++++++++++++++++++++++++++++++++++++++ include/video/omapdss.h | 5 +++ 2 files changed, 72 insertions(+) diff --git a/drivers/video/omap2/dss/output.c b/drivers/video/omap2/dss/output.c index 034ebbe..ac57b19 100644 --- a/drivers/video/omap2/dss/output.c +++ b/drivers/video/omap2/dss/output.c @@ -24,6 +24,70 @@ #include "dss.h" static struct list_head output_list; +static DEFINE_MUTEX(output_lock); + +static int dss_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; +} + +static int dss_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; +} struct omap_dss_output *dss_create_output(struct platform_device *pdev) { @@ -35,6 +99,9 @@ struct omap_dss_output *dss_create_output(struct platform_device *pdev) out->pdev = pdev; + out->set_device = &dss_output_set_device; + out->unset_device = &dss_output_unset_device; + list_add_tail(&out->list, &output_list); return out; diff --git a/include/video/omapdss.h b/include/video/omapdss.h index 0ba613f..2e40f27 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h @@ -518,6 +518,10 @@ struct omap_dss_output { struct omap_overlay_manager *manager; struct omap_dss_device *device; + + int (*set_device) (struct omap_dss_output *out, + struct omap_dss_device *dssdev); + int (*unset_device) (struct omap_dss_output *out); }; struct omap_dss_device { @@ -619,6 +623,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; -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Archit Taneja <archit@ti.com> To: tomi.valkeinen@ti.com Cc: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, rob@ti.com, sumit.semwal@ti.com, Archit Taneja <archit@ti.com> Subject: [PATCH 03/23] OMAPDSS: output: Add set/unset device ops for omap_dss_output Date: Tue, 21 Aug 2012 11:28:10 +0530 [thread overview] Message-ID: <1345528711-27801-4-git-send-email-archit@ti.com> (raw) In-Reply-To: <1345528711-27801-1-git-send-email-archit@ti.com> An output entity represented by the struct omap_dss_output connects to a omap_dss_device entity. Add functions to set or unset an output's device. This is similar to how managers and devices were connected previously. An output can connect to a device without being connected to a manager. However, the output needs to eventually connect to a manager so that the connected panel can be enabled. Keep the omap_overlay_manager pointer in omap_dss_device for now to prevent breaking things. This will be removed later when outputs are supported completely. Signed-off-by: Archit Taneja <archit@ti.com> --- drivers/video/omap2/dss/output.c | 67 ++++++++++++++++++++++++++++++++++++++ include/video/omapdss.h | 5 +++ 2 files changed, 72 insertions(+) diff --git a/drivers/video/omap2/dss/output.c b/drivers/video/omap2/dss/output.c index 034ebbe..ac57b19 100644 --- a/drivers/video/omap2/dss/output.c +++ b/drivers/video/omap2/dss/output.c @@ -24,6 +24,70 @@ #include "dss.h" static struct list_head output_list; +static DEFINE_MUTEX(output_lock); + +static int dss_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; +} + +static int dss_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; +} struct omap_dss_output *dss_create_output(struct platform_device *pdev) { @@ -35,6 +99,9 @@ struct omap_dss_output *dss_create_output(struct platform_device *pdev) out->pdev = pdev; + out->set_device = &dss_output_set_device; + out->unset_device = &dss_output_unset_device; + list_add_tail(&out->list, &output_list); return out; diff --git a/include/video/omapdss.h b/include/video/omapdss.h index 0ba613f..2e40f27 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h @@ -518,6 +518,10 @@ struct omap_dss_output { struct omap_overlay_manager *manager; struct omap_dss_device *device; + + int (*set_device) (struct omap_dss_output *out, + struct omap_dss_device *dssdev); + int (*unset_device) (struct omap_dss_output *out); }; struct omap_dss_device { @@ -619,6 +623,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; -- 1.7.9.5
next prev parent reply other threads:[~2012-08-21 6:10 UTC|newest] Thread overview: 148+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-21 5:58 [PATCH 00/23] OMAPDSS: Create output entities Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 01/23] OMAPDSS: outputs: Create a new entity called outputs Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-24 12:41 ` Tomi Valkeinen 2012-08-24 12:41 ` Tomi Valkeinen 2012-08-24 12:51 ` Archit Taneja 2012-08-24 12:53 ` Archit Taneja 2012-08-29 10:32 ` Tomi Valkeinen 2012-08-29 10:32 ` Tomi Valkeinen 2012-08-29 10:57 ` Archit Taneja 2012-08-29 10:58 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 02/23] OMAPDSS: outputs: Create and initialize output instances Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-24 13:14 ` Tomi Valkeinen 2012-08-24 13:14 ` Tomi Valkeinen 2012-08-27 6:19 ` Archit Taneja 2012-08-27 6:31 ` Archit Taneja 2012-08-27 6:44 ` Tomi Valkeinen 2012-08-27 6:44 ` Tomi Valkeinen 2012-08-21 5:58 ` Archit Taneja [this message] 2012-08-21 6:10 ` [PATCH 03/23] OMAPDSS: output: Add set/unset device ops for omap_dss_output Archit Taneja 2012-08-21 5:58 ` [PATCH 04/23] OMAPDSS: APPLY: Add manager set/unset output ops for omap_overlay_manager Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 05/23] OMAPDSS: Remove manager->device references Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 06/23] OMAP_VOUT: " Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 07/23] OMAPFB: remove " Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 08/23] OMAPDRM: Remove " Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 09/23] OMAPDSS: Create links between managers, outputs and devices Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 10/23] OMAPDSS: DPI: Pass outputs from panel driver to DPI interface driver Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 11/23] OMAPDSS: DSI: Remove dsi_pdev_map global struct Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 12/23] OMAPDSS: DSI: Pass outputs from panel driver to DSI interface driver Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 13/23] OMAPDSS: SDI: Pass outputs from panel driver to SDI " Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 14/23] OMAPDSS: RFBI: Pass outputs from panel driver to RFBI " Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 15/23] OMAPDSS: RFBI: Add output pointers as arguments to all exported functions Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 16/23] OMAPDSS: VENC: Pass outputs from panel driver to VENC interface driver Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 17/23] OMAPDSS: HDMI: Pass outputs from panel driver to HDMI " Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 18/23] OMAPDSS: HDMI: Add output pointers as arguments to all functions used by hdmi panel driver Archit Taneja 2012-08-21 6:10 ` [PATCH 18/23] OMAPDSS: HDMI: Add output pointers as arguments to all functions used by hdmi panel dr Archit Taneja 2012-08-21 5:58 ` [PATCH 19/23] OMAPDSS/OMAPFB: Change dssdev->manager references Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 20/23] OMAPDSS: MANAGER: Update display sysfs store Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 21/23] OMAPDSS: MANAGER: Get device via output Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 22/23] OMAPDSS: APPLY: Remove omap_dss_device references from dss_ovl_enable/disable Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-21 5:58 ` [PATCH 23/23] OMAPDSS: Remove old way of setting manager and device links Archit Taneja 2012-08-21 6:10 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 00/23] OMAPDSS: Create output entities Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 01/23] OMAPDSS: outputs: Create a new entity called outputs Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 02/23] OMAPDSS: outputs: Create and register output instances Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-31 11:57 ` Tomi Valkeinen 2012-08-31 11:57 ` Tomi Valkeinen 2012-08-31 12:03 ` Archit Taneja 2012-08-31 12:15 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 03/23] OMAPDSS: output: Add set/unset device ops for omap_dss_output Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-31 12:03 ` Tomi Valkeinen 2012-08-31 12:03 ` Tomi Valkeinen 2012-08-31 12:24 ` Archit Taneja 2012-08-31 12:36 ` Archit Taneja 2012-08-31 12:28 ` Tomi Valkeinen 2012-08-31 12:28 ` Tomi Valkeinen 2012-08-30 11:40 ` [PATCH v2 04/23] OMAPDSS: APPLY: Add manager set/unset output ops for omap_overlay_manager Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 05/23] OMAPDSS: Remove manager->device references Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 06/23] OMAP_VOUT: " Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-31 12:11 ` Tomi Valkeinen 2012-08-31 12:11 ` Tomi Valkeinen 2012-08-31 12:34 ` Archit Taneja 2012-08-31 12:46 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 07/23] OMAPFB: remove " Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 08/23] OMAPDRM: Remove " Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 09/23] OMAPDSS: Create links between managers, outputs and devices Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-31 14:10 ` Tomi Valkeinen 2012-08-31 14:10 ` Tomi Valkeinen 2012-08-31 14:24 ` Archit Taneja 2012-08-31 14:36 ` Archit Taneja 2012-08-31 14:45 ` Tomi Valkeinen 2012-08-31 14:45 ` Tomi Valkeinen 2012-08-31 15:08 ` Tomi Valkeinen 2012-08-31 15:08 ` Tomi Valkeinen 2012-09-03 9:26 ` Archit Taneja 2012-09-03 9:38 ` Archit Taneja 2012-09-03 9:35 ` Tomi Valkeinen 2012-09-03 9:35 ` Tomi Valkeinen 2012-08-30 11:40 ` [PATCH v2 10/23] OMAPDSS: DPI: Pass omap_dss_output within the driver Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-31 13:48 ` Tomi Valkeinen 2012-08-31 13:48 ` Tomi Valkeinen 2012-08-31 13:59 ` Archit Taneja 2012-08-31 14:00 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 11/23] OMAPDSS: DSI: Remove dsi_pdev_map global struct Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 12/23] OMAPDSS: DSI: Pass omap_dss_output within the driver Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 13/23] OMAPDSS: SDI: " Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 14/23] OMAPDSS: RFBI: " Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 15/23] OMAPDSS: RFBI: Add dssdev pointers as arguments to all exported functions Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-31 14:20 ` Tomi Valkeinen 2012-08-31 14:20 ` Tomi Valkeinen 2012-08-31 14:30 ` Archit Taneja 2012-08-31 14:42 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 16/23] OMAPDSS: VENC: Pass omap_dss_output within the driver Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 17/23] OMAPDSS: HDMI: " Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 18/23] OMAPDSS: HDMI: Add dssdev pointer as an argument to all functions used by hdmi panel driver Archit Taneja 2012-08-30 11:52 ` [PATCH v2 18/23] OMAPDSS: HDMI: Add dssdev pointer as an argument to all functions used by hdmi pane Archit Taneja 2012-08-30 11:40 ` [PATCH v2 19/23] OMAPDSS/OMAPFB: Change dssdev->manager references Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 20/23] OMAPDSS: MANAGER: Update display sysfs store Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-31 14:30 ` Tomi Valkeinen 2012-08-31 14:30 ` Tomi Valkeinen 2012-08-31 14:41 ` Archit Taneja 2012-08-31 14:53 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 21/23] OMAPDSS: MANAGER: Get device via output Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 22/23] OMAPDSS: APPLY: Remove omap_dss_device references from dss_ovl_enable/disable Archit Taneja 2012-08-30 11:52 ` Archit Taneja 2012-08-30 11:40 ` [PATCH v2 23/23] OMAPDSS: Remove old way of setting manager and device links Archit Taneja 2012-08-30 11:52 ` Archit Taneja
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1345528711-27801-4-git-send-email-archit@ti.com \ --to=archit@ti.com \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=rob@ti.com \ --cc=sumit.semwal@ti.com \ --cc=tomi.valkeinen@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.