On Mon, Jun 10, 2019 at 02:01:41PM +0800, Jian-Hong Pan wrote: > From: Imre Deak <imre.deak@xxxxxxxxx> > > commit 48d9f87ddd2108663fd866b254e05d422243cc56 upstream. > > The old state will be needed by an upcoming patch to determine if the > commit increases or decreases CDCLK, so move the old state to the atomic > state (while keeping the new one in dev_priv). cdclk.logical and > cdclk.actual in the atomic state isn't used atm anywhere after the > atomic check phase, so this should be safe. > > v2: > - Use swap() instead of opencoding it. (Ville) > > Suggested-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx> > Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > Link: https://patchwork.freedesktop.org/patch/msgid/20190320135439.12201-2-imre.deak@xxxxxxxxx > Cc: <stable@xxxxxxxxxxxxxxx> # 5.1.x > Signed-off-by: Jian-Hong Pan <jian-hong@xxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_cdclk.c | 20 ++++++++++++++++++++ > drivers/gpu/drm/i915/intel_display.c | 4 ++-- > drivers/gpu/drm/i915/intel_drv.h | 1 + > 3 files changed, 23 insertions(+), 2 deletions(-) Does not apply against the latest 5.1.y tree. Can you rebase this series and resend please? thanks, greg k-h
