From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934865AbcCQJDA (ORCPT ); Thu, 17 Mar 2016 05:03:00 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:62712 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932796AbcCQJC4 (ORCPT ); Thu, 17 Mar 2016 05:02:56 -0400 From: Arnd Bergmann To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Dave Airlie , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christian =?ISO-8859-1?Q?K=F6nig?= , Alex Deucher , Dave Hansen Subject: Re: linux-next: manual merge of the tip tree with the drm tree Date: Thu, 17 Mar 2016 10:00:56 +0100 Message-ID: <2913254.nLUtoX01AU@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20160317130029.5569b2f4@canb.auug.org.au> References: <20160317130029.5569b2f4@canb.auug.org.au> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:FAtjkm+qIVvMNTXQMh+eTMi96tebpKJn81SZ6MsaQLYzXQWJTFH j4ZYsir4bXdxXSLesuuj20XE0QCq8suHMtRMacIw1kWTciPAWQ5ykGaTJm7722F4HM1qexe QmBuBY9JRHV5GH7kRNrxU6T5Gwt/z0XgEgdQOd+i1LKMFcZmAZJpfzwuii2T3I9rNe2i2Lb 9AD5ILySzRSGvZC7Rrm6A== X-UI-Out-Filterresults: notjunk:1;V01:K0:da/ViGWm5YU=:jUi/4I16UXPKZm6PTisJ4L TqDb0f2qPjFwsDVFru/bvISi0fHWR4JUWqB5dsgHNE8R7OE8QFyM1vq1VjBRNcjRaS5yoY3Rd A4cL2iDQtVAAlyMmJg/BsyNQAIefPoNnN713+79G0vs7gax19MRFh744PJNSSv/nYKcTWvz++ 98p4rvmx10Q+EIM8rNdGEb29gSXOOefkgItg4srVxmS7Yzqw++O3+KzObMoSbhOBJe3g32KU7 bdXaVj9/7gTdzaszp1uOhOkK8B5zRq5zvKiJX5esImz4PtTjQoyVlV3nbOdjVjwS3YCGQhx3f NL7Z2oiezLL7gAnt4yCuWxXDODNdCu+TjPyO2IDBK34MTfvBGWW71IY1y9wThXhOsQVAczWZp 3JWJ5SfgVlQi3/VW5/SbBIrT5V0UnulNHlRIZFCvgaz4EHSTadPlJiYn/d9H6jv1pmbY6L6Pz d30RcC+F+9lnZBU2M0q79bha7EKlIPTgrKXrXZVNjkuzjqvL3UzZk/aveHveF/qOjZX0zcu49 os4m6SNv/RGvhwR7RM9Q2Zt8r8mFtN1+Ky31QYqmrzTetUq1VDKmdifCaZDkBy8eJUJoSZmh0 QbPYtNZ0bayWV3arUJ0PwQP6gy48Pqqg3RsEBJj+toWSAtWk9wRcjCLy+hBn9TzOzIBWIYzYi MTvm8guXNY/fdCdgfRmupZBNfpSafAbpxodcr5wJoOByDjmYVhKjaP3v765YNVCMZODZEgO9H Exuwt7th5vPb+vAM Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday 17 March 2016 13:00:29 Stephen Rothwell wrote: > diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > index 0f42b1a24446,7b82e57aa09c..000000000000 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > @@@ -532,21 -516,9 +532,20 @@@ int amdgpu_ttm_tt_get_user_pages(struc > do { > unsigned num_pages = ttm->num_pages - pinned; > uint64_t userptr = gtt->userptr + pinned * PAGE_SIZE; > - struct page **pages = ttm->pages + pinned; > + struct page **p = pages + pinned; > + struct amdgpu_ttm_gup_task_list guptask; > + > + guptask.task = current; > + spin_lock(>t->guptasklock); > + list_add(&guptask.list, >t->guptasks); > + spin_unlock(>t->guptasklock); > > - r = get_user_pages(current, current->mm, userptr, num_pages, > - write, 0, p, NULL); > + r = get_user_pages(userptr, num_pages, write, 0, pages, NULL); > + > + spin_lock(>t->guptasklock); > + list_del(&guptask.list); > + spin_unlock(>t->guptasklock); > + > if (r < 0) > goto release_pages; Your merge looks incorrect to me, and I got a build warning for it: drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_ttm_tt_get_user_pages': drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:535:17: error: unused variable 'p' [-Werror=unused-variable] I think the one-line change below is what is needed here, but it's probably best for amdgpu maintainers to take a closer look. Signed-off-by: Arnd Bergmann index 8b9b245fd0c8..ab34190859a8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -540,7 +540,7 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages) list_add(&guptask.list, >t->guptasks); spin_unlock(>t->guptasklock); - r = get_user_pages(userptr, num_pages, write, 0, pages, NULL); + r = get_user_pages(userptr, num_pages, write, 0, p, NULL); spin_lock(>t->guptasklock); list_del(&guptask.list);