public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Tested-by(IVB): Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Maarten Lankhorst 2015-06-15 12:33:48 +02:00 • committed by Daniel Vetter
parent 7fabf5ef18
commit 0583236eaa
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpu/drm/i915/intel_atomic.c
View file

@ -144,9 +144,6 @@ int intel_atomic_commit(struct drm_device *dev,
for_each_crtc_in_state(state, crtc, crtc_state, i) { for_each_crtc_in_state(state, crtc, crtc_state, i) {
to_intel_crtc(crtc)->config = to_intel_crtc_state(crtc->state); 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); drm_atomic_helper_commit_planes_on_crtc(crtc_state);
} }

8
drivers/gpu/drm/i915/intel_display.c
View file

@ -2925,16 +2925,13 @@ unsigned long intel_plane_obj_offset(struct intel_plane *intel_plane,
/* /*
* This function detaches (aka. unbinds) unused scalers in hardware * 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_device *dev;
struct drm_i915_private *dev_priv; struct drm_i915_private *dev_priv;
struct intel_crtc_scaler_state *scaler_state; struct intel_crtc_scaler_state *scaler_state;
int i; int i;
if (!intel_crtc || !intel_crtc->config)
return;
dev = intel_crtc->base.dev; dev = intel_crtc->base.dev;
dev_priv = dev->dev_private; dev_priv = dev->dev_private;
scaler_state = &intel_crtc->config->scaler_state; 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_crtc->atomic.evade =
intel_pipe_update_start(intel_crtc, intel_pipe_update_start(intel_crtc,
&intel_crtc->atomic.start_vbl_count); &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) static void intel_finish_crtc_commit(struct drm_crtc *crtc)

1
drivers/gpu/drm/i915/intel_drv.h
View file

@ -1147,7 +1147,6 @@ void intel_mode_from_pipe_config(struct drm_display_mode *mode,
struct intel_crtc_state *pipe_config); struct intel_crtc_state *pipe_config);
void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc); void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc);
void intel_modeset_preclose(struct drm_device *dev, struct drm_file *file); 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_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); int skl_max_scale(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state);