From patchwork Sun Mar 23 14:18:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3879001 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 748119F391 for ; Sun, 23 Mar 2014 14:19:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8951E2015A for ; Sun, 23 Mar 2014 14:19:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 86FF9201B4 for ; Sun, 23 Mar 2014 14:19:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 040C36E688; Sun, 23 Mar 2014 07:19:21 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f45.google.com (mail-ee0-f45.google.com [74.125.83.45]) by gabe.freedesktop.org (Postfix) with ESMTP id 7F0FB6E674 for ; Sun, 23 Mar 2014 07:19:19 -0700 (PDT) Received: by mail-ee0-f45.google.com with SMTP id d17so3530033eek.32 for ; Sun, 23 Mar 2014 07:19:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=y51C6emt/snKIRlxGZrRB8qLEG315Rb5BTmY4EWArE0=; b=h+n3jvGaQGz9hUUrh9PP4plLPJipQY5bpRNlZ/HERBaSuoNWQzp1rNmPLHr71h3oSN e+EeNPRInDuLwTdmD8k3oEQ9ENTLmh58ctPaks9T7ajmZ/mh06k5nEJkylqsOxrMlOaO 5dlqJHlQPSH2AU0boXFfBb5iR1qloVMn9Pugs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=y51C6emt/snKIRlxGZrRB8qLEG315Rb5BTmY4EWArE0=; b=cbJueHbzDwCi5O8fRto8gq9xtLzXfJCskTUsfs4f/aUbIJ14vV+gIAK0LG8Y5FLdki yVkXVdilZLKwiluVR2DbYk9JOMNuej8YLYbBUL/8gFI5lppJk7xK+9PUsLhAgeFSfAal 71tefSuYcgkSE3nPIrnZgcsN0BW0VDlM9c3JOG+V8zyxKmulEmicbu8+SitIzYs/vGRn UfXLgiQf/JPvYd45UMjkqgpG/g9rrW07f0EpMGllOYjTnvdsOjMIQFw+YFA4dZSVtoXL 9ubDgVfyGDb8BQqUiELeZcaLdSU1qJLmWdJ0WYZwoFlzOD1FQThmzhGwCX/Gd28kWSOI 2jJQ== X-Gm-Message-State: ALoCoQm86FrMmB7dlS32rLNgA7+OZCrmukfD4Fk7PBS0RrKc7k90ymxPym9JQk4xMe8WWZ3WXgou X-Received: by 10.14.48.2 with SMTP id u2mr163638eeb.67.1395584358764; Sun, 23 Mar 2014 07:19:18 -0700 (PDT) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id cb5sm26392589eeb.18.2014.03.23.07.19.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Mar 2014 07:19:17 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Sun, 23 Mar 2014 15:18:40 +0100 Message-Id: <1395584342-11812-7-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1395584342-11812-1-git-send-email-daniel.vetter@ffwll.ch> References: <1395584342-11812-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 06/28] lib: make media_fill.h an internal 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=-4.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Same deal as with rendercopy.h. Signed-off-by: Daniel Vetter --- .../intel-gpu-tools/intel-gpu-tools-docs.xml | 1 - lib/Makefile.sources | 1 - lib/intel_batchbuffer.c | 13 +++++++++++++ lib/intel_batchbuffer.h | 8 ++++++++ lib/media_fill.c | 14 -------------- lib/media_fill.h | 8 -------- tests/gem_media_fill.c | 20 ++++++++++++++++++-- 7 files changed, 39 insertions(+), 26 deletions(-) delete mode 100644 lib/media_fill.c diff --git a/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml b/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml index 468844ec6bd1..0f117f71c9f9 100644 --- a/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml +++ b/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml @@ -24,7 +24,6 @@ - diff --git a/lib/Makefile.sources b/lib/Makefile.sources index 2b700c6c2726..e6ada3c900b4 100644 --- a/lib/Makefile.sources +++ b/lib/Makefile.sources @@ -22,7 +22,6 @@ libintel_tools_la_SOURCES = \ intel_reg.h \ ioctl_wrappers.c \ ioctl_wrappers.h \ - media_fill.c \ media_fill.h \ media_fill_gen7.c \ media_fill_gen8.c \ diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c index df036013792d..29740bd93bd3 100644 --- a/lib/intel_batchbuffer.c +++ b/lib/intel_batchbuffer.c @@ -38,6 +38,7 @@ #include "intel_chipset.h" #include "intel_reg.h" #include "rendercopy.h" +#include "media_fill.h" #include /** @@ -403,3 +404,15 @@ render_copyfunc_t get_render_copyfunc(int devid) return copy; } + +media_fillfunc_t get_media_fillfunc(int devid) +{ + media_fillfunc_t fill = NULL; + + if (IS_GEN8(devid)) + fill = gen8_media_fillfunc; + else if (IS_GEN7(devid)) + fill = gen7_media_fillfunc; + + return fill; +} diff --git a/lib/intel_batchbuffer.h b/lib/intel_batchbuffer.h index 5e02269c24ca..4b183122f6c0 100644 --- a/lib/intel_batchbuffer.h +++ b/lib/intel_batchbuffer.h @@ -224,4 +224,12 @@ typedef void (*render_copyfunc_t)(struct intel_batchbuffer *batch, render_copyfunc_t get_render_copyfunc(int devid); +typedef void (*media_fillfunc_t)(struct intel_batchbuffer *batch, + struct scratch_buf *dst, + unsigned x, unsigned y, + unsigned width, unsigned height, + uint8_t color); + +media_fillfunc_t get_media_fillfunc(int devid); + #endif diff --git a/lib/media_fill.c b/lib/media_fill.c deleted file mode 100644 index 084237f7a982..000000000000 --- a/lib/media_fill.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "i830_reg.h" -#include "media_fill.h" - -media_fillfunc_t get_media_fillfunc(int devid) -{ - media_fillfunc_t fill = NULL; - - if (IS_GEN8(devid)) - fill = gen8_media_fillfunc; - else if (IS_GEN7(devid)) - fill = gen7_media_fillfunc; - - return fill; -} diff --git a/lib/media_fill.h b/lib/media_fill.h index 9115776a93d4..4b2fd3a4fb30 100644 --- a/lib/media_fill.h +++ b/lib/media_fill.h @@ -19,14 +19,6 @@ #include "intel_batchbuffer.h" #include "intel_gpu_tools.h" -typedef void (*media_fillfunc_t)(struct intel_batchbuffer *batch, - struct scratch_buf *dst, - unsigned x, unsigned y, - unsigned width, unsigned height, - uint8_t color); - -media_fillfunc_t get_media_fillfunc(int devid); - void gen8_media_fillfunc(struct intel_batchbuffer *batch, struct scratch_buf *dst, diff --git a/tests/gem_media_fill.c b/tests/gem_media_fill.c index 1c3fe609f5e2..df891290c11c 100644 --- a/tests/gem_media_fill.c +++ b/tests/gem_media_fill.c @@ -32,8 +32,24 @@ #include #include - -#include "media_fill.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "drm.h" +#include "i915_drm.h" +#include "drmtest.h" +#include "intel_bufmgr.h" +#include "intel_batchbuffer.h" +#include "intel_gpu_tools.h" #define WIDTH 64 #define STRIDE (WIDTH)