From patchwork Mon May 13 20:55:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 2560541 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 6C0783FD4E for ; Mon, 13 May 2013 21:03:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 54644E5F5D for ; Mon, 13 May 2013 14:03:54 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qa0-f54.google.com (mail-qa0-f54.google.com [209.85.216.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 88437E5F60 for ; Mon, 13 May 2013 13:55:12 -0700 (PDT) Received: by mail-qa0-f54.google.com with SMTP id o13so1620954qaj.6 for ; Mon, 13 May 2013 13:55:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=ocf3GPGWeULh9ovTX/ppYk8Z3SsX9OWUWl76JZCDy3o=; b=EKnmU/qF9h9izySOthCT+zxdORYBARfLtvIn03zfDRlF3wi5KEH8zmVx3hxmFHtAeB PfaHaShaflBB83JYSCSrUDoCVpb55ajKg1n7yUzCKjEgINFo1QQfXVkhI7veY3MbnA5u XbNUVkXzi6N/Yt87VSGUoCBU4N1/uE/2qaVkQOBC1lU/+L6eLgR2mqdPtJ3E1KRUCoYe VI7QEoTCjbW4WzsxYXPze5JPdmI/ZYPVjJ6FAeyDuzjCbLljTsnR9Ac0Bd9z/pQjB0U+ wwrp7z/3Syb+dQbOfa12osFWr5i3vdvEtHb0VtFMRbcXD0SNKKGiITiHOwt6FrtBYqnA zxSQ== X-Received: by 10.224.189.16 with SMTP id dc16mr22039497qab.3.1368478512185; Mon, 13 May 2013 13:55:12 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPSA id bc5sm12517494qeb.3.2013.05.13.13.55.11 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 13 May 2013 13:55:11 -0700 (PDT) From: alexdeucher@gmail.com To: dri-devel@lists.freedesktop.org Subject: [PATCH 5/8] drm/radeon: radeon-asic updates for Hainan Date: Mon, 13 May 2013 16:55:01 -0400 Message-Id: <1368478504-13798-5-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.7.5 In-Reply-To: <1368478504-13798-1-git-send-email-alexdeucher@gmail.com> References: <1368478504-13798-1-git-send-email-alexdeucher@gmail.com> Cc: Alex Deucher 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 Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/radeon_asic.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c index 6417132..44a7a41 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.c +++ b/drivers/gpu/drm/radeon/radeon_asic.c @@ -2051,9 +2051,12 @@ int radeon_asic_init(struct radeon_device *rdev) case CHIP_PITCAIRN: case CHIP_VERDE: case CHIP_OLAND: + case CHIP_HAINAN: rdev->asic = &si_asic; /* set num crtcs */ - if (rdev->family == CHIP_OLAND) + if (rdev->family == CHIP_HAINAN) + rdev->num_crtc = 0; + else if (rdev->family == CHIP_OLAND) rdev->num_crtc = 2; else rdev->num_crtc = 6;