niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/i915: Simplify intel_set_cdclk_{pre,post}_plane_update() calling convention

Browse source 
Move all the old vs. new state shenanigans
into intel_set_cdclk_{pre,post}_plane_update() so that the caller
doesn't need to know any of it.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200120174728.21095-9-ville.syrjala@linux.intel.com
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
This commit is contained in:
Ville Syrjälä 2020-01-20 19:47:18 +02:00
parent 0bb94e0383
commit 5604e9ceae
3 changed files with 26 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
drivers/gpu/drm/i915/display/intel_cdclk.c
View file

@ -1903,41 +1903,41 @@ static void intel_set_cdclk(struct drm_i915_private *dev_priv,
} }
/** /**
* intel_set_cdclk_pre_plane_update - Push the CDCLK configuration to the hardware * intel_set_cdclk_pre_plane_update - Push the CDCLK state to the hardware
* @dev_priv: i915 device * @state: intel atomic state
* @old_state: old CDCLK configuration
* @new_state: new CDCLK configuration
* @pipe: pipe with which to synchronize the update
* *
* Program the hardware before updating the HW plane state based on the passed * Program the hardware before updating the HW plane state based on the
* in CDCLK configuration, if necessary. * new CDCLK state, if necessary.
*/ */
void void
intel_set_cdclk_pre_plane_update(struct drm_i915_private *dev_priv, intel_set_cdclk_pre_plane_update(struct intel_atomic_state *state)
const struct intel_cdclk_config *old_state,
const struct intel_cdclk_config *new_state,
enum pipe pipe)
{ {
struct drm_i915_private *dev_priv = to_i915(state->base.dev);
/* called after intel_cdclk_swap_state()! */
const struct intel_cdclk_config *old_state = &state->cdclk.actual;
const struct intel_cdclk_config *new_state = &dev_priv->cdclk.actual;
enum pipe pipe = state->cdclk.pipe;
if (pipe == INVALID_PIPE || old_state->cdclk <= new_state->cdclk) if (pipe == INVALID_PIPE || old_state->cdclk <= new_state->cdclk)
intel_set_cdclk(dev_priv, new_state, pipe); intel_set_cdclk(dev_priv, new_state, pipe);
} }
/** /**
* intel_set_cdclk_post_plane_update - Push the CDCLK configuration to the hardware * intel_set_cdclk_post_plane_update - Push the CDCLK state to the hardware
* @dev_priv: i915 device * @state: intel atomic state
* @old_state: old CDCLK configuration
* @new_state: new CDCLK configuration
* @pipe: pipe with which to synchronize the update
* *
* Program the hardware after updating the HW plane state based on the passed * Program the hardware before updating the HW plane state based on the
* in CDCLK configuration, if necessary. * new CDCLK state, if necessary.
*/ */
void void
intel_set_cdclk_post_plane_update(struct drm_i915_private *dev_priv, intel_set_cdclk_post_plane_update(struct intel_atomic_state *state)
const struct intel_cdclk_config *old_state,
const struct intel_cdclk_config *new_state,
enum pipe pipe)
{ {
struct drm_i915_private *dev_priv = to_i915(state->base.dev);
/* called after intel_cdclk_swap_state()! */
const struct intel_cdclk_config *old_state = &state->cdclk.actual;
const struct intel_cdclk_config *new_state = &dev_priv->cdclk.actual;
enum pipe pipe = state->cdclk.pipe;
if (pipe != INVALID_PIPE && old_state->cdclk > new_state->cdclk) if (pipe != INVALID_PIPE && old_state->cdclk > new_state->cdclk)
intel_set_cdclk(dev_priv, new_state, pipe); intel_set_cdclk(dev_priv, new_state, pipe);
} }

12
drivers/gpu/drm/i915/display/intel_cdclk.h
View file

@ -33,16 +33,8 @@ bool intel_cdclk_needs_modeset(const struct intel_cdclk_config *a,
const struct intel_cdclk_config *b); const struct intel_cdclk_config *b);
void intel_cdclk_clear_state(struct intel_atomic_state *state); void intel_cdclk_clear_state(struct intel_atomic_state *state);
void intel_cdclk_swap_state(struct intel_atomic_state *state); void intel_cdclk_swap_state(struct intel_atomic_state *state);
void void intel_set_cdclk_pre_plane_update(struct intel_atomic_state *state);
intel_set_cdclk_pre_plane_update(struct drm_i915_private *dev_priv, void intel_set_cdclk_post_plane_update(struct intel_atomic_state *state);
const struct intel_cdclk_config *old_state,
const struct intel_cdclk_config *new_state,
enum pipe pipe);
void
intel_set_cdclk_post_plane_update(struct drm_i915_private *dev_priv,
const struct intel_cdclk_config *old_state,
const struct intel_cdclk_config *new_state,
enum pipe pipe);
void intel_dump_cdclk_config(const struct intel_cdclk_config *cdclk_config, void intel_dump_cdclk_config(const struct intel_cdclk_config *cdclk_config,
const char *context); const char *context);
int intel_modeset_calc_cdclk(struct intel_atomic_state *state); int intel_modeset_calc_cdclk(struct intel_atomic_state *state);

10
drivers/gpu/drm/i915/display/intel_display.c
View file

@ -15600,10 +15600,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
if (state->modeset) { if (state->modeset) {
drm_atomic_helper_update_legacy_modeset_state(dev, &state->base); drm_atomic_helper_update_legacy_modeset_state(dev, &state->base);
intel_set_cdclk_pre_plane_update(dev_priv, intel_set_cdclk_pre_plane_update(state);
&state->cdclk.actual,
&dev_priv->cdclk.actual,
state->cdclk.pipe);
/* /*
* SKL workaround: bspec recommends we disable the SAGV when we * SKL workaround: bspec recommends we disable the SAGV when we
@ -15639,10 +15636,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
if (state->modeset) { if (state->modeset) {
intel_encoders_update_complete(state); intel_encoders_update_complete(state);
intel_set_cdclk_post_plane_update(dev_priv, intel_set_cdclk_post_plane_update(state);
&state->cdclk.actual,
&dev_priv->cdclk.actual,
state->cdclk.pipe);
} }
/* FIXME: We should call drm_atomic_helper_commit_hw_done() here /* FIXME: We should call drm_atomic_helper_commit_hw_done() here