| Message ID | db403b3622b94a87bd93528cc1d6b44ae88adcdd.1678661628.git.lstoakes@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Remove drm/ttm-specific mm changes | expand |
On Mon, Mar 13, 2023 at 08:47:21AM +0100, Christian König wrote: > Am 13.03.23 um 00:40 schrieb Lorenzo Stoakes: > > This function no longer exists, however the prot != vma->vm_page_prot case > > discussion has been retained and moved to vmf_insert_pfn_prot() so refer to > > this instead. > > > > Signed-off-by: Lorenzo Stoakes <lstoakes@gmail.com> > > Reviewed-by: Christian König <christian.koenig@amd.com> > > Feel free to add my acked-by to the other two patches in the series and > upstream through any branch you like. > > Alternatively ping me when you get rbs for the first two patches from the MM > people and I can push this upstream through drm-misc. > > Thanks, > Christian. Thanks, much appreciated! I'd rather go through mm if possible as Andrew has already taken for mm-unstable pending further review + that's easiest for dealing with any mm feedback. P.S. apologies for dropping the umlaut on your name in initial patch, I really need to sort out my terminal which got horribly confused by non-ANSI characters :) > > > --- > > drivers/gpu/drm/ttm/ttm_bo_vm.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c > > index ca7744b852f5..5df3edadb808 100644 > > --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c > > +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c > > @@ -254,7 +254,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, > > * encryption bits. This is because the exact location of the > > * data may not be known at mmap() time and may also change > > * at arbitrary times while the data is mmap'ed. > > - * See vmf_insert_mixed_prot() for a discussion. > > + * See vmf_insert_pfn_prot() for a discussion. > > */ > > ret = vmf_insert_pfn_prot(vma, address, pfn, prot); >
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index ca7744b852f5..5df3edadb808 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -254,7 +254,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, * encryption bits. This is because the exact location of the * data may not be known at mmap() time and may also change * at arbitrary times while the data is mmap'ed. - * See vmf_insert_mixed_prot() for a discussion. + * See vmf_insert_pfn_prot() for a discussion. */ ret = vmf_insert_pfn_prot(vma, address, pfn, prot);
This function no longer exists, however the prot != vma->vm_page_prot case discussion has been retained and moved to vmf_insert_pfn_prot() so refer to this instead. Signed-off-by: Lorenzo Stoakes <lstoakes@gmail.com> --- drivers/gpu/drm/ttm/ttm_bo_vm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)