On Wed, Sep 14, 2016 at 1:05 PM, Philipp Zabel <p.zabel@xxxxxxxxxxxxxx> wrote: > Hi Dave, > > Am Montag, den 29.08.2016, 17:44 +0200 schrieb Daniel Vetter: >> On Mon, Aug 29, 2016 at 4:59 PM, Philipp Zabel <p.zabel@xxxxxxxxxxxxxx> wrote: >> > Am Montag, den 29.08.2016, 12:53 +0200 schrieb Philipp Zabel: >> >> Am Freitag, den 26.08.2016, 15:30 +0800 schrieb Liu Ying: >> >> > This patch adds active plane reconfiguration support for imx-drm. >> >> > This may fixes some mode setting failure issues which were introduced >> >> > by imx-drm atomic conversion patch set. The main idea is to disable the >> >> > plane in question in CRTC's atomic_disable operation and then the drm >> >> > atomic core will enable it again automatically. >> >> >> >> I have rebased onto drm-misc and picked up the remaining patches (4-7) >> > >> > Actually, since this is a regression and the new drm-misc patches won't >> > make it into 4.8, I'd be inclined to take the v2 patch as a fix for 4.8 >> > and then apply the remaining patches as relative changes to that on top >> > of drm-misc instead. >> >> Just apply the 4.8 to 4.8 and then once that's in an -rc do a >> backmerge with -X ours and explain in the commit what you're doing. No >> need to rework the patches once more to be incremental on top of the >> 4.8 fix. >> >> At least that's what we're doing all the time in i915. >> -Daniel > > Could you merge v4.8-rc3 into drm-next? After backmerging > drm-intel-fixes-2016-08-15 with -s ours, v4.8-rc3 just auto-merges > cleanly, but I assume I shouldn't do that inside an imx-drm pull > request. > > Since imx-drm-fixes-2016-08-29 is based on v4.8-rc3, I'd otherwise have > to pull it in with that backmerge, to resolve the conflict between > commit c6c1f9bc798b ("drm/imx: Add active plane reconfiguration > support") that went into v4.8-rc5 and the newer version in imx-drm/next. Yup, don't do backmerges in your driver tree which affect other drivers. Those need to happen in Dave's main drm-next tree to avoid confusion and chaos. I'll ping him about it. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel