View | Details | Raw Unified | Return to bug 65761 | Differences between
and this patch

Collapse All | Expand All

(-)a/drivers/gpu/drm/radeon/radeon_pm.c (-2 / +5 lines)
Lines 538-546 static ssize_t radeon_hwmon_show_temp(struct device *dev, Link Here
538
				      char *buf)
538
				      char *buf)
539
{
539
{
540
	struct radeon_device *rdev = dev_get_drvdata(dev);
540
	struct radeon_device *rdev = dev_get_drvdata(dev);
541
	struct drm_device *ddev = rdev->ddev;
541
	int temp;
542
	int temp;
542
543
543
	if (rdev->asic->pm.get_temperature)
544
	/* return 0 if PX card is off */
545
	if (ddev->switch_power_state == DRM_SWITCH_POWER_OFF)
546
		temp = 0;
547
	else if (rdev->asic->pm.get_temperature)
544
		temp = radeon_get_temperature(rdev);
548
		temp = radeon_get_temperature(rdev);
545
	else
549
	else
546
		temp = 0;
550
		temp = 0;
547
- 

Return to bug 65761