Re: [PATCH v3 00/19] Convert to atomic, part 3.

Matt Roper
2015-06-19T22:29:38Z

On Mon, Jun 15, 2015 at 12:33:37PM +0200, Maarten Lankhorst wrote:
> Requisites:
> - "[PATCH] drm/atomic: pass old crtc state to atomic_begin/flush."
>
> This patch series converts plane updates and cdclk updates to atomic,
> but still doesn't touch the hw readout code, which was regressing a lot.
>
> The fixes in this series are needed to support proper hw readout, and can
> be applied on top of topic/atomic-conversion.
>
> In particular, this fixes the following bugs:
> - https://bugs.freedesktop.org/show_bug.cgi?id=90874
> Needs atomic CDCLK as part of state, before any plane checks,
> or scalers will not work correctly.
> - https://bugs.freedesktop.org/show_bug.cgi?id=90868
> It shows a problem with plane visibility on resume.
> This is fixed by calcing plane states correctly across modeset.
> There's also a problem with DPLL 0 failing to lock, I hope that's
> fixed by cdclk changes, but it might have been a bug in the reverted
> atomic hw readout patch too.

I've spent the last week looking over these and I don't see any major
functional problems so I think these are probably ready for merging. A
couple patches got into areas of the code I'm not super familiar with,
but I've also done quite a bit of testing of this series (on IVB) and
haven't run into issues, so that increases my confidence.

I think there was one incorrectly identified function parameter I called
out on one of the early scaler patches, but with a sensible parameter
rename there, you can consider these

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Tested-by(IVB): Matt Roper <matthew.d.roper@intel.com>

Matt

>
> Maarten Lankhorst (19):
> drm/i915: Use crtc state in intel_modeset_pipe_config
> drm/i915: Clean up intel_atomic_setup_scalers slightly.
> drm/i915: Add a simple atomic crtc check function, v2.
> drm/i915: Move scaler setup to check crtc function, v2.
> drm/i915: Assign a new pll from the crtc check function, v2.
> drm/i915: Split skl_update_scaler, v3.
> drm/i915: Split plane updates of crtc->atomic into a helper, v2.
> drm/i915: clean up plane commit functions
> drm/i915: clean up atomic plane check functions, v2.
> drm/i915: remove force argument from disable_plane
> drm/i915: move detaching scalers to begin_crtc_commit, v2.
> drm/i915: Move crtc commit updates to separate functions.
> drm/i915: Do not run most checks when there's no modeset.
> drm/i915: Handle disabling planes better, v2.
> drm/i915: atomic plane updates in a nutshell
> drm/i915: Update less state during modeset.
> drm/i915: Make setting color key atomic.
> drm/i915: Remove transitional references from
> intel_plane_atomic_check.
> drm/i915: Make cdclk part of the atomic state.
>
> drivers/gpu/drm/i915/i915_drv.h | 3 +-
> drivers/gpu/drm/i915/intel_atomic.c | 47 +-
> drivers/gpu/drm/i915/intel_atomic_plane.c | 41 +-
> drivers/gpu/drm/i915/intel_display.c | 1480 +++++++++++++++--------------
> drivers/gpu/drm/i915/intel_dp.c | 2 +-
> drivers/gpu/drm/i915/intel_drv.h | 27 +-
> drivers/gpu/drm/i915/intel_sprite.c | 170 ++--
> 7 files changed, 874 insertions(+), 896 deletions(-)
>
> --
> 2.1.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795