OMAP: DSS2: Fix DSS core init fail path
cover OMAP: DSS2: Fix DSS core init fail path
Hi -
These patches fix the broken DSS omap_dss_probe() fail path, reported by Kevin Hilman [1].
Kevin, could you please check this with your setup too? It would be much appreciated.
[1] http://www.mail-archive.com/[email protected]/msg27112.html
BR,
Jani.
Jani Nikula (2):
OMAP: DSS2: omap_dss_probe() conditional compilation cleanup
OMAP: DSS2: Fix omap_dss_probe() error path
drivers/video/omap2/dss/core.c | 85 ++++++++++++++++++++++++--------------- drivers/video/omap2/dss/dss.h | 40 +++++++++++++++++++ 2 files changed, 92 insertions(+), 33 deletions(-)
PATCH 1/2 OMAP: DSS2: omap_dss_probe() conditional compilation cleanup
From: Jani Nikula <[email protected]>
Move a number of #ifdefs from code into dss.h and elsewhere, and conditionally define no-op static inline functions, cleaning up the code. This style is according to Documentation/SubmittingPatches.
--- drivers/video/omap2/dss/core.c | 31 +++++++++++-------------------- drivers/video/omap2/dss/dss.h | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 20 deletions(-)
drivers/video/omap2/dss/core.c +11 -20
@@ -482,6 +482,14 @@ static void dss_uninitialize_debugfs(void)if (dss_debugfs_dir) debugfs_remove_recursive(dss_debugfs_dir); } +#else /* CONFIG_DEBUG_FS && CONFIG_OMAP2_DSS_DEBUG_SUPPORT */ +static inline int dss_initialize_debugfs (void ) +{ +return 0 ; +} +static inline void dss_uninitialize_debugfs (void ) +{ +}#endif /* CONFIG_DEBUG_FS && CONFIG_OMAP2_DSS_DEBUG_SUPPORT */ /* PLATFORM DEVICE */
@@ -518,13 +526,11 @@ static int omap_dss_probe(struct platform_device *pdev) goto fail0; } -#ifdef CONFIG_OMAP2_DSS_RFBI r =rfbi_init ();if (r) {DSSERR ("Failed to initialize rfbi\n" ); goto fail0; } -#endif r =dpi_init (pdev);if (r) {
@@ -537,35 +543,30 @@ static int omap_dss_probe(struct platform_device *pdev)DSSERR ("Failed to initialize dispc\n" ); goto fail0; } -#ifdef CONFIG_OMAP2_DSS_VENC + r =venc_init (pdev);if (r) {DSSERR ("Failed to initialize venc\n" ); goto fail0; } -#endif +if (cpu_is_omap34xx ()) { -#ifdef CONFIG_OMAP2_DSS_SDI r =sdi_init (skip_init);if (r) {DSSERR ("Failed to initialize SDI\n" ); goto fail0; } -#endif -#ifdef CONFIG_OMAP2_DSS_DSI + r =dsi_init (pdev);if (r) {DSSERR ("Failed to initialize DSI\n" ); goto fail0; } -#endif } -#if defined(CONFIG_DEBUG_FS ) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT ) r =dss_initialize_debugfs ();if (r) goto fail0; -#endif for (i =0 ; i < pdata->num_devices; ++i) {struct omap_dss_device *dssdev = pdata->devices[i];
@@ -593,25 +594,15 @@ static int omap_dss_remove(struct platform_device *pdev)int i;int c; -#if defined(CONFIG_DEBUG_FS ) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT )dss_uninitialize_debugfs (); -#endif -#ifdef CONFIG_OMAP2_DSS_VENC venc_exit (); -#endif dispc_exit ();dpi_exit (); -#ifdef CONFIG_OMAP2_DSS_RFBI rfbi_exit (); -#endif if (cpu_is_omap34xx ()) { -#ifdef CONFIG_OMAP2_DSS_DSI dsi_exit (); -#endif -#ifdef CONFIG_OMAP2_DSS_SDI sdi_exit (); -#endif }dss_exit ();
drivers/video/omap2/dss/dss.h +40 -0
@@ -242,11 +242,22 @@ int dss_calc_clock_div(bool is_tft, unsigned long req_pck, struct dispc_clock_info *dispc_cinfo);/* SDI */ +#ifdef CONFIG_OMAP2_DSS_SDI int sdi_init (bool skip_init);void sdi_exit (void );int sdi_init_display (struct omap_dss_device *display); +#else +static inline int sdi_init (bool skip_init) +{ +return 0 ; +} +static inline void sdi_exit (void ) +{ +} +#endif /* DSI */ +#ifdef CONFIG_OMAP2_DSS_DSI int dsi_init (struct platform_device *pdev);void dsi_exit (void );
@@ -270,6 +281,15 @@ void dsi_pll_uninit(void);void dsi_get_overlay_fifo_thresholds (enum omap_plane plane,u32 fifo_size,enum omap_burst_size *burst_size,u32 *fifo_low,u32 *fifo_high); +#else +static inline int dsi_init (struct platform_device *pdev) +{ +return 0 ; +} +static inline void dsi_exit (void ) +{ +} +#endif /* DPI */ int dpi_init (struct platform_device *pdev);
@@ -362,12 +382,23 @@ int dispc_get_clock_div(struct dispc_clock_info *cinfo);/* VENC */ +#ifdef CONFIG_OMAP2_DSS_VENC int venc_init (struct platform_device *pdev);void venc_exit (void );void venc_dump_regs (struct seq_file *s);int venc_init_display (struct omap_dss_device *display); +#else +static inline int venc_init (struct platform_device *pdev) +{ +return 0 ; +} +static inline void venc_exit (void ) +{ +} +#endif /* RFBI */ +#ifdef CONFIG_OMAP2_DSS_RFBI int rfbi_init (void );void rfbi_exit (void );void rfbi_dump_regs (struct seq_file *s);
@@ -379,6 +410,15 @@ void rfbi_transfer_area(u16 width, u16 height,void rfbi_set_timings (int rfbi_module,struct rfbi_timings *t);unsigned long rfbi_get_max_tx_rate (void );int rfbi_init_display (struct omap_dss_device *display); +#else +static inline int rfbi_init (void ) +{ +return 0 ; +} +static inline void rfbi_exit (void ) +{ +} +#endif #ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
Signature · 1 line
1.6.5.2
PATCH 2/2 OMAP: DSS2: Fix omap_dss_probe() error path
From: Jani Nikula <[email protected]>
Perform graceful cleanup on errors instead of just bailing out.
--- drivers/video/omap2/dss/core.c | 54 ++++++++++++++++++++++++++++++--------- 1 files changed, 41 insertions(+), 13 deletions(-)
drivers/video/omap2/dss/core.c +41 -13
@@ -507,7 +507,7 @@ static int omap_dss_probe(struct platform_device *pdev) r =dss_get_clocks ();if (r) - goto fail0; + goto err_clocks;dss_clk_enable_all_no_ctx ();
@@ -523,57 +523,64 @@ static int omap_dss_probe(struct platform_device *pdev) r =dss_init (skip_init);if (r) {DSSERR ("Failed to initialize DSS\n" ); - goto fail0; + goto err_dss; } r =rfbi_init ();if (r) {DSSERR ("Failed to initialize rfbi\n" ); - goto fail0; + goto err_rfbi; } r =dpi_init (pdev);if (r) {DSSERR ("Failed to initialize dpi\n" ); - goto fail0; + goto err_dpi; } r =dispc_init ();if (r) {DSSERR ("Failed to initialize dispc\n" ); - goto fail0; + goto err_dispc; } r =venc_init (pdev);if (r) {DSSERR ("Failed to initialize venc\n" ); - goto fail0; + goto err_venc; }if (cpu_is_omap34xx ()) { r =sdi_init (skip_init);if (r) {DSSERR ("Failed to initialize SDI\n" ); - goto fail0; + goto err_sdi; } r =dsi_init (pdev);if (r) {DSSERR ("Failed to initialize DSI\n" ); - goto fail0; + goto err_dsi; } } r =dss_initialize_debugfs ();if (r) - goto fail0; + goto err_debugfs;for (i =0 ; i < pdata->num_devices; ++i) {struct omap_dss_device *dssdev = pdata->devices[i]; r =omap_dss_register_device (dssdev); -if (r) -DSSERR ("device reg failed %d\n" , i); +if (r) { +DSSERR ("device %d %s register failed %d\n" , i, + dssdev->name ?:"unnamed" , r); + +while (--i >=0 ) +omap_dss_unregister_device (pdata->devices[i]); + + goto err_register; + }if (def_disp_name &&strcmp (def_disp_name, dssdev->name) ==0 ) pdata->default_device = dssdev;
@@ -583,8 +590,29 @@ static int omap_dss_probe(struct platform_device *pdev)return 0 ; -/* XXX fail correctly */ -fail0: +err_register: +dss_uninitialize_debugfs (); +err_debugfs: +if (cpu_is_omap34xx ()) +dsi_exit (); +err_dsi: +if (cpu_is_omap34xx ()) +sdi_exit (); +err_sdi: +venc_exit (); +err_venc: +dispc_exit (); +err_dispc: +dpi_exit (); +err_dpi: +rfbi_exit (); +err_rfbi: +dss_exit (); +err_dss: +dss_clk_disable_all_no_ctx (); +dss_put_clocks (); +err_clocks: +return r; }
Signature · 1 line
1.6.5.2
Re: [PATCH 2/2] OMAP: DSS2: Fix omap_dss_probe() error path
Quoted 5 lines · Jani Nikula
From: Jani Nikula <[email protected]>
Perform graceful cleanup on errors instead of just bailing out.
Signed-off-by Jani Nikula <[email protected]>
Nice. Much cleaner than my previous one.
Tested on my n900, and with failed init, clocks are turned off and doesn't prevent suspend.
Thanks,
Kevin
Re: [PATCH 2/2] OMAP: DSS2: Fix omap_dss_probe() error path
Quoted 2 lines · ext Kevin Hilman
Tested on my n900, and with failed init, clocks are turned off and doesn't prevent suspend.
Many thanks for testing this, Kevin!
BR,
Jani.
Re: [PATCH 1/2] OMAP: DSS2: omap_dss_probe() conditional compilation cleanup
In reply to Jani NikulaQuoted 7 lines · Jani Nikula
From: Jani Nikula <[email protected]>
Move a number of #ifdefs from code into
dss.hand elsewhere, and conditionally define no-op static inline functions, cleaning up the code. This style is according toDocumentation/SubmittingPatches.Signed-off-by Jani Nikula <[email protected]>
Indeed, this helps readability greatly.
Hi,
Quoted 9 lines · On Thu, 2010-05-06 at 13:59 +0200, Nikula Jani.1 (EXT-Nixu/Helsinki) wrote:
Hi -
These patches fix the broken DSS
omap_dss_probe()fail path, reported by Kevin Hilman [1].Kevin, could you please check this with your setup too? It would be much appreciated.
[1] http://www.mail-archive.com/[email protected]/msg27112.html
Jani, I just noticed that this conflicts with the following patch in my for-next branch:
commit 36b33efe80eb07e3447107c2bdba3c674c10a41a
Author: Roger Quadros <[email protected]> Date: Wed Mar 17 13:35:19 2010 +0100
OMAP: DSS2: Add Kconfig option for DPI display type
This allows us to disable DPI on systems that do not have it
Can you rebase the patches on top of my for-next branch?
Tomi
v2 cover OMAP: DSS2: Fix DSS core init fail path
Hi -
These patches fix the broken DSS omap_dss_probe() fail path, reported by Kevin Hilman [1].
v2:
- rebased against [2]
[1] http://www.mail-archive.com/[email protected]/msg27112.html
[2] git://gitorious.org/linux-omap-dss2/linux.git
BR,
Jani.
Jani Nikula (2):
OMAP: DSS2: omap_dss_probe() conditional compilation cleanup
OMAP: DSS2: Fix omap_dss_probe() error path
drivers/video/omap2/dss/core.c | 89 +++++++++++++++++++++++---------------- drivers/video/omap2/dss/dss.h | 50 ++++++++++++++++++++++ 2 files changed, 102 insertions(+), 37 deletions(-)
PATCH v2 1/2 OMAP: DSS2: omap_dss_probe() conditional compilation cleanup
From: Jani Nikula <[email protected]>
Move a number of #ifdefs from code into dss.h and elsewhere, and conditionally define no-op static inline functions, cleaning up the code. This style is according to Documentation/SubmittingPatches.
--- drivers/video/omap2/dss/core.c | 35 ++++++++------------------- drivers/video/omap2/dss/dss.h | 50 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 24 deletions(-)
drivers/video/omap2/dss/core.c +11 -24
@@ -482,6 +482,14 @@ static void dss_uninitialize_debugfs(void)if (dss_debugfs_dir) debugfs_remove_recursive(dss_debugfs_dir); } +#else /* CONFIG_DEBUG_FS && CONFIG_OMAP2_DSS_DEBUG_SUPPORT */ +static inline int dss_initialize_debugfs (void ) +{ +return 0 ; +} +static inline void dss_uninitialize_debugfs (void ) +{ +}#endif /* CONFIG_DEBUG_FS && CONFIG_OMAP2_DSS_DEBUG_SUPPORT */ /* PLATFORM DEVICE */
@@ -518,56 +526,47 @@ static int omap_dss_probe(struct platform_device *pdev) goto fail0; } -#ifdef CONFIG_OMAP2_DSS_RFBI r =rfbi_init ();if (r) {DSSERR ("Failed to initialize rfbi\n" ); goto fail0; } -#endif -#ifdef CONFIG_OMAP2_DSS_DPI r =dpi_init (pdev);if (r) {DSSERR ("Failed to initialize dpi\n" ); goto fail0; } -#endif r =dispc_init ();if (r) {DSSERR ("Failed to initialize dispc\n" ); goto fail0; } -#ifdef CONFIG_OMAP2_DSS_VENC + r =venc_init (pdev);if (r) {DSSERR ("Failed to initialize venc\n" ); goto fail0; } -#endif +if (cpu_is_omap34xx ()) { -#ifdef CONFIG_OMAP2_DSS_SDI r =sdi_init (skip_init);if (r) {DSSERR ("Failed to initialize SDI\n" ); goto fail0; } -#endif -#ifdef CONFIG_OMAP2_DSS_DSI + r =dsi_init (pdev);if (r) {DSSERR ("Failed to initialize DSI\n" ); goto fail0; } -#endif } -#if defined(CONFIG_DEBUG_FS ) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT ) r =dss_initialize_debugfs ();if (r) goto fail0; -#endif for (i =0 ; i < pdata->num_devices; ++i) {struct omap_dss_device *dssdev = pdata->devices[i];
@@ -595,27 +594,15 @@ static int omap_dss_remove(struct platform_device *pdev)int i;int c; -#if defined(CONFIG_DEBUG_FS ) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT )dss_uninitialize_debugfs (); -#endif -#ifdef CONFIG_OMAP2_DSS_VENC venc_exit (); -#endif dispc_exit (); -#ifdef CONFIG_OMAP2_DSS_DPI dpi_exit (); -#endif -#ifdef CONFIG_OMAP2_DSS_RFBI rfbi_exit (); -#endif if (cpu_is_omap34xx ()) { -#ifdef CONFIG_OMAP2_DSS_DSI dsi_exit (); -#endif -#ifdef CONFIG_OMAP2_DSS_SDI sdi_exit (); -#endif }dss_exit ();
drivers/video/omap2/dss/dss.h +50 -0
90 lines not on this page · raw message
Signature · 1 line
1.6.5.2
PATCH v2 2/2 OMAP: DSS2: Fix omap_dss_probe() error path
From: Jani Nikula <[email protected]>
Perform graceful cleanup on errors instead of just bailing out.
--- drivers/video/omap2/dss/core.c | 54 ++++++++++++++++++++++++++++++--------- 1 files changed, 41 insertions(+), 13 deletions(-)
drivers/video/omap2/dss/core.c +41 -13
@@ -507,7 +507,7 @@ static int omap_dss_probe(struct platform_device *pdev) r =dss_get_clocks ();if (r) - goto fail0; + goto err_clocks;dss_clk_enable_all_no_ctx ();
@@ -523,57 +523,64 @@ static int omap_dss_probe(struct platform_device *pdev) r =dss_init (skip_init);if (r) {DSSERR ("Failed to initialize DSS\n" ); - goto fail0; + goto err_dss; } r =rfbi_init ();if (r) {DSSERR ("Failed to initialize rfbi\n" ); - goto fail0; + goto err_rfbi; } r =dpi_init (pdev);if (r) {DSSERR ("Failed to initialize dpi\n" ); - goto fail0; + goto err_dpi; } r =dispc_init ();if (r) {DSSERR ("Failed to initialize dispc\n" ); - goto fail0; + goto err_dispc; } r =venc_init (pdev);if (r) {DSSERR ("Failed to initialize venc\n" ); - goto fail0; + goto err_venc; }if (cpu_is_omap34xx ()) { r =sdi_init (skip_init);if (r) {DSSERR ("Failed to initialize SDI\n" ); - goto fail0; + goto err_sdi; } r =dsi_init (pdev);if (r) {DSSERR ("Failed to initialize DSI\n" ); - goto fail0; + goto err_dsi; } } r =dss_initialize_debugfs ();if (r) - goto fail0; + goto err_debugfs;for (i =0 ; i < pdata->num_devices; ++i) {struct omap_dss_device *dssdev = pdata->devices[i]; r =omap_dss_register_device (dssdev); -if (r) -DSSERR ("device reg failed %d\n" , i); +if (r) { +DSSERR ("device %d %s register failed %d\n" , i, + dssdev->name ?:"unnamed" , r); + +while (--i >=0 ) +omap_dss_unregister_device (pdata->devices[i]); + + goto err_register; + }if (def_disp_name &&strcmp (def_disp_name, dssdev->name) ==0 ) pdata->default_device = dssdev;
@@ -583,8 +590,29 @@ static int omap_dss_probe(struct platform_device *pdev)return 0 ; -/* XXX fail correctly */ -fail0: +err_register: +dss_uninitialize_debugfs (); +err_debugfs: +if (cpu_is_omap34xx ()) +dsi_exit (); +err_dsi: +if (cpu_is_omap34xx ()) +sdi_exit (); +err_sdi: +venc_exit (); +err_venc: +dispc_exit (); +err_dispc: +dpi_exit (); +err_dpi: +rfbi_exit (); +err_rfbi: +dss_exit (); +err_dss: +dss_clk_disable_all_no_ctx (); +dss_put_clocks (); +err_clocks: +return r; }
Signature · 1 line
1.6.5.2
Quoted 4 lines · On Fri, 2010-05-07 at 11:58 +0200, Nikula Jani.1 (EXT-Nixu/Helsinki) wrote:
Hi -
These patches fix the broken DSS
omap_dss_probe()fail path, reported by Kevin Hilman [1].
Thanks, looks good. Applied to my DSS tree.
Tomi