drivers/gpu/drm/i915/i915_debugfs.c · 47ae63e0c2e5fdb582d471dc906eb29be94c732f · Kirill Smelkov / linux

Merge branch 'drm-intel-fixes' into drm-intel-next · 47ae63e0

Chris Wilson authored Mar 07, 2011

Apply the trivial conflicting regression fixes, but keep GPU semaphores
enabled.

Conflicts:
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/i915_gem_execbuffer.c

47ae63e0

i915_debugfs.c 37.6 KB

Replace i915_debugfs.c