Hi Dave,
On 2013-04-18 12:21, Tomi Valkeinen wrote:
> On 2013-04-18 12:09, Tomi Valkeinen wrote:
>> On 2013-04-18 11:37, Christoph Fritz wrote:
>
>>> With linux-next this patch breaks compiling here because DPI now depends
>>> on DSI - but my omap3 board here doesn't use DSI at all:
>>>
>>> drivers/video/omap2/dss/dpi.c: In function ?dpi_calc_pll_cb?:
>>> drivers/video/omap2/dss/dpi.c:181: error: implicit declaration of function
>>> ?dsi_hsdiv_calc?
>>> drivers/video/omap2/dss/dpi.c: In function ?dpi_dsi_clk_calc?:
>>> drivers/video/omap2/dss/dpi.c:201: error: implicit declaration of function
>>> ?dsi_get_pll_clkin?
>>> drivers/video/omap2/dss/dpi.c:212: error: implicit declaration of function
>>> ?dsi_pll_calc?
>>>
>>> Enabling OMAP2_DSS_DSI fixes this. This is my proposed patch. You may be
>>> want to merge it?
>>
>> Thanks for reporting this. We shouldn't make DPI depend on DSI. We
>> should make dummy functions for the above when DSI is not enabled so
>> that DPI compiles. I'll make a fix.
>
> Patch below. Can you try it out? It works for me on Panda.
Dave, can you queue the patch below (also attached) to the 3.10 drm
changes? It fixes a compilation issue with the omapdss pull request I
sent earlier.
Tomi
>
> Tomi
>
> From d91bf4127056c68e423109e7c9b46bd0f0b1673a Mon Sep 17 00:00:00 2001
> From: Tomi Valkeinen <tomi.valkeinen at ti.com>
> Date: Thu, 18 Apr 2013 12:16:39 +0300
> Subject: [PATCH] OMAPDSS: DPI: fix compilation if DSI not compiled in
>
> Commit 100c826235793345efe06b3558cc9d36166b1e26 (OMAPDSS: DPI: use new
> clock calculation code) breaks dpi.c compilation if DSI is not enabled
> in the kernel configuration.
>
> Fix compilation by adding dummy inline functions for the ones that dpi.c
> references. The functions will never be called, as dpi.c knows that
> there is no DSI device available.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen at ti.com>
> ---
> drivers/video/omap2/dss/dss.h | 31 +++++++++++++++++++++++++++----
> 1 file changed, 27 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
> index faaf358..8475893 100644
> --- a/drivers/video/omap2/dss/dss.h
> +++ b/drivers/video/omap2/dss/dss.h
> @@ -277,6 +277,12 @@ int sdi_init_platform_driver(void) __init;
> void sdi_uninit_platform_driver(void) __exit;
>
> /* DSI */
> +
> +typedef bool (*dsi_pll_calc_func)(int regn, int regm, unsigned long fint,
> + unsigned long pll, void *data);
> +typedef bool (*dsi_hsdiv_calc_func)(int regm_dispc, unsigned long dispc,
> + void *data);
> +
> #ifdef CONFIG_OMAP2_DSS_DSI
>
> struct dentry;
> @@ -295,10 +301,6 @@ u8 dsi_get_pixel_size(enum omap_dss_dsi_pixel_format
> fmt);
>
> unsigned long dsi_get_pll_clkin(struct platform_device *dsidev);
>
> -typedef bool (*dsi_pll_calc_func)(int regn, int regm, unsigned long fint,
> - unsigned long pll, void *data);
> -typedef bool (*dsi_hsdiv_calc_func)(int regm_dispc, unsigned long dispc,
> - void *data);
> bool dsi_hsdiv_calc(struct platform_device *dsidev, unsigned long pll,
> unsigned long out_min, dsi_hsdiv_calc_func func, void *data);
> bool dsi_pll_calc(struct platform_device *dsidev, unsigned long clkin,
> @@ -358,6 +360,27 @@ static inline struct platform_device
> *dsi_get_dsidev_from_id(int module)
> {
> return NULL;
> }
> +
> +static inline unsigned long dsi_get_pll_clkin(struct platform_device *dsidev)
> +{
> + return 0;
> +}
> +
> +static inline bool dsi_hsdiv_calc(struct platform_device *dsidev,
> + unsigned long pll, unsigned long out_min,
> + dsi_hsdiv_calc_func func, void *data)
> +{
> + return false;
> +}
> +
> +static inline bool dsi_pll_calc(struct platform_device *dsidev,
> + unsigned long clkin,
> + unsigned long pll_min, unsigned long pll_max,
> + dsi_pll_calc_func func, void *data)
> +{
> + return false;
> +}
> +
> #endif
>
> /* DPI */
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-OMAPDSS-DPI-fix-compilation-if-DSI-not-compiled-in.patch
Type: text/x-patch
Size: 2492 bytes
Desc: not available
URL:
<http://lists.freedesktop.org/archives/dri-devel/attachments/20130422/bf2bea1f/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 899 bytes
Desc: OpenPGP digital signature
URL:
<http://lists.freedesktop.org/archives/dri-devel/attachments/20130422/bf2bea1f/attachment.pgp>
