mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ben Hutchings <ben@decadent.org.uk>
To: David Airlie <airlied@linux.ie>
Cc: LKML <linux-kernel@vger.kernel.org>, dri-devel@lists.freedesktop.org
Subject: [PATCH 3/8] drm: Do not include page offset in argument to virt_to_page()
Date: Sun, 27 Oct 2013 21:52:17 +0000	[thread overview]
Message-ID: <1382910737.2994.47.camel@deadeye.wl.decadent.org.uk> (raw)
In-Reply-To: <1382910437.2994.43.camel@deadeye.wl.decadent.org.uk>

[-- Attachment #1: Type: text/plain, Size: 917 bytes --]

By definition, the page offset will not affect the result.

Compile-tested only.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 drivers/gpu/drm/drm_vm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index b5c5af7..8ef6503 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -301,7 +301,7 @@ static int drm_do_vm_dma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 
 	offset = (unsigned long)vmf->virtual_address - vma->vm_start;	/* vm_[pg]off[set] should be 0 */
 	page_nr = offset >> PAGE_SHIFT; /* page_nr could just be vmf->pgoff */
-	page = virt_to_page((dma->pagelist[page_nr] + (offset & (~PAGE_MASK))));
+	page = virt_to_page(dma->pagelist[page_nr]);
 
 	get_page(page);
 	vmf->page = page;


-- 
Ben Hutchings
If at first you don't succeed, you're doing about average.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

  parent reply	other threads:[~2013-10-27 21:52 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-27 21:47 [PATCH 0/8] Fix minor address type errors Ben Hutchings
2013-10-27 21:50 ` [PATCH 1/8] IB/cxgb4: Fix formatting of physical address Ben Hutchings
2013-10-27 21:58   ` Joe Perches
2013-10-27 22:02     ` Ben Hutchings
2013-10-27 22:14       ` Joe Perches
2013-10-27 22:26         ` Ben Hutchings
2013-10-27 22:54           ` Joe Perches
2013-10-27 21:51 ` [PATCH 2/8] farsync: Fix confusion about DMA address and buffer offset types Ben Hutchings
2013-10-28  4:26   ` David Miller
2013-10-28  4:51     ` Ben Hutchings
2013-10-28  4:59       ` David Miller
2013-10-27 21:52 ` Ben Hutchings [this message]
2013-10-27 21:52 ` [PATCH 4/8] drm: Pass pointers to virt_to_page() Ben Hutchings
2013-10-27 21:53 ` [PATCH 5/8] [SCSI] tgt: Pass pointers to virt_to_page(), not integers Ben Hutchings
2013-10-27 21:53 ` [PATCH 6/8] uio: " Ben Hutchings
2013-10-27 21:54 ` [PATCH 7/8] rds: " Ben Hutchings
2013-10-28  4:26   ` David Miller
2013-10-28 14:22     ` Venkat Venkatsubra
2013-10-27 21:54 ` [PATCH 8/8] [SCSI] pmcraid: Pass pointers to access_ok(), " Ben Hutchings
  -- strict thread matches above, loose matches on Subject: below --
2011-12-21  1:29 [PATCH 0/8] Fix virtual and physical address types Ben Hutchings
2011-12-21  1:33 ` [PATCH 3/8] drm: Do not include page offset in argument to virt_to_page() Ben Hutchings

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1382910737.2994.47.camel@deadeye.wl.decadent.org.uk \
    --to=ben@decadent.org.uk \
    --cc=airlied@linux.ie \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®