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

Commit f20e0b08 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Prefer CRTC 'active' rather than 'enabled' during WM computations 



Only the intel_crtc->active is accurate at the point where we wish to
perform WM computations, so use it instead of crtc->enabled.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 52bd02d8

drivers/gpu/drm/i915/intel_pm.c

+7 −7
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ void intel_update_fbc(struct drm_device *dev) 
	 *   - going to an unsupported config (interlace, pixel multiply, etc.)

	 */

	list_for_each_entry(tmp_crtc, &dev->mode_config.crtc_list, head) {

		if (tmp_crtc->enabled &&

		if (to_intel_crtc(tmp_crtc)->active &&

		    !to_intel_crtc(tmp_crtc)->primary_disabled &&

		    tmp_crtc->fb) {

			if (crtc) {
@@ -992,7 +992,7 @@ static struct drm_crtc *single_enabled_crtc(struct drm_device *dev) 
	struct drm_crtc *crtc, *enabled = NULL;



	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

		if (crtc->enabled && crtc->fb) {

		if (to_intel_crtc(crtc)->active && crtc->fb) {

			if (enabled)

				return NULL;

			enabled = crtc;
@@ -1086,7 +1086,7 @@ static bool g4x_compute_wm0(struct drm_device *dev, 
	int entries, tlb_miss;



	crtc = intel_get_crtc_for_plane(dev, plane);

	if (crtc->fb == NULL || !crtc->enabled) {

	if (crtc->fb == NULL || !to_intel_crtc(crtc)->active) {

		*cursor_wm = cursor->guard_size;

		*plane_wm = display->guard_size;

		return false;
@@ -1215,7 +1215,7 @@ static bool vlv_compute_drain_latency(struct drm_device *dev, 
	int entries;



	crtc = intel_get_crtc_for_plane(dev, plane);

	if (crtc->fb == NULL || !crtc->enabled)

	if (crtc->fb == NULL || !to_intel_crtc(crtc)->active)

		return false;



	clock = crtc->mode.clock;	/* VESA DOT Clock */
@@ -1476,7 +1476,7 @@ static void i9xx_update_wm(struct drm_device *dev) 


	fifo_size = dev_priv->display.get_fifo_size(dev, 0);

	crtc = intel_get_crtc_for_plane(dev, 0);

	if (crtc->enabled && crtc->fb) {

	if (to_intel_crtc(crtc)->active && crtc->fb) {

		int cpp = crtc->fb->bits_per_pixel / 8;

		if (IS_GEN2(dev))

			cpp = 4;
@@ -1490,7 +1490,7 @@ static void i9xx_update_wm(struct drm_device *dev) 


	fifo_size = dev_priv->display.get_fifo_size(dev, 1);

	crtc = intel_get_crtc_for_plane(dev, 1);

	if (crtc->enabled && crtc->fb) {

	if (to_intel_crtc(crtc)->active && crtc->fb) {

		int cpp = crtc->fb->bits_per_pixel / 8;

		if (IS_GEN2(dev))

			cpp = 4;
@@ -2044,7 +2044,7 @@ sandybridge_compute_sprite_wm(struct drm_device *dev, int plane, 
	int entries, tlb_miss;



	crtc = intel_get_crtc_for_plane(dev, plane);

	if (crtc->fb == NULL || !crtc->enabled) {

	if (crtc->fb == NULL || !to_intel_crtc(crtc)->active) {

		*sprite_wm = display->guard_size;

		return false;

	}