geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix pfn vs page for older kernels (2.6.9-rc kernels many not work..)

main
Dave Airlie 2004-10-23 06:59:15 +00:00
parent 8d7e798d4c
commit 182a0e5dac
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
linux-core/drm_compat.h
View File

@ -181,6 +181,18 @@ static inline void radeon_delete_i2c_busses(struct drm_device *dev)
#define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT) #define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
static inline int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t pgprot)
{
return remap_page_range(DRM_RPR_ARG(vma) from,
pfn << PAGE_SHIFT,
size,
pgprot);
}
#endif
extern const drm_agp_t drm_agp_entry;
/* old architectures */ /* old architectures */
#ifdef __AMD64__ #ifdef __AMD64__
#define __x86_64__ #define __x86_64__

2
linux-core/drm_vm.c
View File

@ -645,7 +645,7 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma)
vma->vm_end - vma->vm_start, vma->vm_end - vma->vm_start,
vma->vm_page_prot, 0)) vma->vm_page_prot, 0))
#else #else
if (remap_pfn_range(DRM_RPR_ARG(vma) vma->vm_start, if (remap_pfn_range(vma, vma->vm_start,
(VM_OFFSET(vma) + offset) >> PAGE_SHIFT, (VM_OFFSET(vma) + offset) >> PAGE_SHIFT,
vma->vm_end - vma->vm_start, vma->vm_end - vma->vm_start,
vma->vm_page_prot)) vma->vm_page_prot))

2
linux-core/i810_dma.c
View File

@ -130,7 +130,7 @@ int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
buf_priv->currently_mapped = I810_BUF_MAPPED; buf_priv->currently_mapped = I810_BUF_MAPPED;
unlock_kernel(); unlock_kernel();
if (remap_pfn_range(DRM_RPR_ARG(vma) vma->vm_start, if (remap_pfn_range(vma, vma->vm_start,
VM_OFFSET(vma) >> PAGE_SHIFT, VM_OFFSET(vma) >> PAGE_SHIFT,
vma->vm_end - vma->vm_start, vma->vm_end - vma->vm_start,
vma->vm_page_prot)) vma->vm_page_prot))

2
linux-core/i830_dma.c
View File

@ -131,7 +131,7 @@ int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
buf_priv->currently_mapped = I830_BUF_MAPPED; buf_priv->currently_mapped = I830_BUF_MAPPED;
unlock_kernel(); unlock_kernel();
if (remap_pfn_range(DRM_RPR_ARG(vma) vma->vm_start, if (remap_pfn_range(vma, vma->vm_start,
VM_OFFSET(vma) >> PAGE_SHIFT, VM_OFFSET(vma) >> PAGE_SHIFT,
vma->vm_end - vma->vm_start, vma->vm_end - vma->vm_start,
vma->vm_page_prot)) vma->vm_page_prot))