Merge remote branch 'korg/drm-radeon-testing' into drm-next-stage

* korg/drm-radeon-testing: (62 commits)
  drm/radeon/kms: update new pll algo
  drm/radeon/kms: add support for square microtiles on r3xx-r5xx
  drm/radeon/kms: force pinning buffer into visible VRAM
  drm/radeon/kms/evergreen: fix typo in cursor code
  drm/radeon/kms: implement reading active PCIE lanes on R600+
  drm/radeon/kms: for downclocking non-mobility check PERFORMANCE state
  drm/radeon/kms: simplify storing current and requested PM mode
  drm/radeon: fixes for r6xx/r7xx gfx init
  drm/radeon/rv740: fix backend setup
  drm/radeon/kms: fix R3XX/R4XX memory controller initialization
  [rfc] drm/radeon/kms: pm debugging check for vbl.
  drm/radeon: Fix memory allocation failures in the preKMS command stream checking.
  drm: Add generic multipart buffer.
  drm/radeon/kms: simplify memory controller setup V2
  drm/radeon: Add asic hook for dma copy to r200 cards.
  drm/radeon/kms: Create asic structure for r300 pcie cards.
  drm/radeon/kms: remove unused r600_gart_clear_page
  drm/radeon/kms: remove HDP flushes from fence emit (v2)
  drm/radeon/kms: add LVDS pll quirk for Dell Studio 15
  drm/radeon/kms: simplify picking power state
  ...

Conflicts:
	drivers/gpu/drm/radeon/atom.c
	drivers/gpu/drm/radeon/atombios.h
	drivers/gpu/drm/radeon/atombios_dp.c
	drivers/gpu/drm/radeon/r600.c
	drivers/gpu/drm/radeon/r600_audio.c
	drivers/gpu/drm/radeon/r600_cp.c
	drivers/gpu/drm/radeon/radeon.h
	drivers/gpu/drm/radeon/radeon_connectors.c
	drivers/gpu/drm/radeon/radeon_ring.c
	drivers/gpu/drm/radeon/rv770.c

1 files changed, 15 insertions, 15 deletions

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index ab6c97330412..f97e7c42ac8e 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -60,8 +60,7 @@
 #define EDID_QUIRK_FIRST_DETAILED_PREFERRED     (1 << 5)
 /* use +hsync +vsync for detailed mode */
 #define EDID_QUIRK_DETAILED_SYNC_PP             (1 << 6)
-/* define the number of Extension EDID block */
-#define MAX_EDID_EXT_NUM 4
+
 
 #define LEVEL_DMT       0
 #define LEVEL_GTF       1
@@ -114,14 +113,14 @@ static const u8 edid_header[] = {
 };
 
 /**
- * edid_is_valid - sanity check EDID data
+ * drm_edid_is_valid - sanity check EDID data
  * @edid: EDID data
  *
  * Sanity check the EDID block by looking at the header, the version number
  * and the checksum.  Return 0 if the EDID doesn't check out, or 1 if it's
  * valid.
  */
-static bool edid_is_valid(struct edid *edid)
+bool drm_edid_is_valid(struct edid *edid)
 {
         int i, score = 0;
         u8 csum = 0;
@@ -163,6 +162,7 @@ bad:
         }
         return 0;
 }
+EXPORT_SYMBOL(drm_edid_is_valid);
 
 /**
  * edid_vendor - match a string against EDID's obfuscated vendor field
@@ -1112,8 +1112,8 @@ static int add_detailed_info_eedid(struct drm_connector *connector,
         }
 
         /* Chose real EDID extension number */
-        edid_ext_num = edid->extensions > MAX_EDID_EXT_NUM ?
-                       MAX_EDID_EXT_NUM : edid->extensions;
+        edid_ext_num = edid->extensions > DRM_MAX_EDID_EXT_NUM ?
+                DRM_MAX_EDID_EXT_NUM : edid->extensions;
 
         /* Find CEA extension */
         for (i = 0; i < edid_ext_num; i++) {
@@ -1195,7 +1195,7 @@ static int drm_ddc_read_edid(struct drm_connector *connector,
         for (i = 0; i < 4; i++) {
                 if (drm_do_probe_ddc_edid(adapter, buf, len))
                         return -1;
-                if (edid_is_valid((struct edid *)buf))
+                if (drm_edid_is_valid((struct edid *)buf))
                         return 0;
         }
 
@@ -1220,7 +1220,7 @@ struct edid *drm_get_edid(struct drm_connector *connector,
         int ret;
         struct edid *edid;
 
-        edid = kmalloc(EDID_LENGTH * (MAX_EDID_EXT_NUM + 1),
+        edid = kmalloc(EDID_LENGTH * (DRM_MAX_EDID_EXT_NUM + 1),
                        GFP_KERNEL);
         if (edid == NULL) {
                 dev_warn(&connector->dev->pdev->dev,
@@ -1238,14 +1238,14 @@ struct edid *drm_get_edid(struct drm_connector *connector,
         if (edid->extensions != 0) {
                 int edid_ext_num = edid->extensions;
 
-                if (edid_ext_num > MAX_EDID_EXT_NUM) {
+                if (edid_ext_num > DRM_MAX_EDID_EXT_NUM) {
                         dev_warn(&connector->dev->pdev->dev,
                                  "The number of extension(%d) is "
                                  "over max (%d), actually read number (%d)\n",
-                                 edid_ext_num, MAX_EDID_EXT_NUM,
-                                 MAX_EDID_EXT_NUM);
+                                 edid_ext_num, DRM_MAX_EDID_EXT_NUM,
+                                 DRM_MAX_EDID_EXT_NUM);
                         /* Reset EDID extension number to be read */
-                        edid_ext_num = MAX_EDID_EXT_NUM;
+                        edid_ext_num = DRM_MAX_EDID_EXT_NUM;
                 }
                 /* Read EDID including extensions too */
                 ret = drm_ddc_read_edid(connector, adapter, (char *)edid,
@@ -1288,8 +1288,8 @@ bool drm_detect_hdmi_monitor(struct edid *edid)
                 goto end;
 
         /* Chose real EDID extension number */
-        edid_ext_num = edid->extensions > MAX_EDID_EXT_NUM ?
-                       MAX_EDID_EXT_NUM : edid->extensions;
+        edid_ext_num = edid->extensions > DRM_MAX_EDID_EXT_NUM ?
+                       DRM_MAX_EDID_EXT_NUM : edid->extensions;
 
         /* Find CEA extension */
         for (i = 0; i < edid_ext_num; i++) {
@@ -1346,7 +1346,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
         if (edid == NULL) {
                 return 0;
         }
-        if (!edid_is_valid(edid)) {
+        if (!drm_edid_is_valid(edid)) {
                 dev_warn(&connector->dev->pdev->dev, "%s: EDID invalid.\n",
                          drm_get_connector_name(connector));
                 return 0;