From patchwork Thu Mar 6 21:12:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenneth Graunke X-Patchwork-Id: 3786451 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DAB5DBF540 for ; Thu, 6 Mar 2014 21:16:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F3A67201F0 for ; Thu, 6 Mar 2014 21:16:49 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2BEB620263 for ; Thu, 6 Mar 2014 21:16:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 815D3FAF17; Thu, 6 Mar 2014 13:16:47 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from homiemail-a10.g.dreamhost.com (caiajhbdcaib.dreamhost.com [208.97.132.81]) by gabe.freedesktop.org (Postfix) with ESMTP id 2CC4DFAB5B for ; Thu, 6 Mar 2014 13:16:45 -0800 (PST) Received: from homiemail-a10.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a10.g.dreamhost.com (Postfix) with ESMTP id DBC70280075; Thu, 6 Mar 2014 13:16:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=whitecape.org; h=from:to :cc:subject:date:message-id:in-reply-to:references; s= whitecape.org; bh=WzYNRKaMZROVpU9R2r6GBjkoDD4=; b=SnjLp1x0AUu4kb BN7NZwVsmj/RomOhh0Qx2JqG2mOOXANwJtuP5TRo7JufNgfvB6N+pXXybyQpW3IE 4/wvYydjWHAUZmNhuaQ6bjKdraXYwRZBw8w9SZxBpE/3qkxjpCJ6FcUawPVx6sXJ 12fhHOwtlYpwvh5PVZVPlQu7tRmmM= Received: from localhost.localdomain (unknown [172.56.32.17]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: kenneth@whitecape.org) by homiemail-a10.g.dreamhost.com (Postfix) with ESMTPSA id C498A28005C; Thu, 6 Mar 2014 13:16:43 -0800 (PST) From: Kenneth Graunke To: intel-gfx@lists.freedesktop.org Date: Thu, 6 Mar 2014 13:12:31 -0800 Message-Id: <1394140352-1307-2-git-send-email-kenneth@whitecape.org> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1394140352-1307-1-git-send-email-kenneth@whitecape.org> References: <1394140352-1307-1-git-send-email-kenneth@whitecape.org> Cc: stephane.marchesin@gmail.com Subject: [Intel-gfx] [PATCH 2/3] uxa: Remove implicit length from BLT command #defines. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These command packets grew on Gen8. Signed-off-by: Kenneth Graunke --- src/uxa/i830_reg.h | 12 ++++++------ src/uxa/intel_uxa.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/uxa/i830_reg.h b/src/uxa/i830_reg.h index 93d03cf..d8306bc 100644 --- a/src/uxa/i830_reg.h +++ b/src/uxa/i830_reg.h @@ -70,32 +70,32 @@ #define COLOR_BLT_WRITE_ALPHA (1<<21) #define COLOR_BLT_WRITE_RGB (1<<20) -#define XY_COLOR_BLT_CMD ((2<<29)|(0x50<<22)|(0x4)) +#define XY_COLOR_BLT_CMD ((2<<29)|(0x50<<22)) #define XY_COLOR_BLT_WRITE_ALPHA (1<<21) #define XY_COLOR_BLT_WRITE_RGB (1<<20) #define XY_COLOR_BLT_TILED (1<<11) -#define XY_SETUP_CLIP_BLT_CMD ((2<<29)|(3<<22)|1) +#define XY_SETUP_CLIP_BLT_CMD ((2<<29)|(3<<22)) -#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)|6) +#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)) #define XY_SRC_COPY_BLT_WRITE_ALPHA (1<<21) #define XY_SRC_COPY_BLT_WRITE_RGB (1<<20) #define XY_SRC_COPY_BLT_SRC_TILED (1<<15) #define XY_SRC_COPY_BLT_DST_TILED (1<<11) -#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22)|0x4) +#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22)) #define SRC_COPY_BLT_WRITE_ALPHA (1<<21) #define SRC_COPY_BLT_WRITE_RGB (1<<20) #define XY_PAT_BLT_IMMEDIATE ((2<<29)|(0x72<<22)) -#define XY_MONO_PAT_BLT_CMD ((0x2<<29)|(0x52<<22)|0x7) +#define XY_MONO_PAT_BLT_CMD ((0x2<<29)|(0x52<<22)) #define XY_MONO_PAT_VERT_SEED ((1<<10)|(1<<9)|(1<<8)) #define XY_MONO_PAT_HORT_SEED ((1<<14)|(1<<13)|(1<<12)) #define XY_MONO_PAT_BLT_WRITE_ALPHA (1<<21) #define XY_MONO_PAT_BLT_WRITE_RGB (1<<20) -#define XY_MONO_SRC_BLT_CMD ((0x2<<29)|(0x54<<22)|(0x6)) +#define XY_MONO_SRC_BLT_CMD ((0x2<<29)|(0x54<<22)) #define XY_MONO_SRC_BLT_WRITE_ALPHA (1<<21) #define XY_MONO_SRC_BLT_WRITE_RGB (1<<20) diff --git a/src/uxa/intel_uxa.c b/src/uxa/intel_uxa.c index d4ba7fc..e46e15b 100644 --- a/src/uxa/intel_uxa.c +++ b/src/uxa/intel_uxa.c @@ -326,7 +326,7 @@ static void intel_uxa_solid(PixmapPtr pixmap, int x1, int y1, int x2, int y2) { BEGIN_BATCH_BLT(6); - cmd = XY_COLOR_BLT_CMD; + cmd = XY_COLOR_BLT_CMD | (6 - 2); if (pixmap->drawable.bitsPerPixel == 32) cmd |= @@ -464,7 +464,7 @@ intel_uxa_copy(PixmapPtr dest, int src_x1, int src_y1, int dst_x1, { BEGIN_BATCH_BLT(8); - cmd = XY_SRC_COPY_BLT_CMD; + cmd = XY_SRC_COPY_BLT_CMD | (8 - 2); if (dest->drawable.bitsPerPixel == 32) cmd |=