On Fri, Jan 27, 2017 at 02:41:29PM -0200, Gabriel Krisman Bertazi wrote:
> Daniel Vetter <daniel@xxxxxxxx> writes:
> > On Fri, Jan 27, 2017 at 09:20:42AM +0100, Gerd Hoffmann wrote:
> >> On Do, 2017-01-26 at 23:05 -0200, Gabriel Krisman Bertazi wrote:
> >> > No longer true since commit 07f8d9bdb235 ("drm/qxl: add support for > 1
> >> > output"). qxl_num_crtc defaults to 4 and is configurable as a module
> >> > parameter.
> >>
> >> Picked up patches 1-3 for drm-qemu branch.
> >>
> >> Patch 4 doesn't apply and seems to have a dependency on out-of-tree
> >> changes, git am fails to do a 3way merge due to missing commits (trying
> >> to apply to 4.10-rc5).
> >
> > It needs the demidlayer that's already in drm-next ...
>
> Thank you guys for the review.
>
> Yes, my patches were based on drm-misc next branch, I should have
> mentioned that in the original patch. It actually depends on stuff
> already in drm-misc, so I won't be able to rebase just this to drm-qemu
> tree.
>
> Do you want to merge from drm-misc or should we push this one
> directly via drm-misc?
I guess I could ask Gerd whether we wants to be part of the experiment to
maintain small drivers in drm-misc, to avoid these kinds of coordination
issues? Since some of the patches are in drm-misc and some in the qemu
tree we need to wait for them to resync now (I'll send out another
drm-misc pull later today).
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
