From mboxrd@z Thu Jan 1 00:00:00 1970 From: alexdeucher@gmail.com Subject: [PATCH] drm/radeon/si: add missing radeon_bo_unreserve in si_rlc_init() Date: Thu, 12 Apr 2012 16:13:55 -0400 Message-ID: <1334261635-7334-1-git-send-email-alexdeucher@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-qa0-f41.google.com (mail-qa0-f41.google.com [209.85.216.41]) by gabe.freedesktop.org (Postfix) with ESMTP id B2C5DA0B98 for ; Thu, 12 Apr 2012 13:14:04 -0700 (PDT) Received: by qafl39 with SMTP id l39so5071921qaf.14 for ; Thu, 12 Apr 2012 13:14:04 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: airlied@gmail.com, dri-devel@lists.freedesktop.org Cc: Alex Deucher List-Id: dri-devel@lists.freedesktop.org From: Alex Deucher Forget to unreserve after pinning. This can lead to problems in soft reset and resume. Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/si.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index ac7a199..23a114c 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -3005,6 +3005,7 @@ int si_rlc_init(struct radeon_device *rdev) si_rlc_fini(rdev); return r; } + radeon_bo_unreserve(rdev->rlc.save_restore_obj); /* clear state block */ if (rdev->rlc.clear_state_obj == NULL) { @@ -3024,12 +3025,12 @@ int si_rlc_init(struct radeon_device *rdev) r = radeon_bo_pin(rdev->rlc.clear_state_obj, RADEON_GEM_DOMAIN_VRAM, &rdev->rlc.clear_state_gpu_addr); if (r) { - radeon_bo_unreserve(rdev->rlc.clear_state_obj); dev_warn(rdev->dev, "(%d) pin RLC c bo failed\n", r); si_rlc_fini(rdev); return r; } + radeon_bo_unreserve(rdev->rlc.clear_state_obj); return 0; } -- 1.7.7.5