From: Thomas Hellstrom Date: Wed, 9 Oct 2013 08:42:50 +0000 (-0700) Subject: drm/vmwgfx: Don't put resources with invalid id's on lru list X-Git-Tag: v3.12~16^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26682480c202e7360cbcdc3bc9e962bf749c6b8d;p=kernel%2Fkernel-generic.git drm/vmwgfx: Don't put resources with invalid id's on lru list The evict code may try to swap them out causing a BUG in the destroy function. Signed-off-by: Thomas Hellstrom Reviewed-by: Jakob Bornecrantz Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index 0e67cf4..37fb4be 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c @@ -970,7 +970,7 @@ void vmw_resource_unreserve(struct vmw_resource *res, if (new_backup) res->backup_offset = new_backup_offset; - if (!res->func->may_evict) + if (!res->func->may_evict || res->id == -1) return; write_lock(&dev_priv->resource_lock);