From patchwork Tue May 14 16:18:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 2567411 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 3B02CDF24C for ; Tue, 14 May 2013 16:22:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0285FE6229 for ; Tue, 14 May 2013 09:22:16 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qa0-f53.google.com (mail-qa0-f53.google.com [209.85.216.53]) by gabe.freedesktop.org (Postfix) with ESMTP id 6DDD4E61A8 for ; Tue, 14 May 2013 09:18:49 -0700 (PDT) Received: by mail-qa0-f53.google.com with SMTP id ih17so523382qab.12 for ; Tue, 14 May 2013 09:18:49 -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:mime-version:content-type:content-transfer-encoding; bh=v3cXx7rAk9kS+ZljsmF+u/Kbd1E0EAJ85ETuhVWQD+I=; b=V45xpiKDopKN1+1N9285vTKlx6Ovts2QYQ2ZI4V7JSbVoq17l0dmKkQPYnwJ+s+17Y Fj294sl1rFEn1H+rAjcCyLCyPNDkPVPLyi6vKWaFkhKoU8d5V/bAFU65hEdVtR8nRyXT RVqTvWxVFd8lNh8ZPIi1bEPZyzqci58+cQtA5Ar2iPpFMMI/QM2dmwIWCrCdFcKD2nH+ xxpCapvo4tz7TZF+ynrVpf2keO6Qg+CQk0tIee/+/FWTga3CEnFgtKJzOo5bAfW+oDDj MxtwtqRcAogkFTsJy3gxmcfGeMD78rWPUy2OARFoIrf5SIhYtOOLIuBDGTswCabSQTHp CKRw== X-Received: by 10.224.161.3 with SMTP id p3mr24777791qax.37.1368548329016; Tue, 14 May 2013 09:18:49 -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 j9sm15370131qas.3.2013.05.14.09.18.48 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 14 May 2013 09:18:48 -0700 (PDT) From: alexdeucher@gmail.com To: dri-devel@lists.freedesktop.org Subject: [PATCH 5/9] drm/radeon: radeon-asic updates for Hainan Date: Tue, 14 May 2013 12:18:35 -0400 Message-Id: <1368548319-23806-5-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.7.5 In-Reply-To: <1368548319-23806-1-git-send-email-alexdeucher@gmail.com> References: <1368478504-13798-1-git-send-email-alexdeucher@gmail.com> <1368548319-23806-1-git-send-email-alexdeucher@gmail.com> MIME-Version: 1.0 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: , 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 Reviewed-by: Christian König --- 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;