Op 04-10-2019 om 15:31 schreef Ville Syrjälä: > On Fri, Oct 04, 2019 at 01:34:59PM +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@xxxxxxxxxxxxxxx> >> Reviewed-by: Matt Roper <matthew.d.roper@xxxxxxxxx> >> --- >> 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 f555ff6b1f6a..fcd295ed80ed 100644 >> --- a/drivers/gpu/drm/i915/display/intel_display.c >> +++ b/drivers/gpu/drm/i915/display/intel_display.c >> @@ -16126,8 +16126,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; > I'd prefer to lift most of this patch to before we do that state split > so it can be pushed out of the way. If you apply https://lists.freedesktop.org/archives/intel-gfx/2019-September/214268.html and I put this before the hw split patch, do I get your r-b up to [PATCH 12/24] drm/i915: Split plane hw and uapi state ? ~Maarten _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx