From: Archit Taneja <a0393947@ti.com> To: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: rob@ti.com, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Subject: Re: [PATCH v2 20/23] OMAPDSS: MANAGER: Update display sysfs store Date: Fri, 31 Aug 2012 14:53:44 +0000 [thread overview] Message-ID: <5040CD28.8040408@ti.com> (raw) In-Reply-To: <1346423449.16067.27.camel@deskari> On Friday 31 August 2012 08:00 PM, Tomi Valkeinen wrote: > On Thu, 2012-08-30 at 17:10 +0530, Archit Taneja wrote: >> The display sysfs attribute's store function needs to be changed with the >> introduction of outputs. >> >> Providing a manager to the display isn't enough to create a link now, the >> manager needs and output to connect to. A manager's display store file only >> has the information of the manager and the desired display, it is not aware >> of which output should the manager connect to. >> >> Because of this, a new constraint needs to be set up when setting a display via >> this sysfs file. The constraint is that the desired display should already be >> connected to an output before calling this sysfs function. >> >> This might break some existing user space stuff which uses sysfs directly. But >> in most cases dss_recheck_connections will connect displays to floating outputs. >> DSS sysfs files are being planned to be remove anyway, so it's not much of a >> harm. >> >> Signed-off-by: Archit Taneja <archit@ti.com> >> --- >> drivers/video/omap2/dss/manager.c | 25 ++++++++++++++++++++----- >> 1 file changed, 20 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c >> index fd39f66..d808ce2 100644 >> --- a/drivers/video/omap2/dss/manager.c >> +++ b/drivers/video/omap2/dss/manager.c >> @@ -74,18 +74,33 @@ static ssize_t manager_display_store(struct omap_overlay_manager *mgr, >> if (dssdev) >> DSSDBG("display %s found\n", dssdev->name); >> >> - if (mgr->get_device(mgr)) { >> - r = mgr->unset_device(mgr); >> + if (mgr->output) { >> + if (mgr->output->device) { >> + r = mgr->output->unset_device(mgr->output); >> + if (r) { >> + goto put_device; >> + DSSERR("failed to unset device from output\n"); >> + } >> + } >> + >> + r = mgr->unset_output(mgr); >> if (r) { >> - DSSERR("failed to unset display\n"); >> + DSSERR("failed to unset current output\n"); >> goto put_device; >> } >> } >> >> if (dssdev) { >> - r = mgr->set_device(mgr, dssdev); >> + struct omap_dss_output *out = dssdev->output; >> + >> + if (!out) { >> + DSSERR("no output connected to device\n"); >> + goto put_device; >> + } >> + >> + r = mgr->set_output(mgr, out); >> if (r) { >> - DSSERR("failed to set manager\n"); >> + DSSERR("failed to set manager output\n"); >> goto put_device; >> } >> > > Hmm, I think this is a bit broken. If I read this right, the unlinking > removes both mgr-output link and the output-dssdev link. But the linking > part only sets up the mgr-output link. > > So if there's a very simple configuration with one display, if you > unlink it via sysfs you can't link it back again. Ah, right. You might need to reinsert the display module again to get the output-display link again. Which is bad. Or have a sysfs file for setting manager output. Which is something we want to stay away from anyway. > > The store function gets the mgr and the dssdev as arguments. I think > this could be changed so that the function would "guess" the needed > output. Well, not so much a guess, because a dssdev can only be > connected to one output, defined by the HW design. That is basically > what the recheck_connections does, we could use the same method here. > > Then this sysfs file should work just like before. That's a good idea, we could reuse the code in recheck_connections a bit. I wanted to stay away from the guessing. But I think we need to do it if a simple unlink-link of a display itself fails. Archit
WARNING: multiple messages have this Message-ID (diff)
From: Archit Taneja <a0393947@ti.com> To: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: rob@ti.com, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Subject: Re: [PATCH v2 20/23] OMAPDSS: MANAGER: Update display sysfs store Date: Fri, 31 Aug 2012 20:11:44 +0530 [thread overview] Message-ID: <5040CD28.8040408@ti.com> (raw) In-Reply-To: <1346423449.16067.27.camel@deskari> On Friday 31 August 2012 08:00 PM, Tomi Valkeinen wrote: > On Thu, 2012-08-30 at 17:10 +0530, Archit Taneja wrote: >> The display sysfs attribute's store function needs to be changed with the >> introduction of outputs. >> >> Providing a manager to the display isn't enough to create a link now, the >> manager needs and output to connect to. A manager's display store file only >> has the information of the manager and the desired display, it is not aware >> of which output should the manager connect to. >> >> Because of this, a new constraint needs to be set up when setting a display via >> this sysfs file. The constraint is that the desired display should already be >> connected to an output before calling this sysfs function. >> >> This might break some existing user space stuff which uses sysfs directly. But >> in most cases dss_recheck_connections will connect displays to floating outputs. >> DSS sysfs files are being planned to be remove anyway, so it's not much of a >> harm. >> >> Signed-off-by: Archit Taneja <archit@ti.com> >> --- >> drivers/video/omap2/dss/manager.c | 25 ++++++++++++++++++++----- >> 1 file changed, 20 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c >> index fd39f66..d808ce2 100644 >> --- a/drivers/video/omap2/dss/manager.c >> +++ b/drivers/video/omap2/dss/manager.c >> @@ -74,18 +74,33 @@ static ssize_t manager_display_store(struct omap_overlay_manager *mgr, >> if (dssdev) >> DSSDBG("display %s found\n", dssdev->name); >> >> - if (mgr->get_device(mgr)) { >> - r = mgr->unset_device(mgr); >> + if (mgr->output) { >> + if (mgr->output->device) { >> + r = mgr->output->unset_device(mgr->output); >> + if (r) { >> + goto put_device; >> + DSSERR("failed to unset device from output\n"); >> + } >> + } >> + >> + r = mgr->unset_output(mgr); >> if (r) { >> - DSSERR("failed to unset display\n"); >> + DSSERR("failed to unset current output\n"); >> goto put_device; >> } >> } >> >> if (dssdev) { >> - r = mgr->set_device(mgr, dssdev); >> + struct omap_dss_output *out = dssdev->output; >> + >> + if (!out) { >> + DSSERR("no output connected to device\n"); >> + goto put_device; >> + } >> + >> + r = mgr->set_output(mgr, out); >> if (r) { >> - DSSERR("failed to set manager\n"); >> + DSSERR("failed to set manager output\n"); >> goto put_device; >> } >> > > Hmm, I think this is a bit broken. If I read this right, the unlinking > removes both mgr-output link and the output-dssdev link. But the linking > part only sets up the mgr-output link. > > So if there's a very simple configuration with one display, if you > unlink it via sysfs you can't link it back again. Ah, right. You might need to reinsert the display module again to get the output-display link again. Which is bad. Or have a sysfs file for setting manager output. Which is something we want to stay away from anyway. > > The store function gets the mgr and the dssdev as arguments. I think > this could be changed so that the function would "guess" the needed > output. Well, not so much a guess, because a dssdev can only be > connected to one output, defined by the HW design. That is basically > what the recheck_connections does, we could use the same method here. > > Then this sysfs file should work just like before. That's a good idea, we could reuse the code in recheck_connections a bit. I wanted to stay away from the guessing. But I think we need to do it if a simple unlink-link of a display itself fails. Archit
next prev parent reply other threads:[~2012-08-31 14:53 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 ` [PATCH 03/23] OMAPDSS: output: Add set/unset device ops for omap_dss_output Archit Taneja 2012-08-21 6:10 ` 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 [this message] 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=5040CD28.8040408@ti.com \ --to=a0393947@ti.com \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=rob@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.