From patchwork Sat Jan 12 03:19:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWFyZWsgT2zFocOhaw==?= X-Patchwork-Id: 1968431 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 ABC9E3FF0F for ; Sat, 12 Jan 2013 03:19:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 78F2DE6C7D for ; Fri, 11 Jan 2013 19:19:59 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id CC3E5E5EEA for ; Fri, 11 Jan 2013 19:19:46 -0800 (PST) Received: by mail-we0-f177.google.com with SMTP id x48so1147460wey.8 for ; Fri, 11 Jan 2013 19:19:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=MfkJKcs9AWwSqkc2SaLoKe5cxXCFhz7dhTzpkl8J2Z4=; b=G1bdHp1NwuwxPipu/5brsbp85KqgUhhWpTUbHiItoiVay/mAxit6dJadQ+1mCorcoz FMZs1Vs/aUwDFm2WPHLE4CMdpGiJ6m1tko6p3892Lpni9X75sdwXlsLIplMWp4xnsR8D NQtPCdBlSTITx48V9ib4fJ28qqGi9sL5VZhgfsWdzXpB8r77mZJx4o6T3QxLMGzAFK8y 8s5VcyDtc1Lbe9I1rIW4KDKwau0uy5PJZUk1j+ybLEDjUYumJQOlcFOBXXuwwb4xdJ22 O2kEdv6wSvjvP8v2XNb7vfUkbXcl0trEL+J3n4EIIYuZgRNFtTXfCI/DY61AZPI258e2 NgMw== X-Received: by 10.180.39.143 with SMTP id p15mr2079650wik.14.1357960785485; Fri, 11 Jan 2013 19:19:45 -0800 (PST) Received: from localhost.localdomain ([194.228.11.63]) by mx.google.com with ESMTPS id bz12sm2003650wib.5.2013.01.11.19.19.43 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Jan 2013 19:19:44 -0800 (PST) From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: allow FP16 color clear registers on r500 Date: Sat, 12 Jan 2013 04:19:37 +0100 Message-Id: <1357960777-16159-1-git-send-email-maraeo@gmail.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 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 Probably not a candidate for stable kernels because of conflicts in DRM versioning. Signed-off-by: Marek Olšák --- drivers/gpu/drm/radeon/radeon_drv.c | 3 ++- drivers/gpu/drm/radeon/reg_srcs/rv515 | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index dff6cf7..d9bf96e 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -69,9 +69,10 @@ * 2.26.0 - r600-eg: fix htile size computation * 2.27.0 - r600-SI: Add CS ioctl support for async DMA * 2.28.0 - r600-eg: Add MEM_WRITE packet support + * 2.29.0 - R500 FP16 color clear registers */ #define KMS_DRIVER_MAJOR 2 -#define KMS_DRIVER_MINOR 28 +#define KMS_DRIVER_MINOR 29 #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 911a8fb..78d5e99 100644 --- a/drivers/gpu/drm/radeon/reg_srcs/rv515 +++ b/drivers/gpu/drm/radeon/reg_srcs/rv515 @@ -324,6 +324,8 @@ rv515 0x6d40 0x46AC US_OUT_FMT_2 0x46B0 US_OUT_FMT_3 0x46B4 US_W_FMT +0x46C0 RB3D_COLOR_CLEAR_VALUE_AR +0x46C4 RB3D_COLOR_CLEAR_VALUE_GB 0x4BC0 FG_FOG_BLEND 0x4BC4 FG_FOG_FACTOR 0x4BC8 FG_FOG_COLOR_R