eb8c88808c
The DP (display processor) channel disable code tried to busy wait for the DP sync flow end interrupt status bit when disabling the partial plane without a full modeset. That never worked reliably, and it was disabled completely by the recent "gpu: ipu-v3: remove IRQ dance on DC channel disable" patch, causing ipu_wait_interrupt to always time out after 50 ms, which in turn would trigger a timeout in drm_atomic_helper_wait_for_vblanks. This patch changes ipu_plane_atomic_disable to only queue a DP channel register update at the next frame boundary and set a flag, which can be done without any waiting whatsoever. The imx_drm_atomic_commit_tail then calls a new ipu_plane_disable_deferred function that does the actual IDMAC teardown of the planes that are flagged for deferred disabling, after waiting for the vblank. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
51 lines
1.2 KiB
C
51 lines
1.2 KiB
C
#ifndef __IPUV3_PLANE_H__
|
|
#define __IPUV3_PLANE_H__
|
|
|
|
#include <drm/drm_crtc.h> /* drm_plane */
|
|
|
|
struct drm_plane;
|
|
struct drm_device;
|
|
struct ipu_soc;
|
|
struct drm_crtc;
|
|
struct drm_framebuffer;
|
|
|
|
struct ipuv3_channel;
|
|
struct dmfc_channel;
|
|
struct ipu_dp;
|
|
|
|
struct ipu_plane {
|
|
struct drm_plane base;
|
|
|
|
struct ipu_soc *ipu;
|
|
struct ipuv3_channel *ipu_ch;
|
|
struct dmfc_channel *dmfc;
|
|
struct ipu_dp *dp;
|
|
|
|
int dma;
|
|
int dp_flow;
|
|
|
|
bool disabling;
|
|
};
|
|
|
|
struct ipu_plane *ipu_plane_init(struct drm_device *dev, struct ipu_soc *ipu,
|
|
int dma, int dp, unsigned int possible_crtcs,
|
|
enum drm_plane_type type);
|
|
|
|
/* Init IDMAC, DMFC, DP */
|
|
int ipu_plane_mode_set(struct ipu_plane *plane, struct drm_crtc *crtc,
|
|
struct drm_display_mode *mode,
|
|
struct drm_framebuffer *fb, int crtc_x, int crtc_y,
|
|
unsigned int crtc_w, unsigned int crtc_h,
|
|
uint32_t src_x, uint32_t src_y, uint32_t src_w,
|
|
uint32_t src_h, bool interlaced);
|
|
|
|
int ipu_plane_get_resources(struct ipu_plane *plane);
|
|
void ipu_plane_put_resources(struct ipu_plane *plane);
|
|
|
|
int ipu_plane_irq(struct ipu_plane *plane);
|
|
|
|
void ipu_plane_disable(struct ipu_plane *ipu_plane, bool disable_dp_channel);
|
|
void ipu_plane_disable_deferred(struct drm_plane *plane);
|
|
|
|
#endif
|