lkml.org 
[lkml]   [2012]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 084/122] drm/nouveau: init vblank requests list
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.5-stable review patch. If anyone has any objections, please let me know.

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

    From: Marcin Slusarz <marcin.slusarz@gmail.com>

    commit 715855457e6bc93e148caf8cb3b5dcabbf605b0d upstream.

    Fixes kernel panic when vblank interrupt triggers before first sync to
    vblank request.

    (Besides init, remove some relevant leftovers from vblank rework)

    Reported-by: Ortwin Glück <odi@odi.ch>
    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/nouveau/nouveau_drv.h | 2 --
    drivers/gpu/drm/nouveau/nouveau_irq.c | 4 ----
    drivers/gpu/drm/nouveau/nouveau_software.h | 1 +
    3 files changed, 1 insertion(+), 6 deletions(-)

    --- a/drivers/gpu/drm/nouveau/nouveau_drv.h
    +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
    @@ -689,8 +689,6 @@ struct drm_nouveau_private {
    void (*irq_handler[32])(struct drm_device *);
    bool msi_enabled;

    - struct list_head vbl_waiting;
    -
    struct {
    struct drm_global_reference mem_global_ref;
    struct ttm_bo_global_ref bo_global_ref;
    --- a/drivers/gpu/drm/nouveau/nouveau_irq.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_irq.c
    @@ -41,12 +41,8 @@
    void
    nouveau_irq_preinstall(struct drm_device *dev)
    {
    - struct drm_nouveau_private *dev_priv = dev->dev_private;
    -
    /* Master disable */
    nv_wr32(dev, NV03_PMC_INTR_EN_0, 0);
    -
    - INIT_LIST_HEAD(&dev_priv->vbl_waiting);
    }

    int
    --- a/drivers/gpu/drm/nouveau/nouveau_software.h
    +++ b/drivers/gpu/drm/nouveau/nouveau_software.h
    @@ -38,6 +38,7 @@ static inline void
    nouveau_software_context_new(struct nouveau_software_chan *pch)
    {
    INIT_LIST_HEAD(&pch->flip);
    + INIT_LIST_HEAD(&pch->vblank.list);
    }

    static inline void

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2012-08-08 03:41    [W:4.183 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site