lkml.org 
[lkml]   [2012]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 61/66] drm/vmwgfx: Fix a case where the code would BUG when trying to pin GMR memory
    Date
    3.6-stable review patch.  If anyone has any objections, please let me know.

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

    From: Thomas Hellstrom <thellstrom@vmware.com>

    commit afcc87aa6a233e52df73552dc1dc9ae3881b7cc8 upstream.

    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Reviewed-by: Brian Paul <brianp@vmware.com>
    Reviewed-by: Dmitry Torokhov <dtor@vmware.com>
    Cc: linux-graphics-maintainer@vmware.com
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
    @@ -306,7 +306,7 @@ void vmw_bo_pin(struct ttm_buffer_object

    BUG_ON(!atomic_read(&bo->reserved));
    BUG_ON(old_mem_type != TTM_PL_VRAM &&
    - old_mem_type != VMW_PL_FLAG_GMR);
    + old_mem_type != VMW_PL_GMR);

    pl_flags = TTM_PL_FLAG_VRAM | VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED;
    if (pin)



    \
     
     \ /
      Last update: 2012-11-15 06:22    [W:3.294 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site