Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c24d8b2 authored by Randy Dunlap's avatar Randy Dunlap
Browse files

Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move

parents b32fc0a0 bcd3cfc1

Documentation/DocBook/drm.tmpl

+168 −140

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/i915_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -789,8 +789,8 @@ static struct vm_operations_struct i915_gem_vm_ops = { 
};



static struct drm_driver driver = {

	/* don't use mtrr's here, the Xserver or user space app should

	 * deal with them for intel hardware.

	/* Don't use MTRRs here; the Xserver or userspace app should

	 * deal with them for Intel hardware.

	 */

	.driver_features =

	    DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/