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

Commit 1cf66e16 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/edid: Fix the HDTV hack sync adjustment
  drm/radeon/kms: fix radeon mid power profile reporting
parents de51257a a4967de6

drivers/gpu/drm/drm_edid.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -864,8 +864,8 @@ drm_mode_std(struct drm_connector *connector, struct edid *edid, 
		mode = drm_cvt_mode(dev, 1366, 768, vrefresh_rate, 0, 0,

		mode = drm_cvt_mode(dev, 1366, 768, vrefresh_rate, 0, 0,

				    false);

				    false);

		mode->hdisplay = 1366;

		mode->hdisplay = 1366;

		mode->vsync_start = mode->vsync_start - 1;

		mode->hsync_start = mode->hsync_start - 1;

		mode->vsync_end = mode->vsync_end - 1;

		mode->hsync_end = mode->hsync_end - 1;

		return mode;

		return mode;

	}

	}

drivers/gpu/drm/radeon/radeon_pm.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -333,6 +333,7 @@ static ssize_t radeon_get_pm_profile(struct device *dev, 
	return snprintf(buf, PAGE_SIZE, "%s\n",

	return snprintf(buf, PAGE_SIZE, "%s\n",

			(cp == PM_PROFILE_AUTO) ? "auto" :

			(cp == PM_PROFILE_AUTO) ? "auto" :

			(cp == PM_PROFILE_LOW) ? "low" :

			(cp == PM_PROFILE_LOW) ? "low" :

			(cp == PM_PROFILE_MID) ? "mid" :

			(cp == PM_PROFILE_HIGH) ? "high" : "default");

			(cp == PM_PROFILE_HIGH) ? "high" : "default");

}

}