From 4221c6868740fa6d46c7580c9c148c96ae8e6c88 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Tue, 31 Mar 2009 18:22:31 -0700 Subject: [PATCH] --- yaml --- r: 139849 b: refs/heads/master c: 1055f9ddad093f54dfd708a0f976582034d4ce1a h: refs/heads/master i: 139847: 9990a1a5aa92287856e2e32f8530f392d689617a v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_gem.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b053d17270d7..78782e0c5053 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e118f4139feafe97e913df67b1f7c1e5083e535 +refs/heads/master: 1055f9ddad093f54dfd708a0f976582034d4ce1a diff --git a/trunk/drivers/gpu/drm/drm_gem.c b/trunk/drivers/gpu/drm/drm_gem.c index c1173d8c4588..4984aa89cf3d 100644 --- a/trunk/drivers/gpu/drm/drm_gem.c +++ b/trunk/drivers/gpu/drm/drm_gem.c @@ -505,7 +505,6 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) struct drm_local_map *map = NULL; struct drm_gem_object *obj; struct drm_hash_item *hash; - unsigned long prot; int ret = 0; mutex_lock(&dev->struct_mutex); @@ -538,11 +537,7 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) vma->vm_ops = obj->dev->driver->gem_vm_ops; vma->vm_private_data = map->handle; /* FIXME: use pgprot_writecombine when available */ - prot = pgprot_val(vma->vm_page_prot); -#ifdef CONFIG_X86 - prot |= _PAGE_CACHE_WC; -#endif - vma->vm_page_prot = __pgprot(prot); + vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); /* Take a ref for this mapping of the object, so that the fault * handler can dereference the mmap offset's pointer to the object.