| Message ID | 1476054436-9378-1-git-send-email-mayhs11saini@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Oct 10, 2016 at 07:22:47AM +0530, Shyam Saini wrote: > On Mon, 2016-10-10 at 01:46 +0200, Patrik Jakobsson wrote: > > On Mon, Oct 10, 2016 at 1:07 AM, Shyam Saini <mayhs11saini@gmail.com> > > wrote: > > > > > > Replace explicit computation of vma page count by a call to > > > vma_pages() > > Hi, I already have this patch in the "queue" from: > > Muhammad Falak R Wani <falakreyaz@gmail.com> > > > > Will include that one when I get around to sending out a PR. Since the merge window is pretty much done I've applied this one here to drm-misc to make sure it wont get lost. -Daniel > > > > Thanks > > Patrik > > > > > > > > > > > Signed-off-by: Shyam Saini <mayhs11saini@gmail.com> > > > --- > > > drivers/gpu/drm/gma500/framebuffer.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/drivers/gpu/drm/gma500/framebuffer.c > > > b/drivers/gpu/drm/gma500/framebuffer.c > > > index 3a44e70..0fde850 100644 > > > --- a/drivers/gpu/drm/gma500/framebuffer.c > > > +++ b/drivers/gpu/drm/gma500/framebuffer.c > > > @@ -124,7 +124,7 @@ static int psbfb_vm_fault(struct vm_area_struct > > > *vma, struct vm_fault *vmf) > > > unsigned long phys_addr = (unsigned long)dev_priv- > > > >stolen_base + > > > psbfb->gtt->offset; > > > > > > - page_num = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; > > > + page_num = vma_pages(vma); > > > address = (unsigned long)vmf->virtual_address - (vmf->pgoff > > > << PAGE_SHIFT); > > > > > > vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); > > > -- > > > 2.7.4 > > > > > No issue. > > Thanks > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Tue, Oct 11, 2016 at 10:15 AM, Daniel Vetter <daniel@ffwll.ch> wrote: > On Mon, Oct 10, 2016 at 07:22:47AM +0530, Shyam Saini wrote: >> On Mon, 2016-10-10 at 01:46 +0200, Patrik Jakobsson wrote: >> > On Mon, Oct 10, 2016 at 1:07 AM, Shyam Saini <mayhs11saini@gmail.com> >> > wrote: >> > > >> > > Replace explicit computation of vma page count by a call to >> > > vma_pages() >> > Hi, I already have this patch in the "queue" from: >> > Muhammad Falak R Wani <falakreyaz@gmail.com> >> > >> > Will include that one when I get around to sending out a PR. > > Since the merge window is pretty much done I've applied this one here to > drm-misc to make sure it wont get lost. > -Daniel > Thanks, I'll take them out of my queue that never got sent. -Patrik >> > >> > Thanks >> > Patrik >> > >> > > >> > > >> > > Signed-off-by: Shyam Saini <mayhs11saini@gmail.com> >> > > --- >> > > drivers/gpu/drm/gma500/framebuffer.c | 2 +- >> > > 1 file changed, 1 insertion(+), 1 deletion(-) >> > > >> > > diff --git a/drivers/gpu/drm/gma500/framebuffer.c >> > > b/drivers/gpu/drm/gma500/framebuffer.c >> > > index 3a44e70..0fde850 100644 >> > > --- a/drivers/gpu/drm/gma500/framebuffer.c >> > > +++ b/drivers/gpu/drm/gma500/framebuffer.c >> > > @@ -124,7 +124,7 @@ static int psbfb_vm_fault(struct vm_area_struct >> > > *vma, struct vm_fault *vmf) >> > > unsigned long phys_addr = (unsigned long)dev_priv- >> > > >stolen_base + >> > > psbfb->gtt->offset; >> > > >> > > - page_num = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; >> > > + page_num = vma_pages(vma); >> > > address = (unsigned long)vmf->virtual_address - (vmf->pgoff >> > > << PAGE_SHIFT); >> > > >> > > vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); >> > > -- >> > > 2.7.4 >> > > >> >> No issue. >> >> Thanks >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c index 3a44e70..0fde850 100644 --- a/drivers/gpu/drm/gma500/framebuffer.c +++ b/drivers/gpu/drm/gma500/framebuffer.c @@ -124,7 +124,7 @@ static int psbfb_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) unsigned long phys_addr = (unsigned long)dev_priv->stolen_base + psbfb->gtt->offset; - page_num = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; + page_num = vma_pages(vma); address = (unsigned long)vmf->virtual_address - (vmf->pgoff << PAGE_SHIFT); vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
Replace explicit computation of vma page count by a call to vma_pages() Signed-off-by: Shyam Saini <mayhs11saini@gmail.com> --- drivers/gpu/drm/gma500/framebuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)