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

Groups > linux.kernel > #1504188

RE: [PATCH v3 1/5] drm/fsl-dcu: enable TCON bypass mode by default

Show all headers | View raw

> 
> Do not use encoder disable/enable callbacks to control bypass mode as this
> seems to mess with the signals not liked by displays. This also makes more
> sense since the encoder is already defined to be parallel RGB/LVDS at creation
> time.
> 
> Signed-off-by: Stefan Agner <stefan@agner.ch>
> ---
>  drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c |  2 ++  drivers/gpu/drm/fsl-
> dcu/fsl_dcu_drm_rgb.c | 39 ++++---------------------------
>  2 files changed, 7 insertions(+), 34 deletions(-)
> 
> diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-
> dcu/fsl_dcu_drm_drv.c
> index 0884c45..3897f56 100644
> --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
> +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
> @@ -273,6 +273,8 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
>  		goto disable_dcu_clk;
>  	}
> 
> +	if (fsl_dev->tcon)
> +		fsl_tcon_bypass_enable(fsl_dev->tcon);
>  	fsl_dcu_drm_init_planes(fsl_dev->drm);
>  	drm_atomic_helper_resume(fsl_dev->drm, fsl_dev->state);
> 
> diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c b/drivers/gpu/drm/fsl-
> dcu/fsl_dcu_drm_rgb.c
> index 26edcc8..e1dd75b 100644
> --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
> +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
> @@ -20,38 +20,6 @@
>  #include "fsl_dcu_drm_drv.h"
>  #include "fsl_tcon.h"
> 
> -static int
> -fsl_dcu_drm_encoder_atomic_check(struct drm_encoder *encoder,
> -				 struct drm_crtc_state *crtc_state,
> -				 struct drm_connector_state *conn_state)
> -{
> -	return 0;
> -}
> -
> -static void fsl_dcu_drm_encoder_disable(struct drm_encoder *encoder) -{
> -	struct drm_device *dev = encoder->dev;
> -	struct fsl_dcu_drm_device *fsl_dev = dev->dev_private;
> -
> -	if (fsl_dev->tcon)
> -		fsl_tcon_bypass_disable(fsl_dev->tcon);
> -}
> -
> -static void fsl_dcu_drm_encoder_enable(struct drm_encoder *encoder) -{
> -	struct drm_device *dev = encoder->dev;
> -	struct fsl_dcu_drm_device *fsl_dev = dev->dev_private;
> -
> -	if (fsl_dev->tcon)
> -		fsl_tcon_bypass_enable(fsl_dev->tcon);
> -}
> -
> -static const struct drm_encoder_helper_funcs encoder_helper_funcs = {
> -	.atomic_check = fsl_dcu_drm_encoder_atomic_check,
> -	.disable = fsl_dcu_drm_encoder_disable,
> -	.enable = fsl_dcu_drm_encoder_enable,
> -};
> -
>  static void fsl_dcu_drm_encoder_destroy(struct drm_encoder *encoder)  {
>  	drm_encoder_cleanup(encoder);
> @@ -68,13 +36,16 @@ int fsl_dcu_drm_encoder_create(struct
> fsl_dcu_drm_device *fsl_dev,
>  	int ret;
> 
>  	encoder->possible_crtcs = 1;
> +
> +	/* Use bypass mode for parallel RGB/LVDS encoder */
> +	if (fsl_dev->tcon)
> +		fsl_tcon_bypass_enable(fsl_dev->tcon);
> +
>  	ret = drm_encoder_init(fsl_dev->drm, encoder, &encoder_funcs,
>  			       DRM_MODE_ENCODER_LVDS, NULL);
>  	if (ret < 0)
>  		return ret;
> 
> -	drm_encoder_helper_add(encoder, &encoder_helper_funcs);
> -
>  	return 0;
>  }
> 
> --
> 2.10.0

Tested-By: Meng Yi <meng.yi@nxp.com>

Tested those 5 patches on LS1021a-twr, and everything is fine.

Meng

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/5] drm/fsl-dcu: initialization fixes Stefan Agner <stefan@agner.ch> - 2016-10-17 23:40 +0200
  [PATCH v3 3/5] drm/fsl-dcu: do not transfer registers in mode_set_nofb Stefan Agner <stefan@agner.ch> - 2016-10-17 23:40 +0200
  [PATCH v3 4/5] drm/fsl-dcu: enable pixel clock when enabling CRTC Stefan Agner <stefan@agner.ch> - 2016-10-17 23:40 +0200
  [PATCH v3 5/5] drm/fsl-dcu: only init fbdev if required Stefan Agner <stefan@agner.ch> - 2016-10-17 23:40 +0200
    Re: [PATCH v3 5/5] drm/fsl-dcu: only init fbdev if required Daniel Vetter <daniel@ffwll.ch> - 2016-10-18 09:50 +0200
      Re: [PATCH v3 5/5] drm/fsl-dcu: only init fbdev if required Stefan Agner <stefan@agner.ch> - 2016-10-18 19:50 +0200
        Re: [PATCH v3 5/5] drm/fsl-dcu: only init fbdev if required Daniel Vetter <daniel@ffwll.ch> - 2016-10-19 18:40 +0200
  [PATCH v3 1/5] drm/fsl-dcu: enable TCON bypass mode by default Stefan Agner <stefan@agner.ch> - 2016-10-17 23:40 +0200
    RE: [PATCH v3 1/5] drm/fsl-dcu: enable TCON bypass mode by default Meng Yi <meng.yi@nxp.com> - 2016-10-19 19:50 +0200
      RE: [PATCH v3 1/5] drm/fsl-dcu: enable TCON bypass mode by default Stefan Agner <stefan@agner.ch> - 2016-10-20 02:10 +0200
  [PATCH v3 2/5] drm/fsl-dcu: do not transfer registers on plane init Stefan Agner <stefan@agner.ch> - 2016-10-17 23:40 +0200

csiph-web