On Wed, Apr 01, 2015 at 07:59:29PM -0700, Chandra Konduru wrote: > primary changes in this version are: > - moved changes to state from commit patch to check path (Matt) > - squashed few patches into others (Matt) > - rebased colorkey related patches ontop of recent updates (Daniel) > - rebased all patches onto today's drm-intel-nightly (me) > - initialized colorkey to NONE (me) > - changed primary plane src values to regular integers align with sprite (me) > - used updated get display clock function (me) > > Numbers of patches updated in this version: > 4, 6, 8, 9, 11, 18, 19, 20 > > Sending full patch series for completeness. Individual patch headers > have additional details on changes. This series should cleanly > merge to latest drm-intel-nighly. I've sent review feedback to several of the patches and some of those have my r-b assuming minor updates to the commit message or comments are made. You can also consider 2, 4, 5, 7, 12, and 14-18 to be Reviewed-by: Matt Roper <matthew.d.roper@xxxxxxxxx> A couple other notes/questions: * What is the high-level strategy for merging this? Do we need to wait for full atomic helpers to be switched back on? It looked to me like one of the patches here wouldn't work properly / get called for SetPlane() updates while using the transitional plane helpers. * I think it would be good to get Ander's thoughts on this as well since a lot of this directly intersects with the type of things he's working on. In a couple places it feels a little bit like we have to do things the "wrong" way here because it's the best we can do on the current codebase, so we'll have to backtrack and re-write things a bit once we have full atomic modesetting working through the full check/commit model. So Ander's high level ack would be good as well, since it may make his work more challenging. Matt > > Chandra Konduru (20): > drm/i915: Adding drm helper function drm_plane_from_index(). > drm/i915: Register definitions for skylake scalers > drm/i915: skylake scaler structure definitions > drm/i915: Initialize plane colorkey to NONE > drm/i915: Initialize skylake scalers > drm/i915: Convert primary plane 16.16 values to regular ints > drm/i915: Dump scaler_state too as part of dumping crtc_state > drm/i915: Helper function to update skylake scaling ratio. > drm/i915: Add helper function to update scaler_users in crtc_state > drm/i915: Add atomic function to setup scalers scalers for a crtc. > drm/i915: Helper function to detach a scaler from a plane or crtc > drm/i915: Preserve scaler state when clearing crtc_state > drm/i915: use current scaler state during readout_hw_state. > drm/i915: Update scaling ratio as part of crtc_compute_config > drm/i915: Ensure setting up scalers into staged crtc_state > drm/i915: copy staged scaler state from drm state to crtc->config. > drm/i915: stage panel fitting scaler request for fixed mode panel > drm/i915: Enable skylake panel fitting using skylake shared scalers > drm/i915: Enable skylake primary plane scaling using shared scalers > drm/i915: Enable skylake sprite plane scaling using shared scalers > > drivers/gpu/drm/drm_crtc.c | 22 ++ > drivers/gpu/drm/i915/i915_reg.h | 115 ++++++++ > drivers/gpu/drm/i915/intel_atomic.c | 168 ++++++++++++ > drivers/gpu/drm/i915/intel_display.c | 489 +++++++++++++++++++++++++++++++--- > drivers/gpu/drm/i915/intel_dp.c | 8 + > drivers/gpu/drm/i915/intel_drv.h | 97 +++++++ > drivers/gpu/drm/i915/intel_sprite.c | 71 ++++- > include/drm/drm_crtc.h | 1 + > 8 files changed, 923 insertions(+), 48 deletions(-) > > -- > 1.7.9.5 > -- Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
