Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

Just two small DP fixes for 4.1

* 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: fix error flag checking in native aux path
  drm/radeon: retry dcpd fetch

drivers/gpu/drm/radeon/atombios_dp.c

@@ -421,11 +421,12 @@ bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector)
 {
 	struct radeon_connector_atom_dig *dig_connector = radeon_connector->con_priv;
 	u8 msg[DP_DPCD_SIZE];
-	int ret;
+	int ret, i;
 
+	for (i = 0; i < 7; i++) {
 		ret = drm_dp_dpcd_read(&radeon_connector->ddc_bus->aux, DP_DPCD_REV, msg,
 				       DP_DPCD_SIZE);
-	if (ret > 0) {
+		if (ret == DP_DPCD_SIZE) {
 			memcpy(dig_connector->dpcd, msg, DP_DPCD_SIZE);
 
 			DRM_DEBUG_KMS("DPCD: %*ph\n", (int)sizeof(dig_connector->dpcd),
@@ -435,6 +436,7 @@ bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector)
 
 			return true;
 		}
+	}
 	dig_connector->dpcd[0] = 0;
 	return false;
 }

drivers/gpu/drm/radeon/radeon_dp_auxch.c

@@ -30,8 +30,6 @@
 			    AUX_SW_RX_HPD_DISCON |	     \
 			    AUX_SW_RX_PARTIAL_BYTE |	     \
 			    AUX_SW_NON_AUX_MODE |	     \
-			    AUX_SW_RX_MIN_COUNT_VIOL |	     \
-			    AUX_SW_RX_INVALID_STOP |	     \
 			    AUX_SW_RX_SYNC_INVALID_L |	     \
 			    AUX_SW_RX_SYNC_INVALID_H |	     \
 			    AUX_SW_RX_INVALID_START |	     \