Merge branch 'drm-radeon-lockup' into drm-core-next

* 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

diff --cc drivers/gpu/drm/radeon/evergreen.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r100.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r300.c
index bd75f99bd65ef3dbba333ae4d972981f3ce52385,199110ef8df2a38c64cb68c8dd0cfa4310e47182..bb005bff4b088cf15c571d56e9c6a4bc8b084889
--- 1/drivers/gpu/drm/radeon/r300.c
--- 2/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@@ -26,9 -26,9 +26,10 @@@
   *          Jerome Glisse
   */
  #include <linux/seq_file.h>
- #include "drmP.h"
- #include "drm.h"
 +#include <linux/slab.h>
+ #include <drm/drmP.h>
+ #include <drm/drm.h>
+ #include <drm/drm_crtc_helper.h>
  #include "radeon_reg.h"
  #include "radeon.h"
  #include "radeon_asic.h"

diff --cc drivers/gpu/drm/radeon/r420.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r600.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_device.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_fence.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rs400.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rs600.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rv515.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rv770.c
Simple merge