|
@@ -3650,10 +3650,6 @@ static void intel_update_pipe_config(struct intel_crtc *crtc,
|
|
|
/* drm_atomic_helper_update_legacy_modeset_state might not be called. */
|
|
|
crtc->base.mode = crtc->base.state->mode;
|
|
|
|
|
|
- DRM_DEBUG_KMS("Updating pipe size %ix%i -> %ix%i\n",
|
|
|
- old_crtc_state->pipe_src_w, old_crtc_state->pipe_src_h,
|
|
|
- pipe_config->pipe_src_w, pipe_config->pipe_src_h);
|
|
|
-
|
|
|
/*
|
|
|
* Update pipe size and adjust fitter if needed: the reason for this is
|
|
|
* that in compute_mode_changes we check the native mode (not the pfit
|
|
@@ -4775,23 +4771,17 @@ static void skylake_pfit_enable(struct intel_crtc *crtc)
|
|
|
struct intel_crtc_scaler_state *scaler_state =
|
|
|
&crtc->config->scaler_state;
|
|
|
|
|
|
- DRM_DEBUG_KMS("for crtc_state = %p\n", crtc->config);
|
|
|
-
|
|
|
if (crtc->config->pch_pfit.enabled) {
|
|
|
int id;
|
|
|
|
|
|
- if (WARN_ON(crtc->config->scaler_state.scaler_id < 0)) {
|
|
|
- DRM_ERROR("Requesting pfit without getting a scaler first\n");
|
|
|
+ if (WARN_ON(crtc->config->scaler_state.scaler_id < 0))
|
|
|
return;
|
|
|
- }
|
|
|
|
|
|
id = scaler_state->scaler_id;
|
|
|
I915_WRITE(SKL_PS_CTRL(pipe, id), PS_SCALER_EN |
|
|
|
PS_FILTER_MEDIUM | scaler_state->scalers[id].mode);
|
|
|
I915_WRITE(SKL_PS_WIN_POS(pipe, id), crtc->config->pch_pfit.pos);
|
|
|
I915_WRITE(SKL_PS_WIN_SZ(pipe, id), crtc->config->pch_pfit.size);
|
|
|
-
|
|
|
- DRM_DEBUG_KMS("for crtc_state = %p scaler_id = %d\n", crtc->config, id);
|
|
|
}
|
|
|
}
|
|
|
|