On Thu, Oct 17, 2019 at 03:20:54PM +0200, Maarten Lankhorst wrote:
> We are still looking at drm_crtc_state in a few places, convert those
> to use intel_crtc_state instead.
>
> Changes since v1:
> - Move to before uapi/hw split.
> - Add hunks for intel_pm.c as well.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
> Reviewed-by: Matt Roper <matthew.d.ro...@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 14 +++++++-------
> drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +-
> drivers/gpu/drm/i915/display/intel_psr.c | 4 ++--
> drivers/gpu/drm/i915/intel_pm.c | 6 ++----
> 4 files changed, 12 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index 945ab2180614..5632e13d458d 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -16092,8 +16092,8 @@ static int intel_initial_commit(struct drm_device
> *dev)
> {
> struct drm_atomic_state *state = NULL;
> struct drm_modeset_acquire_ctx ctx;
> - struct drm_crtc *crtc;
> - struct drm_crtc_state *crtc_state;
> + struct intel_crtc *crtc;
> + struct intel_crtc_state *crtc_state;
crtc_state declaration can be moved into the loop.
> int ret = 0;
>
> state = drm_atomic_state_alloc(dev);
> @@ -16105,15 +16105,15 @@ static int intel_initial_commit(struct drm_device
> *dev)
> retry:
> state->acquire_ctx = &ctx;
>
> - drm_for_each_crtc(crtc, dev) {
> - crtc_state = drm_atomic_get_crtc_state(state, crtc);
> + for_each_intel_crtc(dev, crtc) {
> + crtc_state = intel_atomic_get_crtc_state(state, crtc);
> if (IS_ERR(crtc_state)) {
> ret = PTR_ERR(crtc_state);
> goto out;
> }
>
> - if (crtc_state->active) {
> - ret = drm_atomic_add_affected_planes(state, crtc);
> + if (crtc_state->base.active) {
> + ret = drm_atomic_add_affected_planes(state,
> &crtc->base);
> if (ret)
> goto out;
>
> @@ -16123,7 +16123,7 @@ static int intel_initial_commit(struct drm_device
> *dev)
> * having a proper LUT loaded. Remove once we
> * have readout for pipe gamma enable.
> */
> - crtc_state->color_mgmt_changed = true;
> + crtc_state->base.color_mgmt_changed = true;
I guess this part would be fine with using the drm stuff since it's a
high level thing, so kinda sits at the uapi level. But probably best
to convert to explicit .uapi anyway.
> }
> }
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index 2203be28ea01..5484bd4534c1 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -187,7 +187,7 @@ intel_dp_mst_atomic_check(struct drm_connector *connector,
>
> if (!crtc_state ||
> !drm_atomic_crtc_needs_modeset(crtc_state) ||
> - crtc_state->enable)
> + to_intel_crtc_state(crtc_state)->base.enable)
I'd prefer to get rid the the struct drm_crtc_state type variable
totally because if it remains I'm sure someone will use it.
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
> b/drivers/gpu/drm/i915/display/intel_psr.c
> index 50f22abcd30e..211710f5214c 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -1139,9 +1139,9 @@ static int intel_psr_fastset_force(struct
> drm_i915_private *dev_priv)
>
> intel_crtc_state = to_intel_crtc_state(crtc_state);
>
> - if (crtc_state->active && intel_crtc_state->has_psr) {
> + if (intel_crtc_state->base.active && intel_crtc_state->has_psr)
> {
> /* Mark mode as changed to trigger a pipe->update() */
> - crtc_state->mode_changed = true;
> + intel_crtc_state->base.mode_changed = true;
Ugh, more aliasing variables. Can we just kill the drm_ one?
Otherwise looks good to me, so
Reviewed-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
> break;
> }
> }
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index ef36e7834ed4..e680df75a970 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3082,11 +3082,9 @@ static bool ilk_validate_pipe_wm(const struct
> drm_i915_private *dev_priv,
> /* Compute new watermarks for the pipe */
> static int ilk_compute_pipe_wm(struct intel_crtc_state *crtc_state)
> {
> - struct drm_atomic_state *state = crtc_state->base.state;
> + struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev);
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc);
> struct intel_pipe_wm *pipe_wm;
> - struct drm_device *dev = state->dev;
> - const struct drm_i915_private *dev_priv = to_i915(dev);
> struct intel_plane *plane;
> const struct intel_plane_state *plane_state;
> const struct intel_plane_state *pristate = NULL;
> @@ -3781,7 +3779,7 @@ bool intel_can_enable_sagv(struct intel_atomic_state
> *state)
> crtc = intel_get_crtc_for_pipe(dev_priv, pipe);
> crtc_state = to_intel_crtc_state(crtc->base.state);
>
> - if (crtc->base.state->adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE)
> + if (crtc_state->base.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE)
> return false;
>
> for_each_intel_plane_on_crtc(dev, crtc, plane) {
> --
> 2.23.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
