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 Content-Length: 1682 Lines: 49 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)) { > > > . >