mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-12 19:46:29 +00:00
5e0594fd77
The driver recently switched from handling page flip completion in the
DU vertical blanking handler to the VSP frame end handler to fix a race
condition. This unfortunately resulted in incorrect timestamps in the
vertical blanking events sent to userspace as vertical blanking is now
handled after sending the event.
To fix this we must reverse the order of the two operations. The easiest
way is to handle vertical blanking in the VSP frame end handler before
sending the event. The VSP frame end interrupt occurs approximately 50µs
earlier than the DU frame end interrupt, but this should not cause any
undue harm.
As we need to handle vertical blanking even when page flip completion is
delayed, the VSP driver now needs to call the frame end completion
callback unconditionally, with a new argument to report whether page
flip has completed.
With this new scheme the DU vertical blanking interrupt isn't needed
anymore, so we can stop enabling it.
Fixes: d503a43ac0 ("drm: rcar-du: Register a completion callback with VSP1")
Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
61 lines
1.7 KiB
C
61 lines
1.7 KiB
C
/*
|
|
* vsp1_drm.h -- R-Car VSP1 DRM/KMS Interface
|
|
*
|
|
* Copyright (C) 2015 Renesas Electronics Corporation
|
|
*
|
|
* Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
#ifndef __VSP1_DRM_H__
|
|
#define __VSP1_DRM_H__
|
|
|
|
#include <linux/videodev2.h>
|
|
|
|
#include "vsp1_pipe.h"
|
|
|
|
/**
|
|
* vsp1_drm_pipeline - State for the API exposed to the DRM driver
|
|
* @pipe: the VSP1 pipeline used for display
|
|
* @enabled: pipeline state at the beginning of an update
|
|
* @du_complete: frame completion callback for the DU driver (optional)
|
|
* @du_private: data to be passed to the du_complete callback
|
|
*/
|
|
struct vsp1_drm_pipeline {
|
|
struct vsp1_pipeline pipe;
|
|
bool enabled;
|
|
|
|
/* Frame synchronisation */
|
|
void (*du_complete)(void *, bool);
|
|
void *du_private;
|
|
};
|
|
|
|
/**
|
|
* vsp1_drm - State for the API exposed to the DRM driver
|
|
* @pipe: the VSP1 DRM pipeline used for display
|
|
* @inputs: source crop rectangle, destination compose rectangle and z-order
|
|
* position for every input (indexed by RPF index)
|
|
*/
|
|
struct vsp1_drm {
|
|
struct vsp1_drm_pipeline pipe[VSP1_MAX_LIF];
|
|
|
|
struct {
|
|
struct v4l2_rect crop;
|
|
struct v4l2_rect compose;
|
|
unsigned int zpos;
|
|
} inputs[VSP1_MAX_RPF];
|
|
};
|
|
|
|
static inline struct vsp1_drm_pipeline *
|
|
to_vsp1_drm_pipeline(struct vsp1_pipeline *pipe)
|
|
{
|
|
return container_of(pipe, struct vsp1_drm_pipeline, pipe);
|
|
}
|
|
|
|
int vsp1_drm_init(struct vsp1_device *vsp1);
|
|
void vsp1_drm_cleanup(struct vsp1_device *vsp1);
|
|
|
|
#endif /* __VSP1_DRM_H__ */
|