Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69e672fd authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Just a few fixes for radeon for 3.17.

* 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/dpm: set the thermal type properly for special configs
  drm/radeon: reduce memory footprint for debugging
  drm/radeon: add connector quirk for fujitsu board
  drm/radeon: fix semaphore value init
  drm/radeon: only use me/pfp sync on evergreen+
parents 7ec62d42 ff437792

drivers/gpu/drm/radeon/atombios_dp.c

+2 −5
Original line number Diff line number Diff line
@@ -405,16 +405,13 @@ bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector) 
	u8 msg[DP_DPCD_SIZE];

	int ret;



	char dpcd_hex_dump[DP_DPCD_SIZE * 3];



	ret = drm_dp_dpcd_read(&radeon_connector->ddc_bus->aux, DP_DPCD_REV, msg,

			       DP_DPCD_SIZE);

	if (ret > 0) {

		memcpy(dig_connector->dpcd, msg, DP_DPCD_SIZE);



		hex_dump_to_buffer(dig_connector->dpcd, sizeof(dig_connector->dpcd),

				   32, 1, dpcd_hex_dump, sizeof(dpcd_hex_dump), false);

		DRM_DEBUG_KMS("DPCD: %s\n", dpcd_hex_dump);

		DRM_DEBUG_KMS("DPCD: %*ph\n", (int)sizeof(dig_connector->dpcd),

			      dig_connector->dpcd);



		radeon_dp_probe_oui(radeon_connector);

drivers/gpu/drm/radeon/r600.c

+2 −2
Original line number Diff line number Diff line
@@ -2769,8 +2769,8 @@ bool r600_semaphore_ring_emit(struct radeon_device *rdev, 
	radeon_ring_write(ring, lower_32_bits(addr));

	radeon_ring_write(ring, (upper_32_bits(addr) & 0xff) | sel);



	/* PFP_SYNC_ME packet only exists on 7xx+ */

	if (emit_wait && (rdev->family >= CHIP_RV770)) {

	/* PFP_SYNC_ME packet only exists on 7xx+, only enable it on eg+ */

	if (emit_wait && (rdev->family >= CHIP_CEDAR)) {

		/* Prevent the PFP from running ahead of the semaphore wait */

		radeon_ring_write(ring, PACKET3(PACKET3_PFP_SYNC_ME, 0));

		radeon_ring_write(ring, 0x0);

drivers/gpu/drm/radeon/radeon_atombios.c

+26 −7
Original line number Diff line number Diff line
@@ -447,6 +447,13 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, 
		}

	}



	/* Fujitsu D3003-S2 board lists DVI-I as DVI-I and VGA */

	if ((dev->pdev->device == 0x9805) &&

	    (dev->pdev->subsystem_vendor == 0x1734) &&

	    (dev->pdev->subsystem_device == 0x11bd)) {

		if (*connector_type == DRM_MODE_CONNECTOR_VGA)

			return false;

	}



	return true;

}
@@ -2281,19 +2288,31 @@ static void radeon_atombios_add_pplib_thermal_controller(struct radeon_device *r 
				 (controller->ucFanParameters &

				  ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with");

			rdev->pm.int_thermal_type = THERMAL_TYPE_KV;

		} else if ((controller->ucType ==

			    ATOM_PP_THERMALCONTROLLER_EXTERNAL_GPIO) ||

			   (controller->ucType ==

			    ATOM_PP_THERMALCONTROLLER_ADT7473_WITH_INTERNAL) ||

			   (controller->ucType ==

			    ATOM_PP_THERMALCONTROLLER_EMC2103_WITH_INTERNAL)) {

			DRM_INFO("Special thermal controller config\n");

		} else if (controller->ucType ==

			   ATOM_PP_THERMALCONTROLLER_EXTERNAL_GPIO) {

			DRM_INFO("External GPIO thermal controller %s fan control\n",

				 (controller->ucFanParameters &

				  ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with");

			rdev->pm.int_thermal_type = THERMAL_TYPE_EXTERNAL_GPIO;

		} else if (controller->ucType ==

			   ATOM_PP_THERMALCONTROLLER_ADT7473_WITH_INTERNAL) {

			DRM_INFO("ADT7473 with internal thermal controller %s fan control\n",

				 (controller->ucFanParameters &

				  ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with");

			rdev->pm.int_thermal_type = THERMAL_TYPE_ADT7473_WITH_INTERNAL;

		} else if (controller->ucType ==

			   ATOM_PP_THERMALCONTROLLER_EMC2103_WITH_INTERNAL) {

			DRM_INFO("EMC2103 with internal thermal controller %s fan control\n",

				 (controller->ucFanParameters &

				  ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with");

			rdev->pm.int_thermal_type = THERMAL_TYPE_EMC2103_WITH_INTERNAL;

		} else if (controller->ucType < ARRAY_SIZE(pp_lib_thermal_controller_names)) {

			DRM_INFO("Possible %s thermal controller at 0x%02x %s fan control\n",

				 pp_lib_thermal_controller_names[controller->ucType],

				 controller->ucI2cAddress >> 1,

				 (controller->ucFanParameters &

				  ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with");

			rdev->pm.int_thermal_type = THERMAL_TYPE_EXTERNAL;

			i2c_bus = radeon_lookup_i2c_gpio(rdev, controller->ucI2cLine);

			rdev->pm.i2c_bus = radeon_i2c_lookup(rdev, &i2c_bus);

			if (rdev->pm.i2c_bus) {

drivers/gpu/drm/radeon/radeon_semaphore.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
int radeon_semaphore_create(struct radeon_device *rdev,

			    struct radeon_semaphore **semaphore)

{

	uint32_t *cpu_addr;

	uint64_t *cpu_addr;

	int i, r;



	*semaphore = kmalloc(sizeof(struct radeon_semaphore), GFP_KERNEL);