diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-01-24 16:57:42 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-01-24 17:35:53 +0000 |
| commit | 15b63d35261ba3351d07e7937252f18bb6cbf814 (patch) | |
| tree | 6631c0bb20cf2d3476989809c343c9aa13bb9aab /drivers/gpu | |
| parent | 9aa59993e226af94088adaee993eb8cfd33ae295 (diff) | |
| download | blackbird-op-linux-15b63d35261ba3351d07e7937252f18bb6cbf814.tar.gz blackbird-op-linux-15b63d35261ba3351d07e7937252f18bb6cbf814.zip | |
gma500: Fix shmem mapping
GMA500 did it the old way and it's been on the TODO list to fix. Current kernels
now blow up if we use the old way so we'd better do the work !
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/gma500/gtt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c index e770bd190a5c..5d5330f667f1 100644 --- a/drivers/gpu/drm/gma500/gtt.c +++ b/drivers/gpu/drm/gma500/gtt.c @@ -20,6 +20,7 @@ */ #include <drm/drmP.h> +#include <linux/shmem_fs.h> #include "psb_drv.h" @@ -203,9 +204,7 @@ static int psb_gtt_attach_pages(struct gtt_range *gt) gt->npage = pages; for (i = 0; i < pages; i++) { - /* FIXME: needs updating as per mail from Hugh Dickins */ - p = read_cache_page_gfp(mapping, i, - __GFP_COLD | GFP_KERNEL); + p = shmem_read_mapping_page(mapping, i); if (IS_ERR(p)) goto err; gt->pages[i] = p; |
