[Intel-gfx] [PATCH v3 1/8] drm/i915/display: Rename update_crtcs() to commit_modeset_enables()

[Jani Nikula]

On Thu, 22 Aug 2019, Manasi Navare <manasi.d.navare at intel.com> wrote:
> Ville/Maarten/Daniel,
>
> This is a simple rename patch as suggested by danvet, can any one of
> you review this?  So that rest of Maarten's patches can also use these
> new functions.

Please repost the patches. They were posted two months ago, and never
got full IGT results from CI. No idea if they'll apply anymore.

BR,
Jani.



>
> Manasi
>
>
>
> On Mon, Jun 24, 2019 at 02:08:43PM -0700, Manasi Navare wrote:
>> This patch has no functional changes. This just renames the update_crtcs()
>> hooks to commit_modeset_enables() to match the drm_atomic helper naming
>> conventions.
>> 
>> Suggested-by: Daniel Vetter <daniel.vetter at intel.com>
>> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
>> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
>> Cc: Matt Roper <matthew.d.roper at intel.com>
>> Cc: Jani Nikula <jani.nikula at intel.com>
>> Signed-off-by: Manasi Navare <manasi.d.navare at intel.com>
>> ---
>>  drivers/gpu/drm/i915/display/intel_display.c | 10 +++++-----
>>  drivers/gpu/drm/i915/i915_drv.h              |  2 +-
>>  2 files changed, 6 insertions(+), 6 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
>> index 73fe1bcfcd99..71e86e2f0f90 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display.c
>> @@ -13613,7 +13613,7 @@ static void intel_update_crtc(struct drm_crtc *crtc,
>>  	intel_finish_crtc_commit(to_intel_atomic_state(state), intel_crtc);
>>  }
>>  
>> -static void intel_update_crtcs(struct drm_atomic_state *state)
>> +static void intel_commit_modeset_enables(struct drm_atomic_state *state)
>>  {
>>  	struct drm_crtc *crtc;
>>  	struct drm_crtc_state *old_crtc_state, *new_crtc_state;
>> @@ -13628,7 +13628,7 @@ static void intel_update_crtcs(struct drm_atomic_state *state)
>>  	}
>>  }
>>  
>> -static void skl_update_crtcs(struct drm_atomic_state *state)
>> +static void skl_commit_modeset_enables(struct drm_atomic_state *state)
>>  {
>>  	struct drm_i915_private *dev_priv = to_i915(state->dev);
>>  	struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
>> @@ -13868,7 +13868,7 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
>>  	}
>>  
>>  	/* Now enable the clocks, plane, pipe, and connectors that we set up. */
>> -	dev_priv->display.update_crtcs(state);
>> +	dev_priv->display.commit_modeset_enables(state);
>>  
>>  	if (intel_state->modeset)
>>  		intel_set_cdclk_post_plane_update(dev_priv,
>> @@ -15719,9 +15719,9 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
>>  	}
>>  
>>  	if (INTEL_GEN(dev_priv) >= 9)
>> -		dev_priv->display.update_crtcs = skl_update_crtcs;
>> +		dev_priv->display.commit_modeset_enables = skl_commit_modeset_enables;
>>  	else
>> -		dev_priv->display.update_crtcs = intel_update_crtcs;
>> +		dev_priv->display.commit_modeset_enables = intel_commit_modeset_enables;
>>  }
>>  
>>  static i915_reg_t i915_vgacntrl_reg(struct drm_i915_private *dev_priv)
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>> index 62e7c5e8aee5..075d7eb3c3f2 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -310,7 +310,7 @@ struct drm_i915_display_funcs {
>>  			    struct drm_atomic_state *old_state);
>>  	void (*crtc_disable)(struct intel_crtc_state *old_crtc_state,
>>  			     struct drm_atomic_state *old_state);
>> -	void (*update_crtcs)(struct drm_atomic_state *state);
>> +	void (*commit_modeset_enables)(struct drm_atomic_state *state);
>>  	void (*audio_codec_enable)(struct intel_encoder *encoder,
>>  				   const struct intel_crtc_state *crtc_state,
>>  				   const struct drm_connector_state *conn_state);
>> -- 
>> 2.19.1
>> 

-- 
Jani Nikula, Intel Open Source Graphics Center