From patchwork Thu Aug 11 14:01:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 1057092 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 p7BE1NPD003120 for ; Thu, 11 Aug 2011 14:01:48 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D5A809EAFD for ; Thu, 11 Aug 2011 07:01:22 -0700 (PDT) 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 B64EF9E79F for ; Thu, 11 Aug 2011 07:01:13 -0700 (PDT) Received: by qwi2 with SMTP id 2so1285678qwi.36 for ; Thu, 11 Aug 2011 07:01:13 -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=gIREKKrnY1iWSIqfZAfEw33pcTNGbKP8vz/02oxD3fA=; b=PwVxQvgVKKstxyMREzrsDlclp5XcI4SsVnCBqLxy7Y5kJziItbOjCiWFV5C4CJEAji nfXYswATWwqtWlDRFVW8F1x65Rtas9Lg23lfwItVpbuEdGlavKc7nEiN3lRWEmYO4NOp en85+Qdpm2nQO9Y0UpnlbE1aW3rfcjdjTjxvk= Received: by 10.229.11.23 with SMTP id r23mr1409661qcr.279.1313071273035; Thu, 11 Aug 2011 07:01:13 -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 b3sm1567643qcu.28.2011.08.11.07.01.11 (version=SSLv3 cipher=OTHER); Thu, 11 Aug 2011 07:01:12 -0700 (PDT) From: alexdeucher@gmail.com To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: fix regression is handling >2 heads on cedar/caicos Date: Thu, 11 Aug 2011 10:01:03 -0400 Message-Id: <1313071263-1905-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 Cc: Alex Deucher , 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 (demeter2.kernel.org [140.211.167.43]); Thu, 11 Aug 2011 14:01:48 +0000 (UTC) From: Alex Deucher Need to add support for 4 crtcs when setting the possible crtcs for the encoders. Signed-off-by: Alex Deucher Cc: stable@kernel.org --- drivers/gpu/drm/radeon/radeon_encoders.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 4c4d8e5..39cfef6 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -2394,6 +2394,9 @@ radeon_add_atom_encoder(struct drm_device *dev, default: encoder->possible_crtcs = 0x3; break; + case 4: + encoder->possible_crtcs = 0xf; + break; case 6: encoder->possible_crtcs = 0x3f; break;