From patchwork Fri Mar 1 12:40:31 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: 2201811 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 370FFDF24C for ; Fri, 1 Mar 2013 13:09:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2EAB6E659C for ; Fri, 1 Mar 2013 05:09:51 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ee0-f42.google.com (mail-ee0-f42.google.com [74.125.83.42]) by gabe.freedesktop.org (Postfix) with ESMTP id 5BD32E6306 for ; Fri, 1 Mar 2013 04:40:38 -0800 (PST) Received: by mail-ee0-f42.google.com with SMTP id b47so2287511eek.1 for ; Fri, 01 Mar 2013 04:40:37 -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=02Y+vmFPaF5lUPoUw74DJzGXP+UBokuxcivjkFbSiNM=; b=Z7Xy0mWdD66xwt5WPR+f4sByw2IBZ941BqAmU5+5BvHAJlfGsuTIIRus4xLdE/cMsj +zx2mc5vWD/zKyrn8sxYHEDeZZlw7uTTFpm3S1UwalIUQFZx2FsLkmaZFGftRPUZ4zdv JmziaPDBgdRAFgFb29TjBngfikXSjfEuYCo8Sm3rtqgpRkBorYc/QeOM6s6f4zkqC3Mr HnK5t1T4CO18H8qd3u9IIgT2TbL7rSFIMrAYaisfxW+rA+IRYWvynnn7+TDJ9USb8/6I 68mCx4gOV/HkwQYWqq9fQ+WB4Q+O7oIoMXED3Bw7FsM76wxSmsxjqIpo3aZYNUiqURvG Ry9w== X-Received: by 10.14.3.133 with SMTP id 5mr27361257eeh.43.1362141637359; Fri, 01 Mar 2013 04:40:37 -0800 (PST) Received: from localhost.localdomain ([194.228.11.181]) by mx.google.com with ESMTPS id m46sm16987431eeo.16.2013.03.01.04.40.35 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Mar 2013 04:40:36 -0800 (PST) From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: don't check mipmap alignment if MIP_ADDRESS is FMASK Date: Fri, 1 Mar 2013 13:40:31 +0100 Message-Id: <1362141631-8724-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 Signed-off-by: Marek Olšák --- drivers/gpu/drm/radeon/evergreen_cs.c | 2 +- drivers/gpu/drm/radeon/radeon_drv.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c index d8f5d5f..a759a3d 100644 --- a/drivers/gpu/drm/radeon/evergreen_cs.c +++ b/drivers/gpu/drm/radeon/evergreen_cs.c @@ -834,7 +834,7 @@ static int evergreen_cs_track_validate_texture(struct radeon_cs_parser *p, __func__, __LINE__, toffset, surf.base_align); return -EINVAL; } - if (moffset & (surf.base_align - 1)) { + if (surf.nsamples <= 1 && moffset & (surf.base_align - 1)) { dev_warn(p->dev, "%s:%d mipmap bo base %ld not aligned with %ld\n", __func__, __LINE__, moffset, surf.base_align); return -EINVAL; diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 1677584..66a7f0f 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -70,9 +70,10 @@ * 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 + * 2.30.0 - fix for FMASK texturing */ #define KMS_DRIVER_MAJOR 2 -#define KMS_DRIVER_MINOR 29 +#define KMS_DRIVER_MINOR 30 #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);