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

[Nicolas Ferre]

On 16/06/2017 at 00:40, Peter Rosin wrote:
> On 2017-06-15 11:37, Boris Brezillon wrote:
>> On Thu, 15 Jun 2017 11:24:13 +0200
>> Peter Rosin <peda at lysator.liu.se> wrote:
>>
>>> From: Peter Rosin <peda at 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.
> 
> Heh.
> 
>> 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).
> 
> Also, on page 2 (the Features chapter under peripherals) there's:
> 
>    "LCD TFT Controller with 4 overlays..."
> 
> I think it should be three?

Hi Peter and Boris,

After checking with the designers here, it seems that it's an issue with
the latest datasheet. This is why Boris implemented it some time ago.

So, the conclusion is: the OVR2 was removed from latest sama5d4
documentation by mistake. It will be corrected in next datasheet release.
The OVR2 exists and works correctly on sama5d4.

So, please don't remove this layer ;-)

Peter, thanks a lot for your work with supporting the CLUT feature!

Best regards,
  Nicolas

>>> Fixes: 5b9fb5e6c6c7 ("drm: atmel-hlcdc: add support for sama5d4 SoCs")
>>> Signed-off-by: Peter Rosin <peda at 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 = {
>>
> 
> 


-- 
Nicolas Ferre