From f6cda9ffcb1a478e3fcbf3f855a1a28e4dee5371 Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Fri, 17 Oct 2008 15:48:44 +0800 Subject: [PATCH] --- yaml --- r: 117236 b: refs/heads/master c: 786225eb2f4e55b5dda3cf8c62a145e824aae199 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_drawable.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 18852eaeccf9..6f60ba87b5c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1ed629f44b3a4108d5c445971535f05f441fce7 +refs/heads/master: 786225eb2f4e55b5dda3cf8c62a145e824aae199 diff --git a/trunk/drivers/gpu/drm/drm_drawable.c b/trunk/drivers/gpu/drm/drm_drawable.c index 70b15d1b8f54..4a794d89942b 100644 --- a/trunk/drivers/gpu/drm/drm_drawable.c +++ b/trunk/drivers/gpu/drm/drm_drawable.c @@ -76,11 +76,14 @@ int drm_rmdraw(struct drm_device *dev, void *data, struct drm_file *file_priv) { struct drm_draw *draw = data; unsigned long irqflags; + struct drm_drawable_info *info; spin_lock_irqsave(&dev->drw_lock, irqflags); - drm_free(drm_get_drawable_info(dev, draw->handle), - sizeof(struct drm_drawable_info), DRM_MEM_BUFS); + info = drm_get_drawable_info(dev, draw->handle); + drm_free(info->rects, info->num_rects * sizeof(struct drm_clip_rect), + DRM_MEM_BUFS); + drm_free(info, sizeof(struct drm_drawable_info), DRM_MEM_BUFS); idr_remove(&dev->drw_idr, draw->handle);