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

Commit 0583236e authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/i915: move detaching scalers to begin_crtc_commit, v2. 



This is probably intended to be be done during vblank evasion.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Tested-by(IVB): Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7fabf5ef

drivers/gpu/drm/i915/intel_atomic.c

+0 −3
Original line number Diff line number Diff line
@@ -144,9 +144,6 @@ int intel_atomic_commit(struct drm_device *dev, 
	for_each_crtc_in_state(state, crtc, crtc_state, i) {

		to_intel_crtc(crtc)->config = to_intel_crtc_state(crtc->state);



		if (INTEL_INFO(dev)->gen >= 9)

			skl_detach_scalers(to_intel_crtc(crtc));



		drm_atomic_helper_commit_planes_on_crtc(crtc_state);

	}

drivers/gpu/drm/i915/intel_display.c

+4 −4
Original line number Diff line number Diff line
@@ -2925,16 +2925,13 @@ unsigned long intel_plane_obj_offset(struct intel_plane *intel_plane, 
/*

 * This function detaches (aka. unbinds) unused scalers in hardware

 */

void skl_detach_scalers(struct intel_crtc *intel_crtc)

static void skl_detach_scalers(struct intel_crtc *intel_crtc)

{

	struct drm_device *dev;

	struct drm_i915_private *dev_priv;

	struct intel_crtc_scaler_state *scaler_state;

	int i;



	if (!intel_crtc || !intel_crtc->config)

		return;



	dev = intel_crtc->base.dev;

	dev_priv = dev->dev_private;

	scaler_state = &intel_crtc->config->scaler_state;
@@ -13831,6 +13828,9 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc) 
		intel_crtc->atomic.evade =

			intel_pipe_update_start(intel_crtc,

						&intel_crtc->atomic.start_vbl_count);



	if (!needs_modeset(crtc->state) && INTEL_INFO(dev)->gen >= 9)

		skl_detach_scalers(intel_crtc);

}



static void intel_finish_crtc_commit(struct drm_crtc *crtc)

drivers/gpu/drm/i915/intel_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -1147,7 +1147,6 @@ void intel_mode_from_pipe_config(struct drm_display_mode *mode, 
				 struct intel_crtc_state *pipe_config);

void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc);

void intel_modeset_preclose(struct drm_device *dev, struct drm_file *file);

void skl_detach_scalers(struct intel_crtc *intel_crtc);



int skl_update_scaler_crtc(struct intel_crtc_state *crtc_state, int force_detach);

int skl_max_scale(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state);