From patchwork Wed Nov 14 14:13:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 1741401 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 5F9723FC64 for ; Wed, 14 Nov 2012 14:13:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 48926A023D for ; Wed, 14 Nov 2012 06:13:26 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by gabe.freedesktop.org (Postfix) with ESMTP id EC43A9E893 for ; Wed, 14 Nov 2012 06:13:14 -0800 (PST) Received: by mail-vb0-f49.google.com with SMTP id fo1so445394vbb.36 for ; Wed, 14 Nov 2012 06:13:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=sd3mFnsR9zAu9KZ0+5UHTwkssTiO8zJ+Sm4/e65ZDvk=; b=jq3+HRu3nlnLhiumnKhR04hTbkt430FAFD70fj5i9n7kH1xcis0pHRdDGpe0DFfFkE q1+MSr2fO2uAfZWzuO+1uPUTXC2/mP0XQt6KrkpS9HvrsPPFiBmVIGiTTBBHeDg69w0g 1H0vbWAbIbJRulQalDpJSJEIZNe972VabQ720VLR+dRWsuHrmmwLkYbtWtyNMeBQNcHQ xjPGgBqSf3GtgvEVRATRAm1HOIoC2l8TBPjhr1iT390/yIe2hAD7gzSqnHo22crzBl1q 5/P7oKssp9eoFZwogook9o0yIhPZUCiwBUsyjt8bS3hlPnmHDtSd1pUqlRlRfA4hBNLK //JA== Received: by 10.220.40.16 with SMTP id i16mr11232580vce.31.1352902394377; Wed, 14 Nov 2012 06:13:14 -0800 (PST) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPS id jx16sm11191285veb.5.2012.11.14.06.13.13 (version=SSLv3 cipher=OTHER); Wed, 14 Nov 2012 06:13:13 -0800 (PST) From: alexdeucher@gmail.com To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: fix logic error in atombios_encoders.c Date: Wed, 14 Nov 2012 09:13:07 -0500 Message-Id: <1352902387-31133-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.7.5 Cc: Alex Deucher , stable@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 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 From: Alex Deucher Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=50431 Reported-by: David Binderman Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Reviewed-by: Michel Dänzer --- drivers/gpu/drm/radeon/atombios_encoders.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c index ba498f8..010bae1 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c @@ -1625,7 +1625,7 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode) atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_SETUP, 0, 0); atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0); /* some early dce3.2 boards have a bug in their transmitter control table */ - if ((rdev->family != CHIP_RV710) || (rdev->family != CHIP_RV730)) + if ((rdev->family != CHIP_RV710) && (rdev->family != CHIP_RV730)) atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0); } if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(encoder)) && connector) {