From patchwork Thu Feb 3 00:46:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 528371 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 p13343I7003758 for ; Thu, 3 Feb 2011 03:04:29 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 27F889E7D5 for ; Wed, 2 Feb 2011 16:46:26 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qw0-f49.google.com (mail-qw0-f49.google.com [209.85.216.49]) by gabe.freedesktop.org (Postfix) with ESMTP id B105C9E7BE for ; Wed, 2 Feb 2011 16:46:15 -0800 (PST) Received: by qwj9 with SMTP id 9so556550qwj.36 for ; Wed, 02 Feb 2011 16:46:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=mNSULpHZPRaTkwv3jJDEk7DjcF+1/ua4qdnVrqIZj9Q=; b=TK2Ls2AOT8mRnLnqZ3uVV9xng/J55CRkS7RUaV0S/RS7n/XSzy61OqURPfNQA7Inwp vd9MHsuPBW5tz42FF+HN+z+2HXRrcn4QwI1S8Mg0wSNs5gguAuTzJsYDQP7AzER8DaML 6oRIHtIK0nu8Yx7REXWyD85/fcyhKuorcsPGo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=oEbpHHjhWErRl/tV+uiEh6tHur6xlI62ZH7YG+kyVYJzUGcj7dPIskhmxDZ5dNnVRL Lk8fnoptmVvV/FOo0bOkCwPahx0tXZdfemtHRsjj+iTwuq6MXXp6rp+FLmICZwu5zfWt Ko/OdHfLUfoOnZT3BFtuI9KbIsDLwN68mNnCk= Received: by 10.224.19.133 with SMTP id a5mr9468052qab.19.1296693975077; Wed, 02 Feb 2011 16:46:15 -0800 (PST) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id w12sm176579qco.20.2011.02.02.16.46.13 (version=SSLv3 cipher=RC4-MD5); Wed, 02 Feb 2011 16:46:14 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: fix s/r issues with bios scratch regs Date: Wed, 2 Feb 2011 19:46:06 -0500 Message-Id: <1296693966-7081-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 Cc: stable@kernel.org 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 (demeter1.kernel.org [140.211.167.41]); Thu, 03 Feb 2011 03:04:36 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 4dc9c51..b64e603 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -2609,7 +2609,7 @@ void radeon_atom_initialize_bios_scratch_regs(struct drm_device *dev) bios_2_scratch &= ~ATOM_S2_VRI_BRIGHT_ENABLE; /* tell the bios not to handle mode switching */ - bios_6_scratch |= (ATOM_S6_ACC_BLOCK_DISPLAY_SWITCH | ATOM_S6_ACC_MODE); + bios_6_scratch |= ATOM_S6_ACC_BLOCK_DISPLAY_SWITCH; if (rdev->family >= CHIP_R600) { WREG32(R600_BIOS_2_SCRATCH, bios_2_scratch); @@ -2660,10 +2660,13 @@ void radeon_atom_output_lock(struct drm_encoder *encoder, bool lock) else bios_6_scratch = RREG32(RADEON_BIOS_6_SCRATCH); - if (lock) + if (lock) { bios_6_scratch |= ATOM_S6_CRITICAL_STATE; - else + bios_6_scratch &= ~ATOM_S6_ACC_MODE; + } else { bios_6_scratch &= ~ATOM_S6_CRITICAL_STATE; + bios_6_scratch |= ATOM_S6_ACC_MODE; + } if (rdev->family >= CHIP_R600) WREG32(R600_BIOS_6_SCRATCH, bios_6_scratch);