From patchwork Mon Oct 15 17:33:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 10642225 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3D581925 for ; Mon, 15 Oct 2018 17:33:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 279E128711 for ; Mon, 15 Oct 2018 17:33:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 18414287C1; Mon, 15 Oct 2018 17:33:34 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 CDDB4286DF for ; Mon, 15 Oct 2018 17:33:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9DB886E013; Mon, 15 Oct 2018 17:33:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by gabe.freedesktop.org (Postfix) with ESMTPS id EB7ED6E013; Mon, 15 Oct 2018 17:33:29 +0000 (UTC) Received: by mail-qk1-x741.google.com with SMTP id q12-v6so12321690qkl.13; Mon, 15 Oct 2018 10:33:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mj8w/33V0kgS+FAQCrlOwKtlUNBXPuVl11J2W1HtaVU=; b=dbVDFMU+yjAbcEZRZY8bkA1AOfHJKv4HPAe69fXVguM6EJnzBr7qUnnBRHC1Q5ky5d 20fSUCvtONM+a29+oyNCP3MoQqPKEnT/am9xcXWDXwrE4TTByzjP+NBkhh1OfqNsfysH yVGWlYKKYsqqbD8S8/5kEaFSSbeuRoXLla6Ap8V1f161s8S8udisZGnH3q9Hl1H/pOpu SR4RlTW86oFfeb0YL6oCeyBGlgpN4p6aoFd7X4esaOIzZ9JI6DQgnUz3ZTEMB2ROk7Oe 4KhS5GNvb9dI55lbopXVZsVNcpbb5mVDfl4iQnZiqvptvd1H6fc8aYPpu7hVigqdpjf9 elcw== X-Gm-Message-State: ABuFfogu2ldXYC2fe7i+e9YUcYztT2xqiCplikFdcnnc0E4b6P0LdloN nDJLkOo1TCFV6l8EU30U6QjEm8fG X-Google-Smtp-Source: ACcGV63aLNvVYNEzPMB4QsGNtefgeO6xewvMeP+nrWIhQ5WrJWv9CiU7H7VMOjM0QaQbglCtwOmyrg== X-Received: by 2002:a37:f8c:: with SMTP id 12-v6mr17113910qkp.224.1539624808861; Mon, 15 Oct 2018 10:33:28 -0700 (PDT) Received: from localhost ([144.121.20.162]) by smtp.gmail.com with ESMTPSA id g4-v6sm6615085qkb.64.2018.10.15.10.33.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Oct 2018 10:33:28 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/msm: fix handling of cmdstream offset Date: Mon, 15 Oct 2018 13:33:01 -0400 Message-Id: <20181015173321.22635-1-robdclark@gmail.com> X-Mailer: git-send-email 2.17.2 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Userspace hasn't used submit cmds with submit_offset != 0 for a while, but this starts cropping up again with cmdstream sub-buffer-allocation in libdrm_freedreno. Doesn't do much good to increment the buf ptr before assigning it. Fixes: 78b8e5b847b4 drm/msm: dump a rd GPUADDR header for all buffers in the command Signed-off-by: Rob Clark Reviewed-by: Kristian H. Kristensen --- drivers/gpu/drm/msm/msm_rd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c index cca933458439..0c2c8d2c631f 100644 --- a/drivers/gpu/drm/msm/msm_rd.c +++ b/drivers/gpu/drm/msm/msm_rd.c @@ -316,10 +316,11 @@ static void snapshot_buf(struct msm_rd_state *rd, uint64_t iova, uint32_t size) { struct msm_gem_object *obj = submit->bos[idx].obj; + unsigned offset = 0; const char *buf; if (iova) { - buf += iova - submit->bos[idx].iova; + offset = iova - submit->bos[idx].iova; } else { iova = submit->bos[idx].iova; size = obj->base.size; @@ -340,6 +341,8 @@ static void snapshot_buf(struct msm_rd_state *rd, if (IS_ERR(buf)) return; + buf += offset; + rd_write_section(rd, RD_BUFFER_CONTENTS, buf, size); msm_gem_put_vaddr(&obj->base);