[PATCH 18/38] drm/fsl-du: Implement some semblance of vblank event handling

Stefan Agner stefan at agner.ch
Fri Jun 3 17:43:58 UTC 2016


On 2016-06-01 15:06, Daniel Vetter wrote:
> No idea how exactly fsl-du commits hw state changes, but here in flush
> is probably the safest place.

The writes to the DCU_UPDATE_MODE register (DCU_UPDATE_MODE_READREG)
commit state changes. There are several callbacks causing a commit, it
seems to me that the current code does not what atomic is asking for,
checking that is on my 2do...

I tested this patch individually, using modesetting driver. Things seem
to work as they did before.
Acked-by: Stefan Agner <stefan at agner.ch>

But I guess to test the non-blocking commit, I would have to apply the
whole patchset...? Do you have it somewhere in a git tree?

--
Stefan

> 
> While at it nuke the dummy functions.
> 
> v2: Be more robust and either arm, when the CRTC is on, or just send
> the event out right away.
> 
> Cc: Stefan Agner <stefan at agner.ch>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---
>  drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 23 +++++++++++------------
>  1 file changed, 11 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
> b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
> index 89c0084c2814..706de3278f1c 100644
> --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
> +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
> @@ -22,20 +22,21 @@
>  #include "fsl_dcu_drm_drv.h"
>  #include "fsl_dcu_drm_plane.h"
>  
> -static void fsl_dcu_drm_crtc_atomic_begin(struct drm_crtc *crtc,
> +static void fsl_dcu_drm_crtc_atomic_flush(struct drm_crtc *crtc,
>  					  struct drm_crtc_state *old_crtc_state)
>  {
> -}
> +	struct drm_pending_vblank_event *event = crtc->state->event;
>  
> -static int fsl_dcu_drm_crtc_atomic_check(struct drm_crtc *crtc,
> -					 struct drm_crtc_state *state)
> -{
> -	return 0;
> -}
> +	if (event) {
> +		crtc->state->event = NULL;
>  
> -static void fsl_dcu_drm_crtc_atomic_flush(struct drm_crtc *crtc,
> -					  struct drm_crtc_state *old_crtc_state)
> -{
> +		spin_lock_irq(&crtc->dev->event_lock);
> +		if (drm_crtc_vblank_get(crtc) == 0)
> +			drm_crtc_arm_vblank_event(crtc, event);
> +		else
> +			drm_crtc_send_vblank_event(crtc, event);
> +		spin_unlock_irq(&crtc->dev->event_lock);
> +	}
>  }
>  
>  static void fsl_dcu_drm_disable_crtc(struct drm_crtc *crtc)
> @@ -117,8 +118,6 @@ static void fsl_dcu_drm_crtc_mode_set_nofb(struct
> drm_crtc *crtc)
>  }
>  
>  static const struct drm_crtc_helper_funcs fsl_dcu_drm_crtc_helper_funcs = {
> -	.atomic_begin = fsl_dcu_drm_crtc_atomic_begin,
> -	.atomic_check = fsl_dcu_drm_crtc_atomic_check,
>  	.atomic_flush = fsl_dcu_drm_crtc_atomic_flush,
>  	.disable = fsl_dcu_drm_disable_crtc,
>  	.enable = fsl_dcu_drm_crtc_enable,


More information about the dri-devel mailing list