[PATCH] drm/ingenic: Hardcode panel type to DPI

[Paul Cercueil]

Le jeu. 29 août 2019 à 16:46, Laurent Pinchart 
<laurent.pinchart at ideasonboard.com> a écrit :
> Hi Paul,
> 
> On Thu, Aug 29, 2019 at 12:03:32PM +0200, Paul Cercueil wrote:
>>  Le mar. 27 août 2019 à 7:00, Sam Ravnborg a écrit :
>>  > On Fri, Aug 23, 2019 at 11:30:09PM +0200, Paul Cercueil wrote:
>>  >>  Le ven. 23 août 2019 à 23:23, Laurent Pinchart a écrit :
>>  >>> The ingenic driver supports DPI panels only at the moment, so 
>> hardcode
>>  >>> their type to DPI instead of Unknown.
>>  >>>
>>  >>> Signed-off-by: Laurent Pinchart 
>> <laurent.pinchart at ideasonboard.com>
>>  >>> ---
>>  >>> Paul, as the driver has been merged in v5.3-rc1, this is a 
>> candidate for
>>  >>> a v5.3 fix. Keeping the connector type as unknown could cause a
>>  >>> userspace dependency on it, preventing it from being changed 
>> later.
>>  >>
>>  >>  Makes sense.
>>  >>
>>  >>  Reviewed-by: Paul Cercueil <paul at crapouillou.net>
>>  >
>>  > In another mail we discuss CONNECTOR_PANEL. But we should not 
>> hold up
>>  > due to this.
>>  > Reviewed-by: Sam Ravnborg <sam at ravnborg.org>
>>  >
>>  > Paul - will you apply to drm-misc-fixes?
>> 
>>  I pushed to drm-misc-next (I hope that's OK and I didn't screw up) 
>> and
>>  also drm-misc-fixes.
> 
> I *think* you only needed to push to drm-misc-fixes. Pushing the same
> patch to both will generate a conflict when drm-misc-next is merged 
> with
> drm-misc-fixes (which will happen in linux-next first, and then when
> Linus merges the drm-misc-next branch into his tree for v5.5).

Git is smart and shouldn't conflict on that, but if it does I apologize.


> 
>>  >>> diff --git a/drivers/gpu/drm/ingenic/ingenic-drm.c
>>  >>> b/drivers/gpu/drm/ingenic/ingenic-drm.c
>>  >>> index ce1fae3a78a9..2e2ed653e9c6 100644
>>  >>> --- a/drivers/gpu/drm/ingenic/ingenic-drm.c
>>  >>> +++ b/drivers/gpu/drm/ingenic/ingenic-drm.c
>>  >>> @@ -675,10 +675,9 @@ static int ingenic_drm_probe(struct
>>  >> platform_device
>>  >>> *pdev)
>>  >>>  		return ret;
>>  >>>  	}
>>  >>>
>>  >>> -	if (panel) {
>>  >>> +	if (panel)
>>  >>>  		bridge = devm_drm_panel_bridge_add(dev, panel,
>>  >>> -						   DRM_MODE_CONNECTOR_Unknown);
>>  >>> -	}
>>  >>> +						   DRM_MODE_CONNECTOR_DPI);
>>  >>>
>>  >>>  	priv->dma_hwdesc = dma_alloc_coherent(dev, 
>> sizeof(*priv->dma_hwdesc),
>>  >>>  					      &priv->dma_hwdesc_phys,
> 
> --
> Regards,
> 
> Laurent Pinchart