Skip to content

Commit

Permalink
drm/rockchip: vop: fix iommu crash with async atomic
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Yao committed May 3, 2016
1 parent 2d90d47 commit 44d0237
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions drivers/gpu/drm/rockchip/rockchip_drm_vop.c
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,22 @@ static void vop_plane_destroy(struct drm_plane *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,
struct drm_plane_state *state)
{
Expand Down Expand Up @@ -756,6 +772,8 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
}

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_update = vop_plane_atomic_update,
.atomic_disable = vop_plane_atomic_disable,
Expand Down

0 comments on commit 44d0237

Please sign in to comment.