From patchwork Thu Apr 2 15:29:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 6149661 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 62FA79F1BE for ; Thu, 2 Apr 2015 15:32:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8FC96203AB for ; Thu, 2 Apr 2015 15:32:02 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A42A9203AD for ; Thu, 2 Apr 2015 15:32:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 848786EA83; Thu, 2 Apr 2015 08:31:05 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) by gabe.freedesktop.org (Postfix) with ESMTP id 509EC6EA42 for ; Thu, 2 Apr 2015 08:30:57 -0700 (PDT) Received: from dude.hi.4.pengutronix.de ([10.1.0.7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Ydh56-0005OD-Il; Thu, 02 Apr 2015 17:30:56 +0200 From: Lucas Stach To: dri-devel@lists.freedesktop.org Subject: [PATCH RFC 025/111] staging: etnaviv: package up events into etnaviv_event struct Date: Thu, 2 Apr 2015 17:29:27 +0200 Message-Id: <1427988653-754-26-git-send-email-l.stach@pengutronix.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> References: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.7 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: dri-devel@lists.freedesktop.org Cc: Russell King , kernel@pengutronix.de X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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: Russell King Combine the event data into an array of etnaviv_event structures, rather than individual arrays. Signed-off-by: Russell King --- drivers/staging/etnaviv/etnaviv_gpu.c | 18 +++++++++--------- drivers/staging/etnaviv/etnaviv_gpu.h | 8 ++++++-- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/drivers/staging/etnaviv/etnaviv_gpu.c b/drivers/staging/etnaviv/etnaviv_gpu.c index d06665aa319b..55a58cb27a3d 100644 --- a/drivers/staging/etnaviv/etnaviv_gpu.c +++ b/drivers/staging/etnaviv/etnaviv_gpu.c @@ -380,8 +380,8 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu) /* Setup event management */ spin_lock_init(&gpu->event_spinlock); init_completion(&gpu->event_free); - for (i = 0; i < ARRAY_SIZE(gpu->event_used); i++) { - gpu->event_used[i] = false; + for (i = 0; i < ARRAY_SIZE(gpu->event); i++) { + gpu->event[i].used = false; complete(&gpu->event_free); } @@ -681,9 +681,9 @@ static unsigned int event_alloc(struct etnaviv_gpu *gpu) spin_lock_irqsave(&gpu->event_spinlock, flags); /* find first free event */ - for (i = 0; i < ARRAY_SIZE(gpu->event_used); i++) { - if (gpu->event_used[i] == false) { - gpu->event_used[i] = true; + for (i = 0; i < ARRAY_SIZE(gpu->event); i++) { + if (gpu->event[i].used == false) { + gpu->event[i].used = true; event = i; break; } @@ -700,11 +700,11 @@ static void event_free(struct etnaviv_gpu *gpu, unsigned int event) spin_lock_irqsave(&gpu->event_spinlock, flags); - if (gpu->event_used[event] == false) { + if (gpu->event[event].used == false) { dev_warn(gpu->dev->dev, "event %u is already marked as free", event); spin_unlock_irqrestore(&gpu->event_spinlock, flags); } else { - gpu->event_used[event] = false; + gpu->event[event].used = false; spin_unlock_irqrestore(&gpu->event_spinlock, flags); complete(&gpu->event_free); @@ -781,7 +781,7 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, struct etnaviv_gem_submit *submi goto fail; } - gpu->event_to_fence[event] = submit->fence; + gpu->event[event].fence = submit->fence; etnaviv_buffer_queue(gpu, event, submit); @@ -833,7 +833,7 @@ static irqreturn_t irq_handler(int irq, void *data) else { uint8_t event = __fls(intr); dev_dbg(gpu->dev->dev, "event %u\n", event); - gpu->retired_fence = gpu->event_to_fence[event]; + gpu->retired_fence = gpu->event[event].fence; event_free(gpu, event); etnaviv_gpu_retire(gpu); } diff --git a/drivers/staging/etnaviv/etnaviv_gpu.h b/drivers/staging/etnaviv/etnaviv_gpu.h index 707096b5fe98..519b9344ed0c 100644 --- a/drivers/staging/etnaviv/etnaviv_gpu.h +++ b/drivers/staging/etnaviv/etnaviv_gpu.h @@ -78,6 +78,11 @@ struct etnaviv_chip_identity { uint32_t buffer_size; }; +struct etnaviv_event { + bool used; + uint32_t fence; +}; + struct etnaviv_gpu { const char *name; struct drm_device *dev; @@ -88,8 +93,7 @@ struct etnaviv_gpu { struct drm_gem_object *buffer; /* event management: */ - bool event_used[30]; - uint32_t event_to_fence[30]; + struct etnaviv_event event[30]; struct completion event_free; struct spinlock event_spinlock;