• Dave Airlie's avatar
    Merge branch 'drm-radeon-lockup' into drm-core-next · 0bcb1d84
    Dave Airlie authored
    * drm-radeon-lockup:
      drm/radeon/kms: simplify & improve GPU reset V2
      drm/radeon/kms: rename gpu_reset to asic_reset
      drm/radeon/kms: fence cleanup + more reliable GPU lockup detection V4
    
    Conflicts:
    	drivers/gpu/drm/radeon/r300.c
    0bcb1d84
rs400.c 14.8 KB