From: Archit Taneja <archit@ti.com>
To: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev@vger.kernel.org, linux-omap@vger.kernel.org
Subject: Re: [PATCH 10/32] OMAPDSS: split overlay manager creation
Date: Fri, 07 Jun 2013 06:31:24 +0000 [thread overview]
Message-ID: <51B17B6C.6050801@ti.com> (raw)
In-Reply-To: <1369906493-27538-11-git-send-email-tomi.valkeinen@ti.com>
On Thursday 30 May 2013 03:04 PM, Tomi Valkeinen wrote:
> Split the function that creates overlay manager structs into two: one
> that creates just the structs, and one that creates the sysfs files for
> the manager.
>
> This will help us use the overlay manager structs with omapdrm in the
> following patches, while still leaving the sysfs files out.
Maybe the omapdss Makefile should also reflect this change, we could
move manager.o so that it doesn't look like a compat file any more.
Archit
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
> ---
> drivers/video/omap2/dss/apply.c | 9 ++++++---
> drivers/video/omap2/dss/dss.h | 6 ++++--
> drivers/video/omap2/dss/manager-sysfs.c | 2 ++
> drivers/video/omap2/dss/manager.c | 29 ++++++++++++++++++++++-------
> 4 files changed, 34 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c
> index b84bd99..74d1d00 100644
> --- a/drivers/video/omap2/dss/apply.c
> +++ b/drivers/video/omap2/dss/apply.c
> @@ -1577,7 +1577,8 @@ int omapdss_compat_init(void)
>
> apply_init_priv();
>
> - dss_init_overlay_managers(pdev);
> + dss_init_overlay_managers();
> + dss_init_overlay_managers_sysfs(pdev);
> dss_init_overlays(pdev);
>
> for (i = 0; i < omap_dss_get_num_overlay_managers(); i++) {
> @@ -1640,7 +1641,8 @@ err_disp_sysfs:
> dss_uninstall_mgr_ops();
>
> err_mgr_ops:
> - dss_uninit_overlay_managers(pdev);
> + dss_uninit_overlay_managers_sysfs(pdev);
> + dss_uninit_overlay_managers();
> dss_uninit_overlays(pdev);
>
> compat_refcnt--;
> @@ -1668,7 +1670,8 @@ void omapdss_compat_uninit(void)
>
> dss_uninstall_mgr_ops();
>
> - dss_uninit_overlay_managers(pdev);
> + dss_uninit_overlay_managers_sysfs(pdev);
> + dss_uninit_overlay_managers();
> dss_uninit_overlays(pdev);
> out:
> mutex_unlock(&compat_init_lock);
> diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
> index 8475893..7964d3b 100644
> --- a/drivers/video/omap2/dss/dss.h
> +++ b/drivers/video/omap2/dss/dss.h
> @@ -194,8 +194,10 @@ void display_uninit_sysfs(struct platform_device *pdev,
> struct omap_dss_device *dssdev);
>
> /* manager */
> -int dss_init_overlay_managers(struct platform_device *pdev);
> -void dss_uninit_overlay_managers(struct platform_device *pdev);
> +int dss_init_overlay_managers(void);
> +void dss_uninit_overlay_managers(void);
> +int dss_init_overlay_managers_sysfs(struct platform_device *pdev);
> +void dss_uninit_overlay_managers_sysfs(struct platform_device *pdev);
> int dss_mgr_simple_check(struct omap_overlay_manager *mgr,
> const struct omap_overlay_manager_info *info);
> int dss_mgr_check_timings(struct omap_overlay_manager *mgr,
> diff --git a/drivers/video/omap2/dss/manager-sysfs.c b/drivers/video/omap2/dss/manager-sysfs.c
> index 5104681..72784b3 100644
> --- a/drivers/video/omap2/dss/manager-sysfs.c
> +++ b/drivers/video/omap2/dss/manager-sysfs.c
> @@ -511,4 +511,6 @@ void dss_manager_kobj_uninit(struct omap_overlay_manager *mgr)
> {
> kobject_del(&mgr->kobj);
> kobject_put(&mgr->kobj);
> +
> + memset(&mgr->kobj, 0, sizeof(mgr->kobj));
> }
> diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
> index 2551eaa..1aac9b4 100644
> --- a/drivers/video/omap2/dss/manager.c
> +++ b/drivers/video/omap2/dss/manager.c
> @@ -36,9 +36,9 @@
> static int num_managers;
> static struct omap_overlay_manager *managers;
>
> -int dss_init_overlay_managers(struct platform_device *pdev)
> +int dss_init_overlay_managers(void)
> {
> - int i, r;
> + int i;
>
> num_managers = dss_feat_get_num_mgrs();
>
> @@ -76,6 +76,17 @@ int dss_init_overlay_managers(struct platform_device *pdev)
> dss_feat_get_supported_outputs(mgr->id);
>
> INIT_LIST_HEAD(&mgr->overlays);
> + }
> +
> + return 0;
> +}
> +
> +int dss_init_overlay_managers_sysfs(struct platform_device *pdev)
> +{
> + int i, r;
> +
> + for (i = 0; i < num_managers; ++i) {
> + struct omap_overlay_manager *mgr = &managers[i];
>
> r = dss_manager_kobj_init(mgr, pdev);
> if (r)
> @@ -85,18 +96,22 @@ int dss_init_overlay_managers(struct platform_device *pdev)
> return 0;
> }
>
> -void dss_uninit_overlay_managers(struct platform_device *pdev)
> +void dss_uninit_overlay_managers(void)
> +{
> + kfree(managers);
> + managers = NULL;
> + num_managers = 0;
> +}
> +
> +void dss_uninit_overlay_managers_sysfs(struct platform_device *pdev)
> {
> int i;
>
> for (i = 0; i < num_managers; ++i) {
> struct omap_overlay_manager *mgr = &managers[i];
> +
> dss_manager_kobj_uninit(mgr);
> }
> -
> - kfree(managers);
> - managers = NULL;
> - num_managers = 0;
> }
>
> int omap_dss_get_num_overlay_managers(void)
>
next prev parent reply other threads:[~2013-06-07 6:31 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-30 9:34 [PATCH 00/32] OMAPDSS: dss-dev-model "base" (Part 1/2) Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 01/32] OMAPDSS: add pdata->default_display_name Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 02/32] OMAPDSS: only probe pdata if there's one Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 03/32] OMAPDSS: add omap_dss_find_output() Tomi Valkeinen
2013-05-30 11:07 ` Jean-Christophe PLAGNIOL-VILLARD
2013-05-30 11:40 ` Tomi Valkeinen
2013-05-30 15:40 ` Jean-Christophe PLAGNIOL-VILLARD
2013-05-30 16:54 ` Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 04/32] OMAPDSS: add omap_dss_find_output_by_node() Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 05/32] OMAPDSS: fix dss_get_ctx_loss_count for DT Tomi Valkeinen
2013-05-30 11:09 ` Jean-Christophe PLAGNIOL-VILLARD
2013-05-30 11:28 ` Tomi Valkeinen
2013-05-30 15:43 ` Jean-Christophe PLAGNIOL-VILLARD
2013-05-30 16:14 ` Tomi Valkeinen
2013-05-30 16:36 ` Kevin Hilman
2013-05-30 17:21 ` Tomi Valkeinen
2013-05-31 15:17 ` Grygorii Strashko
2013-05-31 19:31 ` Kevin Hilman
2013-05-30 9:34 ` [PATCH 06/32] OMAPDSS: DPI: fix regulators " Tomi Valkeinen
2013-05-30 11:12 ` Jean-Christophe PLAGNIOL-VILLARD
2013-05-30 11:35 ` Tomi Valkeinen
2013-05-30 13:05 ` Arnd Bergmann
2013-05-30 15:54 ` Jean-Christophe PLAGNIOL-VILLARD
2013-06-07 5:57 ` Archit Taneja
2013-05-30 9:34 ` [PATCH 07/32] OMAPDSS: SDI: " Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 08/32] OMAPDSS: clean up dss_[ovl|mgr]_get_device() Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 09/32] OMAPDSS: add helpers to get mgr or output from display Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 10/32] OMAPDSS: split overlay manager creation Tomi Valkeinen
2013-06-07 6:31 ` Archit Taneja [this message]
2013-06-07 9:53 ` Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 11/32] OMAPDRM: fix overlay manager handling Tomi Valkeinen
2013-06-07 6:33 ` Archit Taneja
2013-05-30 9:34 ` [PATCH 12/32] OMAPDSS: Implement display (dis)connect support Tomi Valkeinen
2013-06-07 6:58 ` Archit Taneja
2013-06-07 8:31 ` Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 13/32] OMAPDSS: CORE: use devm_regulator_get Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 14/32] OMAPDSS: DSI: cleanup regulator init Tomi Valkeinen
2013-06-07 6:50 ` Archit Taneja
2013-05-30 9:34 ` [PATCH 15/32] OMAPDSS: DPI: cleanup pll & " Tomi Valkeinen
2013-06-07 6:52 ` Archit Taneja
2013-06-07 8:45 ` Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 16/32] OMAPDSS: HDMI: add hdmi_init_regulator Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 17/32] OMAPDSS: SDI: clean up regulator init Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 18/32] OMAPDSS: VENC: " Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 19/32] OMAPDSS: add videomode conversion support Tomi Valkeinen
2013-06-07 7:18 ` Archit Taneja
2013-06-07 8:35 ` Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 20/32] OMAPDSS: remove dssdev uses in trivial cases Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 21/32] OMAPDSS: add panel list Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 22/32] OMAPDSS: use the panel list in omap_dss_get_next_device Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 23/32] OMAPDSS: don't use dss bus in suspend/resume Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 24/32] OMAPDSS: implement display sysfs without dss bus Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 25/32] OMAPDSS: Add panel dev pointer to dssdev Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 26/32] OMAPDSS: remove omap_dss_start/stop_device() Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 27/32] OMAPDSS: combine omap_dss_output into omap_dss_device Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 28/32] OMAPDSS: omapdss.h: add owner field to omap_dss_device Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 29/32] OMAPDSS: add module_get/put to omap_dss_get/put_device() Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 30/32] OMAPDSS: add THIS_MODULE owner to DSS outputs Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 31/32] OMAPDSS: output: increase refcount in find_output funcs Tomi Valkeinen
2013-05-30 9:34 ` [PATCH 32/32] OMAPFB: use EPROBE_DEFER if default display is not present Tomi Valkeinen
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=51B17B6C.6050801@ti.com \
--to=archit@ti.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).