From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 117/167] drm/amdgpu/{uvd, vcn}: fetch ring's read_ptr after alloc Date: Tue, 3 Sep 2019 12:24:29 -0400 Message-ID: <20190903162519.7136-117-sashal@kernel.org> References: <20190903162519.7136-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190903162519.7136-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sasha Levin , amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Shirish S , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , Louis Li RnJvbTogU2hpcmlzaCBTIDxzaGlyaXNoLnNAYW1kLmNvbT4KClsgVXBzdHJlYW0gY29tbWl0IDUx N2I5MWY0Y2RlMzA0M2Q3N2IyMTc4NTQ4NDczZTg1NDVlZjA3Y2IgXQoKW1doYXRdCnJlYWRwdHIg cmVhZCBhbHdheXMgcmV0dXJucyB6ZXJvLCBzaW5jZSBtb3N0IGxpa2VseQp0aGVzZSBibG9ja3Mg YXJlIGVpdGhlciBwb3dlciBvciBjbG9jayBnYXRlZC4KCltIb3ddCmZldGNoIHJwdHIgYWZ0ZXIg YW1kZ3B1X3JpbmdfYWxsb2MoKSB3aGljaCBpbmZvcm1zCnRoZSBwb3dlciBtYW5hZ2VtZW50IGNv ZGUgdGhhdCB0aGUgYmxvY2sgaXMgYWJvdXQgdG8gYmUKdXNlZCBhbmQgaGVuY2UgdGhlIGdhdGlu ZyBpcyB0dXJuZWQgb2ZmLgoKU2lnbmVkLW9mZi1ieTogTG91aXMgTGkgPENoaW5nLXNoaWguTGlA YW1kLmNvbT4KU2lnbmVkLW9mZi1ieTogU2hpcmlzaCBTIDxzaGlyaXNoLnNAYW1kLmNvbT4KUmV2 aWV3ZWQtYnk6IENocmlzdGlhbiBLw7ZuaWcgPGNocmlzdGlhbi5rb2VuaWdAYW1kLmNvbT4KU2ln bmVkLW9mZi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgpDYzog c3RhYmxlQHZnZXIua2VybmVsLm9yZwpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFs QGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Zjbi5j IHwgNSArKysrLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdXZkX3Y2XzAuYyAgIHwgNSAr KysrLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdXZkX3Y3XzAuYyAgIHwgNSArKysrLQog MyBmaWxlcyBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92Y24uYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92Y24uYwppbmRleCA0MDBmYzc0YmJhZTI3Li4yMDVl NjgzZmI5MjA2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVf dmNuLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Zjbi5jCkBAIC00 MzEsNyArNDMxLDcgQEAgaW50IGFtZGdwdV92Y25fZGVjX3JpbmdfdGVzdF9pYihzdHJ1Y3QgYW1k Z3B1X3JpbmcgKnJpbmcsIGxvbmcgdGltZW91dCkKIGludCBhbWRncHVfdmNuX2VuY19yaW5nX3Rl c3RfcmluZyhzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiB7CiAJc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYgPSByaW5nLT5hZGV2OwotCXVpbnQzMl90IHJwdHIgPSBhbWRncHVfcmluZ19nZXRf cnB0cihyaW5nKTsKKwl1aW50MzJfdCBycHRyOwogCXVuc2lnbmVkIGk7CiAJaW50IHI7CiAKQEAg LTQ0MSw2ICs0NDEsOSBAQCBpbnQgYW1kZ3B1X3Zjbl9lbmNfcmluZ190ZXN0X3Jpbmcoc3RydWN0 IGFtZGdwdV9yaW5nICpyaW5nKQogCQkJICByaW5nLT5pZHgsIHIpOwogCQlyZXR1cm4gcjsKIAl9 CisKKwlycHRyID0gYW1kZ3B1X3JpbmdfZ2V0X3JwdHIocmluZyk7CisKIAlhbWRncHVfcmluZ193 cml0ZShyaW5nLCBWQ05fRU5DX0NNRF9FTkQpOwogCWFtZGdwdV9yaW5nX2NvbW1pdChyaW5nKTsK IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdXZkX3Y2XzAuYyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92Nl8wLmMKaW5kZXggZDQwNzA4MzlhYzgwOS4u ODA2MTNhNzRkZjQyMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdXZk X3Y2XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjZfMC5jCkBAIC0x NzAsNyArMTcwLDcgQEAgc3RhdGljIHZvaWQgdXZkX3Y2XzBfZW5jX3Jpbmdfc2V0X3dwdHIoc3Ry dWN0IGFtZGdwdV9yaW5nICpyaW5nKQogc3RhdGljIGludCB1dmRfdjZfMF9lbmNfcmluZ190ZXN0 X3Jpbmcoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2ID0gcmluZy0+YWRldjsKLQl1aW50MzJfdCBycHRyID0gYW1kZ3B1X3JpbmdfZ2V0X3Jw dHIocmluZyk7CisJdWludDMyX3QgcnB0cjsKIAl1bnNpZ25lZCBpOwogCWludCByOwogCkBAIC0x ODAsNiArMTgwLDkgQEAgc3RhdGljIGludCB1dmRfdjZfMF9lbmNfcmluZ190ZXN0X3Jpbmcoc3Ry dWN0IGFtZGdwdV9yaW5nICpyaW5nKQogCQkJICByaW5nLT5pZHgsIHIpOwogCQlyZXR1cm4gcjsK IAl9CisKKwlycHRyID0gYW1kZ3B1X3JpbmdfZ2V0X3JwdHIocmluZyk7CisKIAlhbWRncHVfcmlu Z193cml0ZShyaW5nLCBIRVZDX0VOQ19DTURfRU5EKTsKIAlhbWRncHVfcmluZ19jb21taXQocmlu Zyk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92N18wLmMg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjdfMC5jCmluZGV4IDA1NzE1MWIxN2I0 NTYuLmNlMTZiODMyOWFmMDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L3V2ZF92N18wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdXZkX3Y3XzAuYwpA QCAtMTc1LDcgKzE3NSw3IEBAIHN0YXRpYyB2b2lkIHV2ZF92N18wX2VuY19yaW5nX3NldF93cHRy KHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIHN0YXRpYyBpbnQgdXZkX3Y3XzBfZW5jX3Jpbmdf dGVzdF9yaW5nKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldiA9IHJpbmctPmFkZXY7Ci0JdWludDMyX3QgcnB0ciA9IGFtZGdwdV9yaW5nX2dl dF9ycHRyKHJpbmcpOworCXVpbnQzMl90IHJwdHI7CiAJdW5zaWduZWQgaTsKIAlpbnQgcjsKIApA QCAtMTg4LDYgKzE4OCw5IEBAIHN0YXRpYyBpbnQgdXZkX3Y3XzBfZW5jX3JpbmdfdGVzdF9yaW5n KHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIAkJCSAgcmluZy0+bWUsIHJpbmctPmlkeCwgcik7 CiAJCXJldHVybiByOwogCX0KKworCXJwdHIgPSBhbWRncHVfcmluZ19nZXRfcnB0cihyaW5nKTsK KwogCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIEhFVkNfRU5DX0NNRF9FTkQpOwogCWFtZGdwdV9y aW5nX2NvbW1pdChyaW5nKTsKIAotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2FtZC1nZng= 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 C6777C3A5A2 for ; Tue, 3 Sep 2019 16:28:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F48D23789 for ; Tue, 3 Sep 2019 16:28:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567528126; bh=LpJv25mrQFMkEnIS6c8cNfT3TaJ5OZwMwAlT3CcHnB8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zpbslYy6ZUo/FlauEnA87n1k5n4nG5wl2tfOn7vKWDzaldORZ0Mt5/TId/pGSphuJ mA+P5PA6ZgEE0RH9QGWgAPBCBcgBbYbj1gFLo8Dxf3ZxaPhzdfOC9b/weVtxZ3kpOy 5v+NjAhsahBThXUDQmksbL/Qb+tWyRwpDEROS/6U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731155AbfICQ2p (ORCPT ); Tue, 3 Sep 2019 12:28:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:50826 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730446AbfICQ2l (ORCPT ); Tue, 3 Sep 2019 12:28:41 -0400 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 62603215EA; Tue, 3 Sep 2019 16:28:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567528120; bh=LpJv25mrQFMkEnIS6c8cNfT3TaJ5OZwMwAlT3CcHnB8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2c97q563+pQ9/HaZyqgipSYIajeVE8ogi986H2x1DAMQBbykhJikvvtgk3GozM+9u NQ1lIUlQVDMQm+lOc9TWFLKmbeTzaSy/m7ir0rTs9fwT6aSP4ZojuwtGyyjpzGRtt7 ZFR+1HD+k3KKnQy24vLxCUCiKduBnRk9/MHFnq6Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shirish S , Louis Li , =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 117/167] drm/amdgpu/{uvd,vcn}: fetch ring's read_ptr after alloc Date: Tue, 3 Sep 2019 12:24:29 -0400 Message-Id: <20190903162519.7136-117-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190903162519.7136-1-sashal@kernel.org> References: <20190903162519.7136-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review 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: Shirish S [ Upstream commit 517b91f4cde3043d77b2178548473e8545ef07cb ] [What] readptr read always returns zero, since most likely these blocks are either power or clock gated. [How] fetch rptr after amdgpu_ring_alloc() which informs the power management code that the block is about to be used and hence the gating is turned off. Signed-off-by: Louis Li Signed-off-by: Shirish S Reviewed-by: Christian König Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 5 ++++- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 5 ++++- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index 400fc74bbae27..205e683fb9206 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c @@ -431,7 +431,7 @@ int amdgpu_vcn_dec_ring_test_ib(struct amdgpu_ring *ring, long timeout) int amdgpu_vcn_enc_ring_test_ring(struct amdgpu_ring *ring) { struct amdgpu_device *adev = ring->adev; - uint32_t rptr = amdgpu_ring_get_rptr(ring); + uint32_t rptr; unsigned i; int r; @@ -441,6 +441,9 @@ int amdgpu_vcn_enc_ring_test_ring(struct amdgpu_ring *ring) ring->idx, r); return r; } + + rptr = amdgpu_ring_get_rptr(ring); + amdgpu_ring_write(ring, VCN_ENC_CMD_END); amdgpu_ring_commit(ring); diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c index d4070839ac809..80613a74df420 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c @@ -170,7 +170,7 @@ static void uvd_v6_0_enc_ring_set_wptr(struct amdgpu_ring *ring) static int uvd_v6_0_enc_ring_test_ring(struct amdgpu_ring *ring) { struct amdgpu_device *adev = ring->adev; - uint32_t rptr = amdgpu_ring_get_rptr(ring); + uint32_t rptr; unsigned i; int r; @@ -180,6 +180,9 @@ static int uvd_v6_0_enc_ring_test_ring(struct amdgpu_ring *ring) ring->idx, r); return r; } + + rptr = amdgpu_ring_get_rptr(ring); + amdgpu_ring_write(ring, HEVC_ENC_CMD_END); amdgpu_ring_commit(ring); diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c index 057151b17b456..ce16b8329af04 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c @@ -175,7 +175,7 @@ static void uvd_v7_0_enc_ring_set_wptr(struct amdgpu_ring *ring) static int uvd_v7_0_enc_ring_test_ring(struct amdgpu_ring *ring) { struct amdgpu_device *adev = ring->adev; - uint32_t rptr = amdgpu_ring_get_rptr(ring); + uint32_t rptr; unsigned i; int r; @@ -188,6 +188,9 @@ static int uvd_v7_0_enc_ring_test_ring(struct amdgpu_ring *ring) ring->me, ring->idx, r); return r; } + + rptr = amdgpu_ring_get_rptr(ring); + amdgpu_ring_write(ring, HEVC_ENC_CMD_END); amdgpu_ring_commit(ring); -- 2.20.1