Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (a8106b14) · Commits · e / devices / android_kernel_teracube_2e

drivers/gpu/drm/radeon/atombios_dp.c

+11 −9

Original line number	Diff line number	Diff line
		@@ -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;
		}

+0 −2