From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 14/73] drm/msm: fix handling of cmdstream offset Date: Wed, 12 Dec 2018 23:27:39 -0500 Message-ID: <20181213042838.75160-14-sashal@kernel.org> References: <20181213042838.75160-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181213042838.75160-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, Sean Paul , freedreno@lists.freedesktop.org List-Id: linux-arm-msm@vger.kernel.org RnJvbTogUm9iIENsYXJrIDxyb2JkY2xhcmtAZ21haWwuY29tPgoKWyBVcHN0cmVhbSBjb21taXQg NDdlN2Y1MDZlZTY1OTBjZWIyZWZhMWYwOGFjYTdmOWYyZWU1YzFkMyBdCgpVc2Vyc3BhY2UgaGFz bid0IHVzZWQgc3VibWl0IGNtZHMgd2l0aCBzdWJtaXRfb2Zmc2V0ICE9IDAgZm9yIGEgd2hpbGUs CmJ1dCB0aGlzIHN0YXJ0cyBjcm9wcGluZyB1cCBhZ2FpbiB3aXRoIGNtZHN0cmVhbSBzdWItYnVm ZmVyLWFsbG9jYXRpb24KaW4gbGliZHJtX2ZyZWVkcmVuby4KCkRvZXNuJ3QgZG8gbXVjaCBnb29k IHRvIGluY3JlbWVudCB0aGUgYnVmIHB0ciBiZWZvcmUgYXNzaWduaW5nIGl0LgoKRml4ZXM6IDc4 YjhlNWI4NDdiNCBkcm0vbXNtOiBkdW1wIGEgcmQgR1BVQUREUiBoZWFkZXIgZm9yIGFsbCBidWZm ZXJzIGluIHRoZSBjb21tYW5kClJldmlld2VkLWJ5OiBLcmlzdGlhbiBILiBLcmlzdGVuc2VuIDxo b2Vnc2JlcmdAZ29vZ2xlLmNvbT4KU2lnbmVkLW9mZi1ieTogUm9iIENsYXJrIDxyb2JkY2xhcmtA Z21haWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBTZWFuIFBhdWwgPHNlYW5wYXVsQGNocm9taXVtLm9y Zz4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9tc20vbXNtX3JkLmMgfCA1ICsrKystCiAxIGZpbGUgY2hhbmdlZCwgNCBp bnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L21zbS9tc21fcmQuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX3JkLmMKaW5kZXggM2FhOGE4 NTc2YWJlLi5mN2EwZWRlYTQ3MDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNt X3JkLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fcmQuYwpAQCAtMzE2LDEwICszMTYs MTEgQEAgc3RhdGljIHZvaWQgc25hcHNob3RfYnVmKHN0cnVjdCBtc21fcmRfc3RhdGUgKnJkLAog CQl1aW50NjRfdCBpb3ZhLCB1aW50MzJfdCBzaXplKQogewogCXN0cnVjdCBtc21fZ2VtX29iamVj dCAqb2JqID0gc3VibWl0LT5ib3NbaWR4XS5vYmo7CisJdW5zaWduZWQgb2Zmc2V0ID0gMDsKIAlj b25zdCBjaGFyICpidWY7CiAKIAlpZiAoaW92YSkgewotCQlidWYgKz0gaW92YSAtIHN1Ym1pdC0+ Ym9zW2lkeF0uaW92YTsKKwkJb2Zmc2V0ID0gaW92YSAtIHN1Ym1pdC0+Ym9zW2lkeF0uaW92YTsK IAl9IGVsc2UgewogCQlpb3ZhID0gc3VibWl0LT5ib3NbaWR4XS5pb3ZhOwogCQlzaXplID0gb2Jq LT5iYXNlLnNpemU7CkBAIC0zNDAsNiArMzQxLDggQEAgc3RhdGljIHZvaWQgc25hcHNob3RfYnVm KHN0cnVjdCBtc21fcmRfc3RhdGUgKnJkLAogCWlmIChJU19FUlIoYnVmKSkKIAkJcmV0dXJuOwog CisJYnVmICs9IG9mZnNldDsKKwogCXJkX3dyaXRlX3NlY3Rpb24ocmQsIFJEX0JVRkZFUl9DT05U RU5UUywgYnVmLCBzaXplKTsKIAogCW1zbV9nZW1fcHV0X3ZhZGRyKCZvYmotPmJhc2UpOwotLSAK Mi4xOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpk cmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CAF9C65BAE for ; Thu, 13 Dec 2018 04:52:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 228B320870 for ; Thu, 13 Dec 2018 04:52:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544676727; bh=ND30UdmIcJ/iv+jpp5dhyNom6sdF+ClFOmy5Mb5QoZ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HGvhrdWYa9mJwawqISiqB5Z4QS/5YTcPel5aKTOr+0nwngfM0Mc9QT9IG0hf23tlo L9MEostGMQqtHyJe0hmf8RsMQ50OiZRIJprCRv7pa19/8tYmNoqTLHpy3tNNWjgjPc IBgwc54YmrDYeRqZGaQob7q/+b9qpiX1E2FF/Wt0= DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 228B320870 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728360AbeLMEwF (ORCPT ); Wed, 12 Dec 2018 23:52:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:41934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727245AbeLME27 (ORCPT ); Wed, 12 Dec 2018 23:28:59 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 651D320849; Thu, 13 Dec 2018 04:28:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675339; bh=ND30UdmIcJ/iv+jpp5dhyNom6sdF+ClFOmy5Mb5QoZ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FbAwGP2OxO5aKeqWMxvEu+SZwffsEarOox/tMSerylOKTyBUj6H7F10OtaDBlXlJ0 jDhIOL3NRqpDnjXo4tLvDSU//E29lWAOD1kknr75rylTGZnDUiW7QjW/4g4qtRpWSt BoEyLI95UA31yuLO9sU0kD6pmV0ML4ChRhLosIis= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Rob Clark , Sean Paul , Sasha Levin , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 14/73] drm/msm: fix handling of cmdstream offset Date: Wed, 12 Dec 2018 23:27:39 -0500 Message-Id: <20181213042838.75160-14-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213042838.75160-1-sashal@kernel.org> References: <20181213042838.75160-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Clark [ Upstream commit 47e7f506ee6590ceb2efa1f08aca7f9f2ee5c1d3 ] 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 Reviewed-by: Kristian H. Kristensen Signed-off-by: Rob Clark Signed-off-by: Sean Paul Signed-off-by: Sasha Levin --- 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 3aa8a8576abe..f7a0edea4705 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); -- 2.19.1