drm/gma500: Always trap MMU page faults (8f394872) · Commits · e / devices / android_kernel_samsung_universal8895

drivers/gpu/drm/gma500/psb_drv.c

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -37,14 +37,8 @@
	#include <acpi/video.h>		#include <acpi/video.h>
	#include <linux/module.h>		#include <linux/module.h>

	static int drm_psb_trap_pagefaults;

	static int psb_probe(struct pci_dev pdev, const struct pci_device_id ent);		static int psb_probe(struct pci_dev pdev, const struct pci_device_id ent);

	MODULE_PARM_DESC(trap_pagefaults, "Error and reset on MMU pagefaults");
	module_param_named(trap_pagefaults, drm_psb_trap_pagefaults, int, 0600);


	static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {		static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
	{ 0x8086, 0x8108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops },		{ 0x8086, 0x8108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops },
	{ 0x8086, 0x8109, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops },		{ 0x8086, 0x8109, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops },
	@@ -356,7 +350,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
	if (ret)		if (ret)
	goto out_err;		goto out_err;

	dev_priv->mmu = psb_mmu_driver_init(dev, drm_psb_trap_pagefaults, 0, 0);		dev_priv->mmu = psb_mmu_driver_init(dev, 1, 0, 0);
	if (!dev_priv->mmu)		if (!dev_priv->mmu)
	goto out_err;		goto out_err;