From patchwork Fri Dec 9 11:21:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Gmeiner X-Patchwork-Id: 9467953 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D68A260586 for ; Fri, 9 Dec 2016 11:22:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9728285DC for ; Fri, 9 Dec 2016 11:22:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE29D285F7; Fri, 9 Dec 2016 11:22:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6FA1C285DC for ; Fri, 9 Dec 2016 11:22:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3EF4D6E982; Fri, 9 Dec 2016 11:21:58 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3B2896E982 for ; Fri, 9 Dec 2016 11:21:55 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id m203so3361012wma.3 for ; Fri, 09 Dec 2016 03:21:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0rdRcrrYOn7cHMscNuGrask3jj6amjF2J7MApJk2eb0=; b=N61utPTQk1kcp0yFuq6KaaoGcYnA1ANRvjgAizBPLv7lds2QMySP77J7YeNlQVFx4h V9vjfTwopzA4y7pofhlal7xFEBQeZrMq5qnOCPvB4JyCcwSuxiBIEpwFOTBRqCEXLITA JRmAaWuZF48n011OoLal2f1LDvcu7WpwhVsuCrWhtX41rRmBg37W/JOb14ZJ0fd9ScmX A7diMRHkTXKyJ0puvxs4O5Zx0X1Swnvo0aqLBB/ChXRnGCR1MKsz01MxJNBN31RyW9lv 3QvBuZr31vuFJrRIjpFn39BNL5ljG1lRXusT5LeFxqE9mudlGvW3dXdbNgYmRKwufNoj pY3Q== 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=0rdRcrrYOn7cHMscNuGrask3jj6amjF2J7MApJk2eb0=; b=Y+YdLVHjKj/wIQW/ezY3bx+p1l2ulGwiMMnFl6g7JE66phwNFk6E64xUDrE84wJsQ9 uHKItzfBYwg5uQ/JSgfDHU5FGZvN90JmrklfYAS2afdjnmx8+Y9TQ5mT4qYV2cg4D8DA JB3nh1O5+BBRCxT9GMXG9ArdEYL61Dp2nla6uPPgBPuGAAUAHfS4DhQGmIXN71WE1S9I s/b5KOs2dcjS6rFmGMmSR/SZzw9wEO37dmkM6Ewu2DHJx2VzxLxrswYF/jcMCGqrWivT ng9tER/fc8YGvtkZ2RpzX0KFTzubNzeEA+wOwyeZD/P1m7bMt1viBjTVqkZwvxsenzy0 7WSA== X-Gm-Message-State: AKaTC036qXmACp1kXpGDkMGy64gHi0ha31eNr0oJAmUGR5VudFiumlO55t5t9mn7Umu+xw== X-Received: by 10.28.148.81 with SMTP id w78mr6015458wmd.42.1481282513523; Fri, 09 Dec 2016 03:21:53 -0800 (PST) Received: from linux.fritz.box.fritz.box (178-190-139-123.adsl.highway.telekom.at. [178.190.139.123]) by smtp.gmail.com with ESMTPSA id v2sm41824518wja.41.2016.12.09.03.21.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Dec 2016 03:21:52 -0800 (PST) From: Christian Gmeiner To: dri-devel@lists.freedesktop.org Subject: [PATCH 07/10] drm/etnaviv: process readbacks in interrupt handler Date: Fri, 9 Dec 2016 12:21:28 +0100 Message-Id: <20161209112131.3924-8-christian.gmeiner@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161209112131.3924-1-christian.gmeiner@gmail.com> References: <20161209112131.3924-1-christian.gmeiner@gmail.com> Cc: linux+etnaviv@armlinux.org.uk, cphealy@gmail.com 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-Virus-Scanned: ClamAV using ClamSMTP We can not defere the readback of the registers as the values likely getting changed by an other command buffer. Signed-off-by: Christian Gmeiner --- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index 1fb5e37..2aa1a26 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -1369,6 +1369,20 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, return ret; } +static void etnaviv_process_readbacks(struct etnaviv_gpu *gpu, + struct etnaviv_event *event) +{ + unsigned i; + + for (i = 0; i < event->nr_readbacks; i++) { + const struct etnaviv_readback *readback = event->readbacks + i; + const u32 val = gpu_read(gpu, readback->reg); + u32 *bo = readback->bo_vma; + + *(bo + readback->offset) = val; + } +} + /* * Init/Cleanup: */ @@ -1415,6 +1429,9 @@ static irqreturn_t irq_handler(int irq, void *data) dev_dbg(gpu->dev, "event %u\n", event); + if (gpu->event[event].nr_readbacks) + etnaviv_process_readbacks(gpu, &gpu->event[event]); + fence = gpu->event[event].fence; gpu->event[event].fence = NULL; fence_signal(fence);