From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tan Xiaojun Subject: Re: [PATCH 01/12] drm/ttm: Use ttm_bo_default_io_mem_pfn if io_mem_pfn is NULL Date: Mon, 25 Dec 2017 09:24:30 +0800 Message-ID: <5A40534E.9070802@huawei.com> References: <1514096068-80414-1-git-send-email-tanxiaojun@huawei.com> <1514096068-80414-2-git-send-email-tanxiaojun@huawei.com> <7542197c-a821-a5d2-1abd-449c823c53e5@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from huawei.com (unknown [45.249.212.32]) by gabe.freedesktop.org (Postfix) with ESMTPS id EC0A16E00A for ; Mon, 25 Dec 2017 01:24:51 +0000 (UTC) In-Reply-To: <7542197c-a821-a5d2-1abd-449c823c53e5@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: christian.koenig@amd.com, seanpaul@chromium.org, airlied@linux.ie, michel.daenzer@amd.com, alexander.deucher@amd.com, nicolai.haehnle@amd.com, thomas.lendacky@amd.com, yamada.masahiro@socionext.com, msrb@suse.com, Felix.Kuehling@amd.com, dave.jiang@intel.com, gregkh@linuxfoundation.org, michael.thayer@oracle.com, hdegoede@redhat.com Cc: daniel.vetter@intel.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gMjAxNy8xMi8yNCAxNzoyNywgQ2hyaXN0aWFuIEvDtm5pZyB3cm90ZToKPiBBbSAyNC4xMi4y MDE3IHVtIDA3OjE0IHNjaHJpZWIgVGFuIFhpYW9qdW46Cj4+IEZyb206IE1pY2hhbCBTcmIgPG1z cmJAc3VzZS5jb20+Cj4+Cj4+IFRoZSBpb19tZW1fcGZuIGZpZWxkIHdhcyBhZGRlZCBpbiBjb21t aXQgZWE2NDJjMzIxNmNiMmE2MGQxYzBlNzYwYWU0N2VlODVjOWMxNjQ0Nwo+PiBhbmQgaXMgY2Fs bGVkIHVuY29uZGl0aW9uYWxseS4gSG93ZXZlciwgbm90IGFsbCBkcml2ZXJzIHdlcmUgdXBkYXRl ZCB0byBzZXQgaXQuCj4+Cj4+IFVzZSB0aGUgdHRtX2JvX2RlZmF1bHRfaW9fbWVtX3BmbiBmdW5j dGlvbiBpZiBhIGRyaXZlciBkaWQgbm90IHNldCBpdHMgb3duLgo+Pgo+PiBTaWduZWQtb2ZmLWJ5 OiBNaWNoYWwgU3JiIDxtc3JiQHN1c2UuY29tPgo+PiAtLS0KPj4gICBkcml2ZXJzL2dwdS9kcm0v dHRtL3R0bV9ib192bS5jIHwgNSArKysrLQo+PiAgIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlv bnMoKyksIDEgZGVsZXRpb24oLSkKPj4KPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS90 dG0vdHRtX2JvX3ZtLmMgYi9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9ib192bS5jCj4+IGluZGV4 IGM4ZWJiNzUuLmUyNWE5OWIgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRt X2JvX3ZtLmMKPj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fYm9fdm0uYwo+PiBAQCAt MjM0LDcgKzIzNCwxMCBAQCBzdGF0aWMgaW50IHR0bV9ib192bV9mYXVsdChzdHJ1Y3Qgdm1fZmF1 bHQgKnZtZikKPj4gICAgICAgICAgIGlmIChiby0+bWVtLmJ1cy5pc19pb21lbSkgewo+PiAgICAg ICAgICAgICAgIC8qIElvbWVtIHNob3VsZCBub3QgYmUgbWFya2VkIGVuY3J5cHRlZCAqLwo+PiAg ICAgICAgICAgICAgIGN2bWEudm1fcGFnZV9wcm90ID0gcGdwcm90X2RlY3J5cHRlZChjdm1hLnZt X3BhZ2VfcHJvdCk7Cj4+IC0gICAgICAgICAgICBwZm4gPSBiZGV2LT5kcml2ZXItPmlvX21lbV9w Zm4oYm8sIHBhZ2Vfb2Zmc2V0KTsKPj4gKyAgICAgICAgICAgIGlmIChiZGV2LT5kcml2ZXItPmlv X21lbV9wZm4pCj4+ICsgICAgICAgICAgICAgICAgcGZuID0gYmRldi0+ZHJpdmVyLT5pb19tZW1f cGZuKGJvLCBwYWdlX29mZnNldCk7Cj4+ICsgICAgICAgICAgICBlbHNlCj4+ICsgICAgICAgICAg ICAgICAgcGZuID0gdHRtX2JvX2RlZmF1bHRfaW9fbWVtX3BmbihibywgcGFnZV9vZmZzZXQpOwo+ IAo+IFBsZWFzZSBtb3ZlIHRoaXMgY2hlY2sgaW50byBhIG5ldyBmdW5jdGlvbiB0dG1fYm9faW9f bWVtX3BmbigpLgo+IAo+IFlvdSBjYW4gdGhlbiBtb3ZlIHRoZSBjYWxjdWxhdGlvbiBvZiB0dG1f Ym9fZGVmYXVsdF9pb19tZW1fcGZuKCkgaW50byB0aGlzIG5ldyBmdW5jdGlvbiBpbiBwYXRjaCAj MTIgYXMgd2VsbC4KPiAKPiBSZWdhcmRzLAo+IENocmlzdGlhbi4KPiAKCk9LLiBUaGFuayB5b3Ug Zm9yIHlvdXIgcmVwbHkuIEkgd2lsbCBtb2RpZnkgaXQgYW5kIHNlbmQgdjIuCgpUaGFua3MuClhp YW9qdW4uCgo+PiAgICAgICAgICAgfSBlbHNlIHsKPj4gICAgICAgICAgICAgICBwYWdlID0gdHRt LT5wYWdlc1twYWdlX29mZnNldF07Cj4+ICAgICAgICAgICAgICAgaWYgKHVubGlrZWx5KCFwYWdl ICYmIGkgPT0gMCkpIHsKPiAKPiAKPiAuCj4gCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751583AbdLYBYw (ORCPT ); Sun, 24 Dec 2017 20:24:52 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:55555 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1750984AbdLYBYu (ORCPT ); Sun, 24 Dec 2017 20:24:50 -0500 Subject: Re: [PATCH 01/12] drm/ttm: Use ttm_bo_default_io_mem_pfn if io_mem_pfn is NULL To: , , , , , , , , , , , , , References: <1514096068-80414-1-git-send-email-tanxiaojun@huawei.com> <1514096068-80414-2-git-send-email-tanxiaojun@huawei.com> <7542197c-a821-a5d2-1abd-449c823c53e5@gmail.com> CC: , , From: Tan Xiaojun Message-ID: <5A40534E.9070802@huawei.com> Date: Mon, 25 Dec 2017 09:24:30 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <7542197c-a821-a5d2-1abd-449c823c53e5@gmail.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.177.21.79] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2017/12/24 17:27, Christian König wrote: > Am 24.12.2017 um 07:14 schrieb Tan Xiaojun: >> From: Michal Srb >> >> The io_mem_pfn field was added in commit ea642c3216cb2a60d1c0e760ae47ee85c9c16447 >> and is called unconditionally. However, not all drivers were updated to set it. >> >> Use the ttm_bo_default_io_mem_pfn function if a driver did not set its own. >> >> Signed-off-by: Michal Srb >> --- >> drivers/gpu/drm/ttm/ttm_bo_vm.c | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c >> index c8ebb75..e25a99b 100644 >> --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c >> +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c >> @@ -234,7 +234,10 @@ static int ttm_bo_vm_fault(struct vm_fault *vmf) >> if (bo->mem.bus.is_iomem) { >> /* Iomem should not be marked encrypted */ >> cvma.vm_page_prot = pgprot_decrypted(cvma.vm_page_prot); >> - pfn = bdev->driver->io_mem_pfn(bo, page_offset); >> + if (bdev->driver->io_mem_pfn) >> + pfn = bdev->driver->io_mem_pfn(bo, page_offset); >> + else >> + pfn = ttm_bo_default_io_mem_pfn(bo, page_offset); > > Please move this check into a new function ttm_bo_io_mem_pfn(). > > You can then move the calculation of ttm_bo_default_io_mem_pfn() into this new function in patch #12 as well. > > Regards, > Christian. > OK. Thank you for your reply. I will modify it and send v2. Thanks. Xiaojun. >> } else { >> page = ttm->pages[page_offset]; >> if (unlikely(!page && i == 0)) { > > > . >