From: Dave Airlie <airlied@redhat.com>
Date: Tue, 20 Apr 2010 03:15:05 +0000 (+1000)
Subject: Merge branch 'drm-radeon-lockup' into drm-core-next
X-Git-Tag: v2.6.35-rc1~451^2~88
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=0bcb1d844ac638a4c4280f697d5bfac9791e9a70

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
---

0bcb1d844ac638a4c4280f697d5bfac9791e9a70
diff --cc drivers/gpu/drm/radeon/r300.c
index bd75f99bd65e,199110ef8df2..bb005bff4b08
--- a/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 <linux/slab.h>
- #include "drmP.h"
- #include "drm.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"