Commit bdb52084 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-x86-pat-regression-fix' of git://people.freedesktop.org/~airlied/linux 

Pull drm x86/pat regression fixes from Dave Airlie:
 "This is a standalone pull request for the fix for a regression
  introduced in -rc1 by a change to vm_insert_mixed to start using the
  PAT range tracking to validate page protections. With this fix in
  place, all the VRAM mappings for GPU drivers ended up at UC instead of
  WC.

  There are probably better ways to fix this long term, but nothing I'd
  considered for -fixes that wouldn't need more settling in time. So
  I've just created a new arch API that the drivers can reserve all
  their VRAM aperture ranges as WC"

* tag 'drm-x86-pat-regression-fix' of git://people.freedesktop.org/~airlied/linux:
  drm/drivers: add support for using the arch wc mapping API.
  x86/io: add interface to reserve io memtype for a resource range. (v1.1)
parents e0f3e6a7 7cf321d1

arch/x86/include/asm/io.h

+6 −0
Original line number Diff line number Diff line
@@ -351,4 +351,10 @@ extern void arch_phys_wc_del(int handle); 
#define arch_phys_wc_add arch_phys_wc_add

#endif



#ifdef CONFIG_X86_PAT

extern int arch_io_reserve_memtype_wc(resource_size_t start, resource_size_t size);

extern void arch_io_free_memtype_wc(resource_size_t start, resource_size_t size);

#define arch_io_reserve_memtype_wc arch_io_reserve_memtype_wc

#endif



#endif /* _ASM_X86_IO_H */

arch/x86/mm/pat.c

+14 −0
Original line number Diff line number Diff line
@@ -730,6 +730,20 @@ void io_free_memtype(resource_size_t start, resource_size_t end) 
	free_memtype(start, end);

}



int arch_io_reserve_memtype_wc(resource_size_t start, resource_size_t size)

{

	enum page_cache_mode type = _PAGE_CACHE_MODE_WC;



	return io_reserve_memtype(start, start + size, &type);

}

EXPORT_SYMBOL(arch_io_reserve_memtype_wc);



void arch_io_free_memtype_wc(resource_size_t start, resource_size_t size)

{

	io_free_memtype(start, start + size);

}

EXPORT_SYMBOL(arch_io_free_memtype_wc);



pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,

				unsigned long size, pgprot_t vma_prot)

{

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+5 −0
Original line number Diff line number Diff line
@@ -754,6 +754,10 @@ static const char *amdgpu_vram_names[] = { 


int amdgpu_bo_init(struct amdgpu_device *adev)

{

	/* reserve PAT memory space to WC for VRAM */

	arch_io_reserve_memtype_wc(adev->mc.aper_base,

				   adev->mc.aper_size);



	/* Add an MTRR for the VRAM */

	adev->mc.vram_mtrr = arch_phys_wc_add(adev->mc.aper_base,

					      adev->mc.aper_size);
@@ -769,6 +773,7 @@ void amdgpu_bo_fini(struct amdgpu_device *adev) 
{

	amdgpu_ttm_fini(adev);

	arch_phys_wc_del(adev->mc.vram_mtrr);

	arch_io_free_memtype_wc(adev->mc.aper_base, adev->mc.aper_size);

}



int amdgpu_bo_fbdev_mmap(struct amdgpu_bo *bo,

drivers/gpu/drm/ast/ast_ttm.c

+6 −0
Original line number Diff line number Diff line
@@ -267,6 +267,8 @@ int ast_mm_init(struct ast_private *ast) 
		return ret;

	}



	arch_io_reserve_memtype_wc(pci_resource_start(dev->pdev, 0),

				   pci_resource_len(dev->pdev, 0));

	ast->fb_mtrr = arch_phys_wc_add(pci_resource_start(dev->pdev, 0),

					pci_resource_len(dev->pdev, 0));
@@ -275,11 +277,15 @@ int ast_mm_init(struct ast_private *ast) 


void ast_mm_fini(struct ast_private *ast)

{

	struct drm_device *dev = ast->dev;



	ttm_bo_device_release(&ast->ttm.bdev);



	ast_ttm_global_release(ast);



	arch_phys_wc_del(ast->fb_mtrr);

	arch_io_free_memtype_wc(pci_resource_start(dev->pdev, 0),

				pci_resource_len(dev->pdev, 0));

}



void ast_ttm_placement(struct ast_bo *bo, int domain)

drivers/gpu/drm/cirrus/cirrus_ttm.c

+7 −0
Original line number Diff line number Diff line
@@ -267,6 +267,9 @@ int cirrus_mm_init(struct cirrus_device *cirrus) 
		return ret;

	}



	arch_io_reserve_memtype_wc(pci_resource_start(dev->pdev, 0),

				   pci_resource_len(dev->pdev, 0));



	cirrus->fb_mtrr = arch_phys_wc_add(pci_resource_start(dev->pdev, 0),

					   pci_resource_len(dev->pdev, 0));
@@ -276,6 +279,8 @@ int cirrus_mm_init(struct cirrus_device *cirrus) 


void cirrus_mm_fini(struct cirrus_device *cirrus)

{

	struct drm_device *dev = cirrus->dev;



	if (!cirrus->mm_inited)

		return;
@@ -285,6 +290,8 @@ void cirrus_mm_fini(struct cirrus_device *cirrus) 


	arch_phys_wc_del(cirrus->fb_mtrr);

	cirrus->fb_mtrr = 0;

	arch_io_free_memtype_wc(pci_resource_start(dev->pdev, 0),

				pci_resource_len(dev->pdev, 0));

}



void cirrus_ttm_placement(struct cirrus_bo *bo, int domain)

CRA Git | Maintained and supported by SUSTech CRA and CCSE