From patchwork Sat Dec 18 10:41:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?TWFyZWsgT2zFocOhaw==?= X-Patchwork-Id: 417931 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 oBIAgYtp000637 for ; Sat, 18 Dec 2010 10:43:03 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E30FC9E94A for ; Sat, 18 Dec 2010 02:42:32 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-fx0-f42.google.com (mail-fx0-f42.google.com [209.85.161.42]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D0949E94A for ; Sat, 18 Dec 2010 02:42:25 -0800 (PST) Received: by fxm11 with SMTP id 11so1465851fxm.15 for ; Sat, 18 Dec 2010 02:42:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:mime-version:content-type :content-transfer-encoding; bh=nSejWQaRqxHgnjxBUwckyE8dCLdrEAwAqEmds+6VQ88=; b=TCbpQyyVHuhlWPy37Ags6crZRtsgtdgvq5Zgjtab2UQnWqEEVlOAjwM+UhPvn+Am3a zi6kkYG0TluLS0VHPg1ID3U7ynbNfVhgPQsKtQuIXBbuFNuSM4aTB80jF7bwsUQR4q1n E0pjuy+jxjGR5GMvqCBaoQ1wqV5YuPXlDJIcU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; b=shJgyw7m9XBkUiXJpDg+q6Qx4leb33l+oz2m7TkHt6hYEUDgjQb3OHKIKwT35SNFEQ dNpjnQKtuVotFLzpn8uNQ7Naskur8mE0cbmE6dVH7DmXTb40QEl4jyGlMur1+A6ztpst dhU2SixX+9rR43xhTOrMespFaquIDNUpBXbK8= Received: by 10.223.85.204 with SMTP id p12mr2160641fal.146.1292668944226; Sat, 18 Dec 2010 02:42:24 -0800 (PST) Received: from localhost.localdomain (ip-89-103-73-143.net.upcbroadband.cz [89.103.73.143]) by mx.google.com with ESMTPS id y1sm342340fak.15.2010.12.18.02.42.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 18 Dec 2010 02:42:23 -0800 (PST) From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: allow r500 US_FORMAT regs in the CS checker Date: Sat, 18 Dec 2010 11:41:49 +0100 Message-Id: <1292668909-15130-1-git-send-email-maraeo@gmail.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 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: , 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.3 (demeter1.kernel.org [140.211.167.41]); Sat, 18 Dec 2010 10:43:03 +0000 (UTC) X-MIME-Autoconverted: from base64 to 8bit by demeter1.kernel.org id oBIAgYtp000637 diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 88e4ea9..787ab5b 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -47,10 +47,11 @@ * - 2.4.0 - add crtc id query * - 2.5.0 - add get accel 2 to work around ddx breakage for evergreen * - 2.6.0 - add tiling config query (r6xx+), add initial HiZ support (r300->r500) - * 2.7.0 - fixups for r600 2D tiling support. (no external ABI change), add eg dyn gpr regs + * - 2.7.0 - fixups for r600 2D tiling support. (no external ABI change), add eg dyn gpr regs + * - 2.8.0 - add r500 US_FORMAT regs */ #define KMS_DRIVER_MAJOR 2 -#define KMS_DRIVER_MINOR 7 +#define KMS_DRIVER_MINOR 8 #define KMS_DRIVER_PATCHLEVEL 0 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); int radeon_driver_unload_kms(struct drm_device *dev); diff --git a/drivers/gpu/drm/radeon/reg_srcs/rv515 b/drivers/gpu/drm/radeon/reg_srcs/rv515 index b3f9f1d..ef422bb 100644 --- a/drivers/gpu/drm/radeon/reg_srcs/rv515 +++ b/drivers/gpu/drm/radeon/reg_srcs/rv515 @@ -304,6 +304,22 @@ rv515 0x6d40 0x4630 US_CODE_ADDR 0x4634 US_CODE_RANGE 0x4638 US_CODE_OFFSET +0x4640 US_FORMAT0_0 +0x4644 US_FORMAT0_1 +0x4648 US_FORMAT0_2 +0x464C US_FORMAT0_3 +0x4650 US_FORMAT0_4 +0x4654 US_FORMAT0_5 +0x4658 US_FORMAT0_6 +0x465C US_FORMAT0_7 +0x4660 US_FORMAT0_8 +0x4664 US_FORMAT0_9 +0x4668 US_FORMAT0_10 +0x466C US_FORMAT0_11 +0x4670 US_FORMAT0_12 +0x4674 US_FORMAT0_13 +0x4678 US_FORMAT0_14 +0x467C US_FORMAT0_15 0x46A4 US_OUT_FMT_0 0x46A8 US_OUT_FMT_1 0x46AC US_OUT_FMT_2