From patchwork Wed Apr 23 15:07:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 4042241 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 C2BCCBFF02 for ; Wed, 23 Apr 2014 15:09:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DD8F2201B4 for ; Wed, 23 Apr 2014 15:09:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C4175201F7 for ; Wed, 23 Apr 2014 15:09:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3A6706E6BC; Wed, 23 Apr 2014 08:09:38 -0700 (PDT) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id BF25B6E6BC for ; Wed, 23 Apr 2014 08:09:37 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 23 Apr 2014 08:08:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,912,1389772800"; d="scan'208";a="526224946" Received: from tursulin-linux.iwi.intel.com ([172.28.253.34]) by orsmga002.jf.intel.com with ESMTP; 23 Apr 2014 08:08:00 -0700 From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Wed, 23 Apr 2014 16:07:55 +0100 Message-Id: <1398265675-914-1-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 1.9.1 Subject: [Intel-gfx] [PATCH] tests: Extract ALIGN macro into a common header X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,HK_RANDOM_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Tvrtko Ursulin Makes for a little bit less code duplication, especially since it will be used from more callers in the future. Signed-off-by: Tvrtko Ursulin Reviewed-by: Brad Volkin --- lib/drmtest.h | 9 +++++++++ lib/media_fill_gen7.c | 2 +- lib/media_fill_gen8.c | 2 +- lib/rendercopy_gen6.c | 1 - lib/rendercopy_gen7.c | 1 - lib/rendercopy_gen8.c | 1 - 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/drmtest.h b/lib/drmtest.h index f3afbaa..84f80dc 100644 --- a/lib/drmtest.h +++ b/lib/drmtest.h @@ -60,6 +60,15 @@ static inline void *igt_mmap64(void *addr, size_t length, int prot, int flags, */ #define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0])) +/** + * ALIGN: + * @v: value to be aligned + * @a: alignment unit in bytes + * + * Macro to align a value @v to a specified unit @a. + */ +#define ALIGN(v, a) (((v) + (a)-1) & ~((a)-1)) + int drm_get_card(void); int drm_open_any(void); int drm_open_any_render(void); diff --git a/lib/media_fill_gen7.c b/lib/media_fill_gen7.c index cdf4b60..82c3469 100644 --- a/lib/media_fill_gen7.c +++ b/lib/media_fill_gen7.c @@ -4,10 +4,10 @@ #include "media_fill.h" #include "gen7_media.h" #include "intel_reg.h" +#include "drmtest.h" #include -#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1)) static const uint32_t media_kernel[][4] = { { 0x00400001, 0x20200231, 0x00000020, 0x00000000 }, diff --git a/lib/media_fill_gen8.c b/lib/media_fill_gen8.c index 996d4d0..54309d5 100644 --- a/lib/media_fill_gen8.c +++ b/lib/media_fill_gen8.c @@ -4,10 +4,10 @@ #include "media_fill.h" #include "gen8_media.h" #include "intel_reg.h" +#include "drmtest.h" #include -#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1)) static const uint32_t media_kernel[][4] = { { 0x00400001, 0x20202288, 0x00000020, 0x00000000 }, diff --git a/lib/rendercopy_gen6.c b/lib/rendercopy_gen6.c index d806cef..7b3104c 100644 --- a/lib/rendercopy_gen6.c +++ b/lib/rendercopy_gen6.c @@ -20,7 +20,6 @@ #include "gen6_render.h" #include "intel_reg.h" -#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1)) #define VERTEX_SIZE (3*4) static const uint32_t ps_kernel_nomask_affine[][4] = { diff --git a/lib/rendercopy_gen7.c b/lib/rendercopy_gen7.c index cdbc70c..5131d8f 100644 --- a/lib/rendercopy_gen7.c +++ b/lib/rendercopy_gen7.c @@ -21,7 +21,6 @@ #include "gen7_render.h" #include "intel_reg.h" -#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1)) static const uint32_t ps_kernel[][4] = { { 0x0080005a, 0x2e2077bd, 0x000000c0, 0x008d0040 }, diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c index e846376..6f5a698 100644 --- a/lib/rendercopy_gen8.c +++ b/lib/rendercopy_gen8.c @@ -25,7 +25,6 @@ #include -#define ALIGN(x, y) (((x) + (y)-1) & ~((y)-1)) #define VERTEX_SIZE (3*4) #if DEBUG_RENDERCPY