| Message ID | 20191127190556.1574-3-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Cleanups around pre/post plane update | expand |
On Wed, 2019-11-27 at 21:05 +0200, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Get rid of another 'dev' usage by passing dev_priv instead. > Reviewed-by: José Roberto de Souza <jose.souza@intel.com> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 2 +- > drivers/gpu/drm/i915/intel_pm.c | 4 +--- > drivers/gpu/drm/i915/intel_pm.h | 2 +- > 3 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index d559b7ae1151..89c8f818f289 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -6166,7 +6166,7 @@ static void intel_pre_plane_update(struct > intel_crtc_state *old_crtc_state, > * > * WaCxSRDisabledForSpriteScaling:ivb > */ > - if (pipe_config->disable_lp_wm && ilk_disable_lp_wm(dev) && > + if (pipe_config->disable_lp_wm && ilk_disable_lp_wm(dev_priv) > && > old_crtc_state->hw.active) > intel_wait_for_vblank(dev_priv, crtc->pipe); > > diff --git a/drivers/gpu/drm/i915/intel_pm.c > b/drivers/gpu/drm/i915/intel_pm.c > index 5aad9d49a528..8d63672452a9 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -3592,10 +3592,8 @@ static void ilk_write_wm_values(struct > drm_i915_private *dev_priv, > dev_priv->wm.hw = *results; > } > > -bool ilk_disable_lp_wm(struct drm_device *dev) > +bool ilk_disable_lp_wm(struct drm_i915_private *dev_priv) > { > - struct drm_i915_private *dev_priv = to_i915(dev); > - > return _ilk_disable_lp_wm(dev_priv, WM_DIRTY_LP_ALL); > } > > diff --git a/drivers/gpu/drm/i915/intel_pm.h > b/drivers/gpu/drm/i915/intel_pm.h > index b579c724b915..c06c6a846d9a 100644 > --- a/drivers/gpu/drm/i915/intel_pm.h > +++ b/drivers/gpu/drm/i915/intel_pm.h > @@ -54,7 +54,7 @@ void skl_write_plane_wm(struct intel_plane *plane, > const struct intel_crtc_state *crtc_state); > void skl_write_cursor_wm(struct intel_plane *plane, > const struct intel_crtc_state *crtc_state); > -bool ilk_disable_lp_wm(struct drm_device *dev); > +bool ilk_disable_lp_wm(struct drm_i915_private *dev_priv); > void intel_init_ipc(struct drm_i915_private *dev_priv); > void intel_enable_ipc(struct drm_i915_private *dev_priv); >
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index d559b7ae1151..89c8f818f289 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -6166,7 +6166,7 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state, * * WaCxSRDisabledForSpriteScaling:ivb */ - if (pipe_config->disable_lp_wm && ilk_disable_lp_wm(dev) && + if (pipe_config->disable_lp_wm && ilk_disable_lp_wm(dev_priv) && old_crtc_state->hw.active) intel_wait_for_vblank(dev_priv, crtc->pipe); diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 5aad9d49a528..8d63672452a9 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3592,10 +3592,8 @@ static void ilk_write_wm_values(struct drm_i915_private *dev_priv, dev_priv->wm.hw = *results; } -bool ilk_disable_lp_wm(struct drm_device *dev) +bool ilk_disable_lp_wm(struct drm_i915_private *dev_priv) { - struct drm_i915_private *dev_priv = to_i915(dev); - return _ilk_disable_lp_wm(dev_priv, WM_DIRTY_LP_ALL); } diff --git a/drivers/gpu/drm/i915/intel_pm.h b/drivers/gpu/drm/i915/intel_pm.h index b579c724b915..c06c6a846d9a 100644 --- a/drivers/gpu/drm/i915/intel_pm.h +++ b/drivers/gpu/drm/i915/intel_pm.h @@ -54,7 +54,7 @@ void skl_write_plane_wm(struct intel_plane *plane, const struct intel_crtc_state *crtc_state); void skl_write_cursor_wm(struct intel_plane *plane, const struct intel_crtc_state *crtc_state); -bool ilk_disable_lp_wm(struct drm_device *dev); +bool ilk_disable_lp_wm(struct drm_i915_private *dev_priv); void intel_init_ipc(struct drm_i915_private *dev_priv); void intel_enable_ipc(struct drm_i915_private *dev_priv);