From patchwork Tue Jul 26 21:28:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Glisse X-Patchwork-Id: 1009592 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6QLQpXp015039 for ; Tue, 26 Jul 2011 21:27:12 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 18E5D9F5BA for ; Tue, 26 Jul 2011 14:26:51 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vx0-f177.google.com (mail-vx0-f177.google.com [209.85.220.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 9079C9E764 for ; Tue, 26 Jul 2011 14:26:42 -0700 (PDT) Received: by vxh29 with SMTP id 29so804182vxh.36 for ; Tue, 26 Jul 2011 14:26:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=UEtjjCiOGPRtVVHLeeg9z2naPpJnhjYR9nRFQWY2c3U=; b=v68Yqzm7xPrDpEX8qBrGHe9ni9ZA1m77IJIo4FsbtokhJIdTeTyhh8DxU1FDoR55J4 ZoYYOFKR4PXXH5gR13ZInEmZNOIPfAdfrJVzD9DGT85/DUg5WFIzHay6PKuOTrvO8Cg8 vTbll8SylstKPxnOwgnu64o0AWtJnKtdHD0Wo= Received: by 10.52.179.230 with SMTP id dj6mr6230117vdc.130.1311715601914; Tue, 26 Jul 2011 14:26:41 -0700 (PDT) Received: from dhcp-10-16-61-82.boston.devel.redhat.com (nat-pool-rdu.redhat.com [66.187.233.202]) by mx.google.com with ESMTPS id f8sm482223vdw.7.2011.07.26.14.26.40 (version=SSLv3 cipher=OTHER); Tue, 26 Jul 2011 14:26:41 -0700 (PDT) From: j.glisse@gmail.com To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: disable CP interrupt when disabling interrupt Date: Tue, 26 Jul 2011 17:28:59 -0400 Message-Id: <1311715739-3551-1-git-send-email-j.glisse@gmail.com> X-Mailer: git-send-email 1.7.3.2 Cc: Jerome Glisse X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 26 Jul 2011 21:27:12 +0000 (UTC) From: Jerome Glisse Some CP interrupt were left enabled when disabling interrupt. Signed-off-by: Jerome Glisse --- drivers/gpu/drm/radeon/evergreen.c | 2 +- drivers/gpu/drm/radeon/r600.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 14dce9f..852565d 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -2434,7 +2434,7 @@ void evergreen_disable_interrupt_state(struct radeon_device *rdev) { u32 tmp; - WREG32(CP_INT_CNTL, CNTX_BUSY_INT_ENABLE | CNTX_EMPTY_INT_ENABLE); + WREG32(CP_INT_CNTL, 0); WREG32(GRBM_INT_CNTL, 0); WREG32(INT_MASK + EVERGREEN_CRTC0_REGISTER_OFFSET, 0); WREG32(INT_MASK + EVERGREEN_CRTC1_REGISTER_OFFSET, 0); diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index aa5571b..d2c74e7 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -2900,7 +2900,7 @@ static void r600_disable_interrupt_state(struct radeon_device *rdev) { u32 tmp; - WREG32(CP_INT_CNTL, CNTX_BUSY_INT_ENABLE | CNTX_EMPTY_INT_ENABLE); + WREG32(CP_INT_CNTL, 0); WREG32(GRBM_INT_CNTL, 0); WREG32(DxMODE_INT_MASK, 0); WREG32(D1GRPH_INTERRUPT_CONTROL, 0);