* [PATCH] drm/exynos: Support DP CLKCON register in FIMD driver @ 2014-06-24 11:09 Ajay Kumar 2014-06-24 13:01 ` Andrzej Hajda 0 siblings, 1 reply; 5+ messages in thread From: Ajay Kumar @ 2014-06-24 11:09 UTC (permalink / raw) To: dri-devel, linux-samsung-soc Cc: inki.dae, seanpaul, ajaynumb, joshi, prashanth.g, Ajay Kumar Add the missing setting for DP CLKCON register. This register is present on Exynos5 based FIMD controllers, and needs to be used if we are using DP. Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 5 +++++ include/video/samsung_fimd.h | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 33161ad..5d3045d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -72,6 +72,7 @@ struct fimd_driver_data { unsigned int has_shadowcon:1; unsigned int has_clksel:1; unsigned int has_limited_fmt:1; + unsigned int has_dp_clkcon:1; }; static struct fimd_driver_data s3c64xx_fimd_driver_data = { @@ -88,6 +89,7 @@ static struct fimd_driver_data exynos4_fimd_driver_data = { static struct fimd_driver_data exynos5_fimd_driver_data = { .timing_base = 0x20000, .has_shadowcon = 1, + .has_dp_clkcon = 1, }; struct fimd_win_data { @@ -331,6 +333,9 @@ static void fimd_commit(struct exynos_drm_manager *mgr) if (clkdiv > 1) val |= VIDCON0_CLKVAL_F(clkdiv - 1) | VIDCON0_CLKDIR; + if (ctx->driver_data->has_dp_clkcon) + writel(DP_CLK_ENABLE, ctx->regs + DP_CLKCON); + writel(val, ctx->regs + VIDCON0); } diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h index b039320..d8f4b0b 100644 --- a/include/video/samsung_fimd.h +++ b/include/video/samsung_fimd.h @@ -435,6 +435,10 @@ #define BLENDCON_NEW_8BIT_ALPHA_VALUE (1 << 0) #define BLENDCON_NEW_4BIT_ALPHA_VALUE (0 << 0) +/* Video clock enable for DP */ +#define DP_CLKCON 0x27C +#define DP_CLK_ENABLE 0x2 + /* Notes on per-window bpp settings * * Value Win0 Win1 Win2 Win3 Win 4 -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/exynos: Support DP CLKCON register in FIMD driver 2014-06-24 11:09 [PATCH] drm/exynos: Support DP CLKCON register in FIMD driver Ajay Kumar @ 2014-06-24 13:01 ` Andrzej Hajda 2014-06-24 13:14 ` Ajay kumar 0 siblings, 1 reply; 5+ messages in thread From: Andrzej Hajda @ 2014-06-24 13:01 UTC (permalink / raw) To: Ajay Kumar, dri-devel, linux-samsung-soc Cc: inki.dae, seanpaul, ajaynumb, joshi, prashanth.g Hi Ajay, On 06/24/2014 01:09 PM, Ajay Kumar wrote: > Add the missing setting for DP CLKCON register. > > This register is present on Exynos5 based FIMD controllers, > and needs to be used if we are using DP. > > Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com> > --- > drivers/gpu/drm/exynos/exynos_drm_fimd.c | 5 +++++ > include/video/samsung_fimd.h | 4 ++++ > 2 files changed, 9 insertions(+) > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c > index 33161ad..5d3045d 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c > @@ -72,6 +72,7 @@ struct fimd_driver_data { > unsigned int has_shadowcon:1; > unsigned int has_clksel:1; > unsigned int has_limited_fmt:1; > + unsigned int has_dp_clkcon:1; > }; > > static struct fimd_driver_data s3c64xx_fimd_driver_data = { > @@ -88,6 +89,7 @@ static struct fimd_driver_data exynos4_fimd_driver_data = { > static struct fimd_driver_data exynos5_fimd_driver_data = { > .timing_base = 0x20000, > .has_shadowcon = 1, > + .has_dp_clkcon = 1, > }; > > struct fimd_win_data { > @@ -331,6 +333,9 @@ static void fimd_commit(struct exynos_drm_manager *mgr) > if (clkdiv > 1) > val |= VIDCON0_CLKVAL_F(clkdiv - 1) | VIDCON0_CLKDIR; > > + if (ctx->driver_data->has_dp_clkcon) > + writel(DP_CLK_ENABLE, ctx->regs + DP_CLKCON); > + This code always enables the clock on exynos5. As I understand it should be enabled only if DP is used. Regards Andrzej > writel(val, ctx->regs + VIDCON0); > } > > diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h > index b039320..d8f4b0b 100644 > --- a/include/video/samsung_fimd.h > +++ b/include/video/samsung_fimd.h > @@ -435,6 +435,10 @@ > #define BLENDCON_NEW_8BIT_ALPHA_VALUE (1 << 0) > #define BLENDCON_NEW_4BIT_ALPHA_VALUE (0 << 0) > > +/* Video clock enable for DP */ > +#define DP_CLKCON 0x27C > +#define DP_CLK_ENABLE 0x2 > + > /* Notes on per-window bpp settings > * > * Value Win0 Win1 Win2 Win3 Win 4 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/exynos: Support DP CLKCON register in FIMD driver 2014-06-24 13:01 ` Andrzej Hajda @ 2014-06-24 13:14 ` Ajay kumar 2014-06-24 14:15 ` Andrzej Hajda 0 siblings, 1 reply; 5+ messages in thread From: Ajay kumar @ 2014-06-24 13:14 UTC (permalink / raw) To: Andrzej Hajda Cc: Ajay Kumar, dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, InKi Dae, Sean Paul, sunil joshi, Prashanth G On Tue, Jun 24, 2014 at 9:01 AM, Andrzej Hajda <a.hajda@samsung.com> wrote: > Hi Ajay, > > On 06/24/2014 01:09 PM, Ajay Kumar wrote: >> Add the missing setting for DP CLKCON register. >> >> This register is present on Exynos5 based FIMD controllers, >> and needs to be used if we are using DP. >> >> Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com> >> --- >> drivers/gpu/drm/exynos/exynos_drm_fimd.c | 5 +++++ >> include/video/samsung_fimd.h | 4 ++++ >> 2 files changed, 9 insertions(+) >> >> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c >> index 33161ad..5d3045d 100644 >> --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c >> +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c >> @@ -72,6 +72,7 @@ struct fimd_driver_data { >> unsigned int has_shadowcon:1; >> unsigned int has_clksel:1; >> unsigned int has_limited_fmt:1; >> + unsigned int has_dp_clkcon:1; >> }; >> >> static struct fimd_driver_data s3c64xx_fimd_driver_data = { >> @@ -88,6 +89,7 @@ static struct fimd_driver_data exynos4_fimd_driver_data = { >> static struct fimd_driver_data exynos5_fimd_driver_data = { >> .timing_base = 0x20000, >> .has_shadowcon = 1, >> + .has_dp_clkcon = 1, >> }; >> >> struct fimd_win_data { >> @@ -331,6 +333,9 @@ static void fimd_commit(struct exynos_drm_manager *mgr) >> if (clkdiv > 1) >> val |= VIDCON0_CLKVAL_F(clkdiv - 1) | VIDCON0_CLKDIR; >> >> + if (ctx->driver_data->has_dp_clkcon) >> + writel(DP_CLK_ENABLE, ctx->regs + DP_CLKCON); >> + > > This code always enables the clock on exynos5. As I understand it should > be enabled only if DP is used. Right! But, when I searched for the display interface, only exynos4 based boards use MIPI/DPI, and all exynos5 based boards use DP. So, I thought adding this in driver_data for exynos5 should be fine. Inki/Andrej - Shall I add it as an optional DT property? Ajay > > >> writel(val, ctx->regs + VIDCON0); >> } >> >> diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h >> index b039320..d8f4b0b 100644 >> --- a/include/video/samsung_fimd.h >> +++ b/include/video/samsung_fimd.h >> @@ -435,6 +435,10 @@ >> #define BLENDCON_NEW_8BIT_ALPHA_VALUE (1 << 0) >> #define BLENDCON_NEW_4BIT_ALPHA_VALUE (0 << 0) >> >> +/* Video clock enable for DP */ >> +#define DP_CLKCON 0x27C >> +#define DP_CLK_ENABLE 0x2 >> + >> /* Notes on per-window bpp settings >> * >> * Value Win0 Win1 Win2 Win3 Win 4 >> > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/exynos: Support DP CLKCON register in FIMD driver 2014-06-24 13:14 ` Ajay kumar @ 2014-06-24 14:15 ` Andrzej Hajda 2014-06-25 0:49 ` Jingoo Han 0 siblings, 1 reply; 5+ messages in thread From: Andrzej Hajda @ 2014-06-24 14:15 UTC (permalink / raw) To: Ajay kumar Cc: linux-samsung-soc@vger.kernel.org, Sean Paul, sunil joshi, dri-devel@lists.freedesktop.org, Prashanth G, Ajay Kumar On 06/24/2014 03:14 PM, Ajay kumar wrote: > On Tue, Jun 24, 2014 at 9:01 AM, Andrzej Hajda <a.hajda@samsung.com> wrote: >> Hi Ajay, >> >> On 06/24/2014 01:09 PM, Ajay Kumar wrote: >>> Add the missing setting for DP CLKCON register. >>> >>> This register is present on Exynos5 based FIMD controllers, >>> and needs to be used if we are using DP. >>> >>> Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com> >>> --- >>> drivers/gpu/drm/exynos/exynos_drm_fimd.c | 5 +++++ >>> include/video/samsung_fimd.h | 4 ++++ >>> 2 files changed, 9 insertions(+) >>> >>> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c >>> index 33161ad..5d3045d 100644 >>> --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c >>> +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c >>> @@ -72,6 +72,7 @@ struct fimd_driver_data { >>> unsigned int has_shadowcon:1; >>> unsigned int has_clksel:1; >>> unsigned int has_limited_fmt:1; >>> + unsigned int has_dp_clkcon:1; >>> }; >>> >>> static struct fimd_driver_data s3c64xx_fimd_driver_data = { >>> @@ -88,6 +89,7 @@ static struct fimd_driver_data exynos4_fimd_driver_data = { >>> static struct fimd_driver_data exynos5_fimd_driver_data = { >>> .timing_base = 0x20000, >>> .has_shadowcon = 1, >>> + .has_dp_clkcon = 1, >>> }; >>> >>> struct fimd_win_data { >>> @@ -331,6 +333,9 @@ static void fimd_commit(struct exynos_drm_manager *mgr) >>> if (clkdiv > 1) >>> val |= VIDCON0_CLKVAL_F(clkdiv - 1) | VIDCON0_CLKDIR; >>> >>> + if (ctx->driver_data->has_dp_clkcon) >>> + writel(DP_CLK_ENABLE, ctx->regs + DP_CLKCON); >>> + >> This code always enables the clock on exynos5. As I understand it should >> be enabled only if DP is used. > Right! > But, when I searched for the display interface, > only exynos4 based boards use MIPI/DPI, and all exynos5 based boards use DP. > So, I thought adding this in driver_data for exynos5 should be fine. Arndale and Arndale-Octa have MIPI/DSI interface with MIPI/LVDS bridge. > > Inki/Andrej - Shall I add it as an optional DT property? No, property is redundant. The simplest solution could be to use CONFIG_DRM_EXYNOS_DP macro but it is quite ugly. I guess extending little bit exynos_drm framework to allow detection of DP in fimd would be better. Regards Andrzej > > Ajay >> >>> writel(val, ctx->regs + VIDCON0); >>> } >>> >>> diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h >>> index b039320..d8f4b0b 100644 >>> --- a/include/video/samsung_fimd.h >>> +++ b/include/video/samsung_fimd.h >>> @@ -435,6 +435,10 @@ >>> #define BLENDCON_NEW_8BIT_ALPHA_VALUE (1 << 0) >>> #define BLENDCON_NEW_4BIT_ALPHA_VALUE (0 << 0) >>> >>> +/* Video clock enable for DP */ >>> +#define DP_CLKCON 0x27C >>> +#define DP_CLK_ENABLE 0x2 >>> + >>> /* Notes on per-window bpp settings >>> * >>> * Value Win0 Win1 Win2 Win3 Win 4 >>> ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/exynos: Support DP CLKCON register in FIMD driver 2014-06-24 14:15 ` Andrzej Hajda @ 2014-06-25 0:49 ` Jingoo Han 0 siblings, 0 replies; 5+ messages in thread From: Jingoo Han @ 2014-06-25 0:49 UTC (permalink / raw) To: 'Ajay kumar', 'Andrzej Hajda' Cc: 'Ajay Kumar', dri-devel, linux-samsung-soc, 'InKi Dae', 'Sean Paul', 'sunil joshi', 'Prashanth G', 'Jingoo Han' On Tuesday, June 24, 2014 11:15 PM, Andrzej Hajda wrote: > On 06/24/2014 03:14 PM, Ajay kumar wrote: > > On Tue, Jun 24, 2014 at 9:01 AM, Andrzej Hajda <a.hajda@samsung.com> wrote: > >> Hi Ajay, > >> > >> On 06/24/2014 01:09 PM, Ajay Kumar wrote: > >>> Add the missing setting for DP CLKCON register. > >>> > >>> This register is present on Exynos5 based FIMD controllers, > >>> and needs to be used if we are using DP. > >>> > >>> Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com> > >>> --- > >>> drivers/gpu/drm/exynos/exynos_drm_fimd.c | 5 +++++ > >>> include/video/samsung_fimd.h | 4 ++++ > >>> 2 files changed, 9 insertions(+) > >>> > >>> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c > >>> index 33161ad..5d3045d 100644 > >>> --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c > >>> +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c > >>> @@ -72,6 +72,7 @@ struct fimd_driver_data { > >>> unsigned int has_shadowcon:1; > >>> unsigned int has_clksel:1; > >>> unsigned int has_limited_fmt:1; > >>> + unsigned int has_dp_clkcon:1; > >>> }; > >>> > >>> static struct fimd_driver_data s3c64xx_fimd_driver_data = { > >>> @@ -88,6 +89,7 @@ static struct fimd_driver_data exynos4_fimd_driver_data = { > >>> static struct fimd_driver_data exynos5_fimd_driver_data = { > >>> .timing_base = 0x20000, > >>> .has_shadowcon = 1, > >>> + .has_dp_clkcon = 1, > >>> }; > >>> > >>> struct fimd_win_data { > >>> @@ -331,6 +333,9 @@ static void fimd_commit(struct exynos_drm_manager *mgr) > >>> if (clkdiv > 1) > >>> val |= VIDCON0_CLKVAL_F(clkdiv - 1) | VIDCON0_CLKDIR; > >>> > >>> + if (ctx->driver_data->has_dp_clkcon) > >>> + writel(DP_CLK_ENABLE, ctx->regs + DP_CLKCON); > >>> + > >> This code always enables the clock on exynos5. As I understand it should > >> be enabled only if DP is used. > > Right! > > But, when I searched for the display interface, > > only exynos4 based boards use MIPI/DPI, and all exynos5 based boards use DP. > > So, I thought adding this in driver_data for exynos5 should be fine. No, it should be selectable. Even some exynos5 based boards use MIPI LCD. > > Arndale and Arndale-Octa have MIPI/DSI interface with MIPI/LVDS bridge. > > > > > Inki/Andrej - Shall I add it as an optional DT property? > > No, property is redundant. The simplest solution could be to use > CONFIG_DRM_EXYNOS_DP > macro but it is quite ugly. Right, CONFIG_DRM_EXYNOS_DP is the simplest. But, the macro doesn't look good. > I guess extending little bit exynos_drm framework to allow detection of > DP in fimd would be better. I agree on Andrzej's opinion. Best regards, Jingoo Han > > Regards > Andrzej > > > > > Ajay > >> > >>> writel(val, ctx->regs + VIDCON0); > >>> } > >>> > >>> diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h > >>> index b039320..d8f4b0b 100644 > >>> --- a/include/video/samsung_fimd.h > >>> +++ b/include/video/samsung_fimd.h > >>> @@ -435,6 +435,10 @@ > >>> #define BLENDCON_NEW_8BIT_ALPHA_VALUE (1 << 0) > >>> #define BLENDCON_NEW_4BIT_ALPHA_VALUE (0 << 0) > >>> > >>> +/* Video clock enable for DP */ > >>> +#define DP_CLKCON 0x27C > >>> +#define DP_CLK_ENABLE 0x2 > >>> + > >>> /* Notes on per-window bpp settings > >>> * > >>> * Value Win0 Win1 Win2 Win3 Win 4 > >>> ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-06-25 0:49 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-06-24 11:09 [PATCH] drm/exynos: Support DP CLKCON register in FIMD driver Ajay Kumar 2014-06-24 13:01 ` Andrzej Hajda 2014-06-24 13:14 ` Ajay kumar 2014-06-24 14:15 ` Andrzej Hajda 2014-06-25 0:49 ` Jingoo Han
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.