Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1666597 > unrolled thread

[PATCH] drm: atmel-hlcdc: sama5d4 does not have overlay2

Started byPeter Rosin <peda@lysator.liu.se>
First post2017-06-15 11:30 +0200
Last post2017-06-15 11:40 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] drm: atmel-hlcdc: sama5d4 does not have overlay2 Peter Rosin <peda@lysator.liu.se> - 2017-06-15 11:30 +0200
    Re: [PATCH] drm: atmel-hlcdc: sama5d4 does not have overlay2 Boris Brezillon <boris.brezillon@free-electrons.com> - 2017-06-15 11:40 +0200

#1666597 — [PATCH] drm: atmel-hlcdc: sama5d4 does not have overlay2

FromPeter Rosin <peda@lysator.liu.se>
Date2017-06-15 11:30 +0200
Subject[PATCH] drm: atmel-hlcdc: sama5d4 does not have overlay2
Message-ID<tSzge-Gu-15@gated-at.bofh.it>
From: Peter Rosin <peda@axentia.se>

Remove the layer.

Fixes: 5b9fb5e6c6c7 ("drm: atmel-hlcdc: add support for sama5d4 SoCs")
Signed-off-by: Peter Rosin <peda@axentia.se>
---
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
index 30dbffd..888524a 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
@@ -295,28 +295,10 @@ static const struct atmel_hlcdc_layer_desc atmel_hlcdc_sama5d4_layers[] = {
 		},
 	},
 	{
-		.name = "overlay2",
-		.formats = &atmel_hlcdc_plane_rgb_formats,
-		.regs_offset = 0x240,
-		.id = 2,
-		.type = ATMEL_HLCDC_OVERLAY_LAYER,
-		.cfgs_offset = 0x2c,
-		.layout = {
-			.pos = 2,
-			.size = 3,
-			.xstride = { 4 },
-			.pstride = { 5 },
-			.default_color = 6,
-			.chroma_key = 7,
-			.chroma_key_mask = 8,
-			.general_config = 9,
-		},
-	},
-	{
 		.name = "high-end-overlay",
 		.formats = &atmel_hlcdc_plane_rgb_and_yuv_formats,
 		.regs_offset = 0x340,
-		.id = 3,
+		.id = 2,
 		.type = ATMEL_HLCDC_OVERLAY_LAYER,
 		.cfgs_offset = 0x4c,
 		.layout = {
-- 
2.1.4

[toc] | [next] | [standalone]


#1666601

FromBoris Brezillon <boris.brezillon@free-electrons.com>
Date2017-06-15 11:40 +0200
Message-ID<tSzpU-JG-13@gated-at.bofh.it>
In reply to#1666597
On Thu, 15 Jun 2017 11:24:13 +0200
Peter Rosin <peda@lysator.liu.se> wrote:

> From: Peter Rosin <peda@axentia.se>
> 
> Remove the layer.

Duh. It was present in the datasheet I had. Just downloaded last
version of the datasheet and it's no longer there.

Nicolas, there's still a reference to OVR2 in the block diagram
(Section "31.3 Block Diagram"), can ask fix that (or ask someone who
can).

> 
> Fixes: 5b9fb5e6c6c7 ("drm: atmel-hlcdc: add support for sama5d4 SoCs")
> Signed-off-by: Peter Rosin <peda@axentia.se>
> ---
>  drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 20 +-------------------
>  1 file changed, 1 insertion(+), 19 deletions(-)
> 
> diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
> index 30dbffd..888524a 100644
> --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
> +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
> @@ -295,28 +295,10 @@ static const struct atmel_hlcdc_layer_desc atmel_hlcdc_sama5d4_layers[] = {
>  		},
>  	},
>  	{
> -		.name = "overlay2",
> -		.formats = &atmel_hlcdc_plane_rgb_formats,
> -		.regs_offset = 0x240,
> -		.id = 2,
> -		.type = ATMEL_HLCDC_OVERLAY_LAYER,
> -		.cfgs_offset = 0x2c,
> -		.layout = {
> -			.pos = 2,
> -			.size = 3,
> -			.xstride = { 4 },
> -			.pstride = { 5 },
> -			.default_color = 6,
> -			.chroma_key = 7,
> -			.chroma_key_mask = 8,
> -			.general_config = 9,
> -		},
> -	},
> -	{
>  		.name = "high-end-overlay",
>  		.formats = &atmel_hlcdc_plane_rgb_and_yuv_formats,
>  		.regs_offset = 0x340,
> -		.id = 3,
> +		.id = 2,
>  		.type = ATMEL_HLCDC_OVERLAY_LAYER,
>  		.cfgs_offset = 0x4c,
>  		.layout = {

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web