drm/rockchip: vop: fix iommu crash with async atomic
After async atomic_commit callback, drm_atomic_clean_old_fb will clean all old fb, but because async, the old fb may be also on the vop hardware, dma will access the old fb buffer, clean old fb will cause iommu page fault. Reference the fb and unreference it when the fb actuall swap out from vop hardware. Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
This commit is contained in:
parent
2d90d47743
commit
44d0237a26
|
@ -560,6 +560,22 @@ static void vop_plane_destroy(struct drm_plane *plane)
|
||||||
drm_plane_cleanup(plane);
|
drm_plane_cleanup(plane);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int vop_plane_prepare_fb(struct drm_plane *plane,
|
||||||
|
const struct drm_plane_state *new_state)
|
||||||
|
{
|
||||||
|
if (plane->state->fb)
|
||||||
|
drm_framebuffer_reference(plane->state->fb);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void vop_plane_cleanup_fb(struct drm_plane *plane,
|
||||||
|
const struct drm_plane_state *old_state)
|
||||||
|
{
|
||||||
|
if (old_state->fb)
|
||||||
|
drm_framebuffer_unreference(old_state->fb);
|
||||||
|
}
|
||||||
|
|
||||||
static int vop_plane_atomic_check(struct drm_plane *plane,
|
static int vop_plane_atomic_check(struct drm_plane *plane,
|
||||||
struct drm_plane_state *state)
|
struct drm_plane_state *state)
|
||||||
{
|
{
|
||||||
|
@ -756,6 +772,8 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct drm_plane_helper_funcs plane_helper_funcs = {
|
static const struct drm_plane_helper_funcs plane_helper_funcs = {
|
||||||
|
.prepare_fb = vop_plane_prepare_fb,
|
||||||
|
.cleanup_fb = vop_plane_cleanup_fb,
|
||||||
.atomic_check = vop_plane_atomic_check,
|
.atomic_check = vop_plane_atomic_check,
|
||||||
.atomic_update = vop_plane_atomic_update,
|
.atomic_update = vop_plane_atomic_update,
|
||||||
.atomic_disable = vop_plane_atomic_disable,
|
.atomic_disable = vop_plane_atomic_disable,
|
||||||
|
|
Loading…
Reference in a new issue