lkml.org 
[lkml]   [2019]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 01/27] drm/imx: ignore plane updates on disabled crtcs
    Date
    From: Philipp Zabel <p.zabel@pengutronix.de>

    [ Upstream commit 4fb873c9648e383206e0a91cef9b03aa54066aca ]

    This patch fixes backtraces like the following when sending SIGKILL to a
    process with a currently pending plane update:

    [drm:ipu_plane_atomic_check] CRTC should be enabled
    [drm:drm_framebuffer_remove] *ERROR* failed to commit
    ------------[ cut here ]------------
    WARNING: CPU: 3 PID: 63 at drivers/gpu/drm/drm_framebuffer.c:926 drm_framebuffer_remove+0x47c/0x498
    atomic remove_fb failed with -22

    Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/imx/ipuv3-plane.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
    index cf98596c7ce1..d0d7f6adbc89 100644
    --- a/drivers/gpu/drm/imx/ipuv3-plane.c
    +++ b/drivers/gpu/drm/imx/ipuv3-plane.c
    @@ -348,9 +348,9 @@ static int ipu_plane_atomic_check(struct drm_plane *plane,
    if (ret)
    return ret;

    - /* CRTC should be enabled */
    + /* nothing to check when disabling or disabled */
    if (!crtc_state->enable)
    - return -EINVAL;
    + return 0;

    switch (plane->type) {
    case DRM_PLANE_TYPE_PRIMARY:
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-03-11 20:59    [W:6.812 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site