From patchwork Wed Feb 16 01:26:08 2011 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: 563361 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 p1G1QdeC006646 for ; Wed, 16 Feb 2011 01:26:59 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B52F49EB1A for ; Tue, 15 Feb 2011 17:26:38 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-fx0-f49.google.com (mail-fx0-f49.google.com [209.85.161.49]) by gabe.freedesktop.org (Postfix) with ESMTP id E47DF9E709 for ; Tue, 15 Feb 2011 17:26:29 -0800 (PST) Received: by fxm19 with SMTP id 19so837493fxm.36 for ; Tue, 15 Feb 2011 17:26:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :mime-version:content-type:content-transfer-encoding; bh=Umy0IKXpMNYondRxSmAduNen6kBbJOKKCrssqDGypZs=; b=wh6OX1KNYq4TP6/lYiBUplx771ODKUjjL33oHHw5izgsK5r1meGTiTA1+hNGQKNQon /FPzEcKdpU7KMjj9rGMeRa4dsEb/Qyxgkb03bC8iyRHBMYcimjabiyxMGmHWwBNZwfxr hh95FZfa9jo2qQ1LEC0nLGGM7NJlnuwaWhPyA= 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=NwdmP5rVhR+cObQRLH6VYRls12kgDpRT139Jyuo72Ww0ERfHI86zb3Qa4rohO+Y8nd bj1UW3+0dwx0i4B9VOzzVYUyRtoCMZJXpfAjHvZEcz0qhzHGQQpp/fePyXvLVCXMDZrA 9huuBPn+b/wo7p0JQPSEJ92mBSNcU9Jpyd8iE= Received: by 10.103.243.10 with SMTP id v10mr64mur.55.1297819588472; Tue, 15 Feb 2011 17:26:28 -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 a6sm1774870fak.1.2011.02.15.17.26.26 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 Feb 2011 17:26:27 -0800 (PST) From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: do not reject X16 and Y16X16 floating-point formats on r300 Date: Wed, 16 Feb 2011 02:26:08 +0100 Message-Id: <1297819568-7154-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.6 (demeter1.kernel.org [140.211.167.41]); Wed, 16 Feb 2011 01:26:59 +0000 (UTC) X-MIME-Autoconverted: from base64 to 8bit by demeter1.kernel.org id p1G1QdeC006646 diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 768c60e..069efa8 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c @@ -910,6 +910,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, track->textures[i].compress_format = R100_TRACK_COMP_NONE; break; case R300_TX_FORMAT_X16: + case R300_TX_FORMAT_FL_I16: case R300_TX_FORMAT_Y8X8: case R300_TX_FORMAT_Z5Y6X5: case R300_TX_FORMAT_Z6Y5X5: @@ -922,6 +923,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, track->textures[i].compress_format = R100_TRACK_COMP_NONE; break; case R300_TX_FORMAT_Y16X16: + case R300_TX_FORMAT_FL_I16A16: case R300_TX_FORMAT_Z11Y11X10: case R300_TX_FORMAT_Z10Y11X11: case R300_TX_FORMAT_W8Z8Y8X8: