• Eric Anholt's avatar
    Merge remote branch 'origin/master' into drm-intel-next · 34dc4d44
    Eric Anholt authored
    Conflicts:
    	drivers/gpu/drm/i915/i915_dma.c
    	drivers/gpu/drm/i915/i915_drv.h
    	drivers/gpu/drm/radeon/r300.c
    
    The BSD ringbuffer support that is landing in this branch
    significantly conflicts with the Ironlake PIPE_CONTROL fix on master,
    and requires it to be tested successfully anyway.
    34dc4d44
i915_reg.h 96.5 KB