OMAPDSS: DPI: add dependency to DSI

Commit Message

Christoph Fritz April 18, 2013, 8:37 a.m. UTC

Hi Tomi

On Mon, 2013-04-15 at 13:57 +0300, Tomi Valkeinen wrote:
> Tomi Valkeinen (38):
>       OMAPDSS: add fields to panels' platform data
>       OMAPDSS: DSI: remove DSI & DISPC clk divisors from dssdev
>       OMAPDSS: HDMI: remove HDMI clk divisors from dssdev
>       OMAPDSS: DPI: remove omap_dss_device uses
>       OMAPDSS: DSI: remove omap_dss_device uses
>       OMAPDSS: Taal: remove multi-panel support
>       OMAPDSS: APPLY: remove dssdev from dss_mgr_wait_for_vsync
>       OMAPDSS: add missing export for omap_dss_get_output()
>       OMAPDSS: HDMI: init output earlier
>       OMAPDSS: add output->name
>       OMAPDSS: add output->dispc_channel
>       OMAPDSS: DSI: delay dispc initialization
>       OMAPDSS: DSI: fix DSI channel source initialization
>       OMAPDSS: Taal: remove rotate & mirror support
>       OMAPDSS: DPI: fix dpi_get_dsidev() for omap5
>       OMAPDSS: DISPC: store core clk rate
>       OMAPDSS: DSI: fix wrong unsigned long long use
>       OMAPDSS: DSI: simplify dsi configuration
>       OMAPDSS: DSI: get line buffer size at probe
>       OMAPDSS: DSI: add enum omap_dss_dsi_trans_mode
>       OMAPDSS: DSI remove unneeded clk source setup code
>       OMAPDSS: DISPC: add new clock calculation code
>       OMAPDSS: DSS: add new clock calculation code
>       OMAPDSS: DSI: add new clock calculation code
>       OMAPDSS: SDI: use new clock calculation code
>       OMAPDSS: DPI: use new clock calculation code

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?

From: Christoph Fritz <[e-mail]>
Date: Thu, 18 Apr 2013 10:26:54 +0200
Subject: [PATCH] OMAPDSS: DPI: add dependency to DSI

A dependency from DPI to DSI is introduced by commit 100c82623
"OMAPDSS: DPI: use new clock calculation code".
This patch adds the dependency also on Kconfig-Level.

Signed-off-by: Christoph Fritz <[e-mail]>
---
 drivers/video/omap2/dss/Kconfig |    1 +
 1 file changed, 1 insertion(+)

Comments

Tomi Valkeinen April 18, 2013, 9:09 a.m. UTC | #1

On 2013-04-18 11:37, Christoph Fritz wrote:
> Hi Tomi
> 
> On Mon, 2013-04-15 at 13:57 +0300, Tomi Valkeinen wrote:
>> Tomi Valkeinen (38):
>>       OMAPDSS: add fields to panels' platform data
>>       OMAPDSS: DSI: remove DSI & DISPC clk divisors from dssdev
>>       OMAPDSS: HDMI: remove HDMI clk divisors from dssdev
>>       OMAPDSS: DPI: remove omap_dss_device uses
>>       OMAPDSS: DSI: remove omap_dss_device uses
>>       OMAPDSS: Taal: remove multi-panel support
>>       OMAPDSS: APPLY: remove dssdev from dss_mgr_wait_for_vsync
>>       OMAPDSS: add missing export for omap_dss_get_output()
>>       OMAPDSS: HDMI: init output earlier
>>       OMAPDSS: add output->name
>>       OMAPDSS: add output->dispc_channel
>>       OMAPDSS: DSI: delay dispc initialization
>>       OMAPDSS: DSI: fix DSI channel source initialization
>>       OMAPDSS: Taal: remove rotate & mirror support
>>       OMAPDSS: DPI: fix dpi_get_dsidev() for omap5
>>       OMAPDSS: DISPC: store core clk rate
>>       OMAPDSS: DSI: fix wrong unsigned long long use
>>       OMAPDSS: DSI: simplify dsi configuration
>>       OMAPDSS: DSI: get line buffer size at probe
>>       OMAPDSS: DSI: add enum omap_dss_dsi_trans_mode
>>       OMAPDSS: DSI remove unneeded clk source setup code
>>       OMAPDSS: DISPC: add new clock calculation code
>>       OMAPDSS: DSS: add new clock calculation code
>>       OMAPDSS: DSI: add new clock calculation code
>>       OMAPDSS: SDI: use new clock calculation code
>>       OMAPDSS: DPI: use new clock calculation code
> 
> 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.

 Tomi

Patch

diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig
index cb0f145..b4211c5 100644
--- a/drivers/video/omap2/dss/Kconfig
+++ b/drivers/video/omap2/dss/Kconfig
@@ -36,6 +36,7 @@  config OMAP2_DSS_COLLECT_IRQ_STATS
 config OMAP2_DSS_DPI
 	bool "DPI support"
 	default y
+	select OMAP2_DSS_DSI
 	help
 	  DPI Interface. This is the Parallel Display Interface.