From patchwork Fri Oct 8 16:09:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 241601 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o98G9ZA0009428 for ; Fri, 8 Oct 2010 16:09:56 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E1D92A0A4A for ; Fri, 8 Oct 2010 09:09:34 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ew0-f49.google.com (mail-ew0-f49.google.com [209.85.215.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E2789E738 for ; Fri, 8 Oct 2010 09:09:22 -0700 (PDT) Received: by ewy9 with SMTP id 9so766564ewy.36 for ; Fri, 08 Oct 2010 09:09:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=fg1JSeFNkTpz2ek5lwDmk0xBJWgTJDymFhWncRy6w+A=; b=NSYtdpCiNSVS61ZC7mH8+FfzjXCaBYXooPnXJ1PXOxdztthJ3Qf2lJy2rQg6Na2w98 bMFXAIiw5P5h521J+Y308YvVZkQgNuV3N0k2zyOBXeo7XAo0YZt+8Kv4wQqtR91are7n DqPgKvA2/9CRaBRr/XcMIg7CImnkITZt/Lbp8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=s6IWmegUzwQ9g13idiWk4uyFR9GpG9c9yOG2rM23WObfpEGF17Zd9sNGos6+HCnKmL C+2K/RPucC7qik0gh7oO2HPXDTDllaNPpHyWCFhEUGqeKi/WvK+0WGSnbb9BVNRLLYeY 1I498tsBzSSBmkUs3dmZKnRLdNdpkJouNPmQ4= Received: by 10.213.22.77 with SMTP id m13mr1689365ebb.72.1286554160881; Fri, 08 Oct 2010 09:09:20 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id c40sm1403935vcs.25.2010.10.08.09.09.18 (version=SSLv3 cipher=RC4-MD5); Fri, 08 Oct 2010 09:09:19 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: leave certain CP int bits enabled Date: Fri, 8 Oct 2010 12:09:12 -0400 Message-Id: <1286554152-1958-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 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.3 (demeter1.kernel.org [140.211.167.41]); Fri, 08 Oct 2010 16:09:56 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index fc14d04..2d38eae 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -1593,7 +1593,7 @@ void evergreen_disable_interrupt_state(struct radeon_device *rdev) { u32 tmp; - WREG32(CP_INT_CNTL, 0); + WREG32(CP_INT_CNTL, CNTX_BUSY_INT_ENABLE | CNTX_EMPTY_INT_ENABLE); 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 31f45af..b5508d0 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -2866,7 +2866,7 @@ static void r600_disable_interrupt_state(struct radeon_device *rdev) { u32 tmp; - WREG32(CP_INT_CNTL, 0); + WREG32(CP_INT_CNTL, CNTX_BUSY_INT_ENABLE | CNTX_EMPTY_INT_ENABLE); WREG32(GRBM_INT_CNTL, 0); WREG32(DxMODE_INT_MASK, 0); if (ASIC_IS_DCE3(rdev)) {