lkml.org 
[lkml]   [2018]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 127/156] drm/vc4: Move IRQ enable to PM path
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Stefan Schake <stschake@gmail.com>


    [ Upstream commit ce9caf2f79a5aa170a4b6456a03db639eed9c988 ]

    We were calling enable_irq on bind, where it was already enabled previously
    by the IRQ helper. Additionally, dev->irq is not set correctly until after
    postinstall and so was always zero here, triggering a warning in 4.15.
    Fix both by moving the enable to the power management resume path, where we
    know there was a previous disable invocation during suspend.

    Fixes: 253696ccd613 ("drm/vc4: Account for interrupts in flight")
    Signed-off-by: Stefan Schake <stschake@gmail.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Link: https://patchwork.freedesktop.org/patch/msgid/1514563543-32511-1-git-send-email-stschake@gmail.com
    Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
    Reviewed-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/vc4/vc4_irq.c | 3 ---
    drivers/gpu/drm/vc4/vc4_v3d.c | 3 +++
    2 files changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/gpu/drm/vc4/vc4_irq.c
    +++ b/drivers/gpu/drm/vc4/vc4_irq.c
    @@ -208,9 +208,6 @@ vc4_irq_postinstall(struct drm_device *d
    {
    struct vc4_dev *vc4 = to_vc4_dev(dev);

    - /* Undo the effects of a previous vc4_irq_uninstall. */
    - enable_irq(dev->irq);
    -
    /* Enable both the render done and out of memory interrupts. */
    V3D_WRITE(V3D_INTENA, V3D_DRIVER_IRQS);

    --- a/drivers/gpu/drm/vc4/vc4_v3d.c
    +++ b/drivers/gpu/drm/vc4/vc4_v3d.c
    @@ -327,6 +327,9 @@ static int vc4_v3d_runtime_resume(struct
    return ret;

    vc4_v3d_init_hw(vc4->dev);
    +
    + /* We disabled the IRQ as part of vc4_irq_uninstall in suspend. */
    + enable_irq(vc4->dev->irq);
    vc4_irq_postinstall(vc4->dev);

    return 0;

    \
     
     \ /
      Last update: 2018-02-02 18:22    [W:4.339 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site