| Message ID | 20190920114235.22411-4-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/23] drm/i915/dp: Fix dsc bpp calculations, v2. | expand |
On Fri, Sep 20, 2019 at 01:42:16PM +0200, Maarten Lankhorst wrote: > We are still looking at drm_crtc_state in a few places, convert those > to use intel_crtc_state instead. Look at uapi/hw where appropriate. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Matt Roper <matthew.d.roper@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 ++-- > 3 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 6818cbd00ac2..32bbb5bf48f3 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -16081,8 +16081,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; > int ret = 0; > > state = drm_atomic_state_alloc(dev); > @@ -16094,15 +16094,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->hw.active) { > + ret = drm_atomic_add_affected_planes(state, &crtc->base); > if (ret) > goto out; > > @@ -16112,7 +16112,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->uapi.color_mgmt_changed = true; > } > } > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c > index 76f066b1dfe5..5127ec037b7b 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)->hw.enable) > return 0; > } > > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c > index 8988dbe8c19e..979e166f5639 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -1068,9 +1068,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->hw.active && intel_crtc_state->has_psr) { > /* Mark mode as changed to trigger a pipe->update() */ > - crtc_state->mode_changed = true; > + intel_crtc_state->uapi.mode_changed = true; > break; > } > } > -- > 2.20.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 6818cbd00ac2..32bbb5bf48f3 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -16081,8 +16081,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; int ret = 0; state = drm_atomic_state_alloc(dev); @@ -16094,15 +16094,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->hw.active) { + ret = drm_atomic_add_affected_planes(state, &crtc->base); if (ret) goto out; @@ -16112,7 +16112,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->uapi.color_mgmt_changed = true; } } diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 76f066b1dfe5..5127ec037b7b 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)->hw.enable) return 0; } diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 8988dbe8c19e..979e166f5639 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1068,9 +1068,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->hw.active && intel_crtc_state->has_psr) { /* Mark mode as changed to trigger a pipe->update() */ - crtc_state->mode_changed = true; + intel_crtc_state->uapi.mode_changed = true; break; } }
We are still looking at drm_crtc_state in a few places, convert those to use intel_crtc_state instead. Look at uapi/hw where appropriate. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.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 ++-- 3 files changed, 10 insertions(+), 10 deletions(-)