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

Commit 7aefe2b5 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/i915: Fix fastboot scalers for skylake. 



The scaler_id in intel_pipe_config_compare should not be checked
when adjusting in intel_pipe_config_compare. The hw scaler id may
be changed in intel_update_pipe_config.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 97c322e7

drivers/gpu/drm/i915/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -12459,9 +12459,9 @@ intel_pipe_config_compare(struct drm_device *dev, 
			PIPE_CONF_CHECK_X(pch_pfit.pos);

			PIPE_CONF_CHECK_X(pch_pfit.size);

		}

	}



		PIPE_CONF_CHECK_I(scaler_state.scaler_id);

	}



	/* BDW+ don't expose a synchronous way to read the state */

	if (IS_HASWELL(dev))