drm/radeon/kms: pull in latest quirks and fixes from ddx

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

2 files changed, 33 insertions, 16 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index a8fb392c9cd6..4dff85b450ea 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -104,7 +104,7 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev,
                                      uint32_t supported_device,
                                      int *connector_type,
                                      struct radeon_i2c_bus_rec *i2c_bus,
-                                     uint8_t *line_mux)
+                                     uint16_t *line_mux)
 {
 
         /* Asus M2A-VM HDMI board lists the DVI port as HDMI */
@@ -143,23 +143,34 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev,
                         return false;
         }
 
-        /* some BIOSes seem to report DAC on HDMI - they hurt me with their lies */
-        if ((*connector_type == DRM_MODE_CONNECTOR_HDMIA) ||
-            (*connector_type == DRM_MODE_CONNECTOR_HDMIB)) {
-                if (supported_device & (ATOM_DEVICE_CRT_SUPPORT)) {
-                        return false;
-                }
-        }
-
         /* ASUS HD 3600 XT board lists the DVI port as HDMI */
         if ((dev->pdev->device == 0x9598) &&
             (dev->pdev->subsystem_vendor == 0x1043) &&
             (dev->pdev->subsystem_device == 0x01da)) {
-                if (*connector_type == DRM_MODE_CONNECTOR_HDMIB) {
+                if (*connector_type == DRM_MODE_CONNECTOR_HDMIA) {
+                        *connector_type = DRM_MODE_CONNECTOR_DVID;
+                }
+        }
+
+        /* ASUS HD 3450 board lists the DVI port as HDMI */
+        if ((dev->pdev->device == 0x95C5) &&
+            (dev->pdev->subsystem_vendor == 0x1043) &&
+            (dev->pdev->subsystem_device == 0x01e2)) {
+                if (*connector_type == DRM_MODE_CONNECTOR_HDMIA) {
                         *connector_type = DRM_MODE_CONNECTOR_DVID;
                 }
         }
 
+        /* some BIOSes seem to report DAC on HDMI - usually this is a board with
+         * HDMI + VGA reporting as HDMI
+         */
+        if (*connector_type == DRM_MODE_CONNECTOR_HDMIA) {
+                if (supported_device & (ATOM_DEVICE_CRT_SUPPORT)) {
+                        *connector_type = DRM_MODE_CONNECTOR_VGA;
+                        *line_mux = 0;
+                }
+        }
+
         return true;
 }
 
@@ -192,11 +203,11 @@ const int object_connector_convert[] = {
         DRM_MODE_CONNECTOR_Composite,
         DRM_MODE_CONNECTOR_SVIDEO,
         DRM_MODE_CONNECTOR_Unknown,
+        DRM_MODE_CONNECTOR_Unknown,
         DRM_MODE_CONNECTOR_9PinDIN,
         DRM_MODE_CONNECTOR_Unknown,
         DRM_MODE_CONNECTOR_HDMIA,
         DRM_MODE_CONNECTOR_HDMIB,
-        DRM_MODE_CONNECTOR_HDMIB,
         DRM_MODE_CONNECTOR_LVDS,
         DRM_MODE_CONNECTOR_9PinDIN,
         DRM_MODE_CONNECTOR_Unknown,
@@ -218,7 +229,7 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
         ATOM_OBJECT_HEADER *obj_header;
         int i, j, path_size, device_support;
         int connector_type;
-        uint16_t igp_lane_info;
+        uint16_t igp_lane_info, conn_id;
         bool linkb;
         struct radeon_i2c_bus_rec ddc_bus;
 
@@ -405,9 +416,15 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
                         else
                                 ddc_bus = radeon_lookup_gpio(dev, line_mux);
 
+                        conn_id = le16_to_cpu(path->usConnObjectId);
+
+                        if (!radeon_atom_apply_quirks
+                            (dev, le16_to_cpu(path->usDeviceTag), &connector_type,
+                             &ddc_bus, &conn_id))
+                                continue;
+
                         radeon_add_atom_connector(dev,
-                                                  le16_to_cpu(path->
-                                                              usConnObjectId),
+                                                  conn_id,
                                                   le16_to_cpu(path->
                                                               usDeviceTag),
                                                   connector_type, &ddc_bus,
@@ -423,7 +440,7 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
 
 struct bios_connector {
         bool valid;
-        uint8_t line_mux;
+        uint16_t line_mux;
         uint16_t devices;
         int connector_type;
         struct radeon_i2c_bus_rec ddc_bus;
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index 9ad20350118f..e274bb13866e 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -537,6 +537,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
 
         switch (connector->connector_type) {
         case DRM_MODE_CONNECTOR_DVII:
+        case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */
                 if (drm_detect_hdmi_monitor((struct edid *)connector->edid_blob_ptr))
                         return ATOM_ENCODER_MODE_HDMI;
                 else if (radeon_connector->use_digital)
@@ -546,7 +547,6 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
                 break;
         case DRM_MODE_CONNECTOR_DVID:
         case DRM_MODE_CONNECTOR_HDMIA:
-        case DRM_MODE_CONNECTOR_HDMIB:
         default:
                 if (drm_detect_hdmi_monitor((struct edid *)connector->edid_blob_ptr))
                         return ATOM_ENCODER_MODE_HDMI;