| Message ID | 20170619145620.GS1322@e110455-lin.cambridge.arm.com |
|---|---|
| State | New |
| Headers | show |
On 20 June 2017 at 00:56, Liviu Dudau <Liviu.Dudau@arm.com> wrote: > Hi Dave, > > Couple of fixes for HDLCD driver to fix an error message when > working with TDA19988 driver and moving the framebuffer's physical > address calculation to use the DRM CMA helper. This pull had a patch that wasn't in the request, and also I get warnings with it. So I didn't pull it. Dave.
Hi Dave, On Tue, Jun 20, 2017 at 11:17:13AM +1000, Dave Airlie wrote: > On 20 June 2017 at 00:56, Liviu Dudau <Liviu.Dudau@arm.com> wrote: > > Hi Dave, > > > > Couple of fixes for HDLCD driver to fix an error message when > > working with TDA19988 driver and moving the framebuffer's physical > > address calculation to use the DRM CMA helper. > > This pull had a patch that wasn't in the request, and also I get > warnings with it. There is a patch on the tip of that branch but it was not intended to be included in the pull request. The request had the start commit id b2ae06ae9834b10ef338fbf17 ("drm/arm: hdlcd: Use CMA helper for plane buffer address calculation") which is one out of two patches that I need to be pulled. Should I drop the af8ae06b51031c80960ccc17 ("drm: hdlcd: Update PM code to save/restore console.") from the branch before sending another pull request? Thanks for helping me out with the process, I'm not too sure what the right thing to do is here! Best regards, Liviu > > So I didn't pull it. > > Dave.
On Tue, Jun 20, 2017 at 10:15 AM, Liviu Dudau <Liviu.Dudau@arm.com> wrote: > > On Tue, Jun 20, 2017 at 11:17:13AM +1000, Dave Airlie wrote: >> On 20 June 2017 at 00:56, Liviu Dudau <Liviu.Dudau@arm.com> wrote: >> > Hi Dave, >> > >> > Couple of fixes for HDLCD driver to fix an error message when >> > working with TDA19988 driver and moving the framebuffer's physical >> > address calculation to use the DRM CMA helper. >> >> This pull had a patch that wasn't in the request, and also I get >> warnings with it. > > There is a patch on the tip of that branch but it was not intended to > be included in the pull request. The request had the start commit id > b2ae06ae9834b10ef338fbf17 ("drm/arm: hdlcd: Use CMA helper for plane > buffer address calculation") which is one out of two patches that I > need to be pulled. Should I drop the af8ae06b51031c80960ccc17 ("drm: > hdlcd: Update PM code to save/restore console.") from the branch > before sending another pull request? > > Thanks for helping me out with the process, I'm not too sure what the > right thing to do is here! Use git tags instead of branches to avoid such confusion. With branches you must not push more patches onto the branch until Dave pulled it. tags are invariant, so make this all a lot easier. Plus bonus: annotated tags can contain the pull request summary and git pull automatically inserts it all into the merge commit, making Dave's life even easier. Shameless plug: the dim scripts we use for drm-intel|misc.git has this all implemented, including neat templates :-) -Daniel
On Tue, Jun 20, 2017 at 10:34:05AM +0200, Daniel Vetter wrote: > On Tue, Jun 20, 2017 at 10:15 AM, Liviu Dudau <Liviu.Dudau@arm.com> wrote: > > > > On Tue, Jun 20, 2017 at 11:17:13AM +1000, Dave Airlie wrote: > >> On 20 June 2017 at 00:56, Liviu Dudau <Liviu.Dudau@arm.com> wrote: > >> > Hi Dave, > >> > > >> > Couple of fixes for HDLCD driver to fix an error message when > >> > working with TDA19988 driver and moving the framebuffer's physical > >> > address calculation to use the DRM CMA helper. > >> > >> This pull had a patch that wasn't in the request, and also I get > >> warnings with it. > > > > There is a patch on the tip of that branch but it was not intended to > > be included in the pull request. The request had the start commit id > > b2ae06ae9834b10ef338fbf17 ("drm/arm: hdlcd: Use CMA helper for plane > > buffer address calculation") which is one out of two patches that I > > need to be pulled. Should I drop the af8ae06b51031c80960ccc17 ("drm: > > hdlcd: Update PM code to save/restore console.") from the branch > > before sending another pull request? > > > > Thanks for helping me out with the process, I'm not too sure what the > > right thing to do is here! > > Use git tags instead of branches to avoid such confusion. With > branches you must not push more patches onto the branch until Dave > pulled it. tags are invariant, so make this all a lot easier. Plus > bonus: annotated tags can contain the pull request summary and git > pull automatically inserts it all into the merge commit, making Dave's > life even easier. Shameless plug: the dim scripts we use for > drm-intel|misc.git has this all implemented, including neat templates Thanks for explaining it, Daniel! Background story here: I did not intend to update the branch until Dave pulled it and initially I wanted to send all 3 patches for v4.13, until Noralf pointed out that top commit could be improved. I thought just dropping that commit from the pull request is a simple matter of not mentioning it in the request, but I can see how it can be confusing. I'll drop the top commit from the branch and also tag the commit I want to be the tip of the pull. Best regards, Liviu > :-) > -Daniel > -- > Daniel Vetter > Software Engineer, Intel Corporation > +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Hi Dave, Couple of fixes for HDLCD driver to fix an error message when working with TDA19988 driver and moving the framebuffer's physical address calculation to use the DRM CMA helper. Best regards, Liviu The following changes since commit 925344ccc91d7a7fd84cab2dece1c34bbd86fd8c: BackMerge tag 'v4.12-rc5' into drm-next (2017-06-16 13:58:27 +1000) are available in the git repository at: git://linux-arm.org/linux-ld.git for-upstream/hdlcd for you to fetch changes up to b2ae06ae9834b10ef338fbf175c262497ad1b796: drm/arm: hdlcd: Use CMA helper for plane buffer address calculation (2017-06-16 14:34:10 +0100) ---------------------------------------------------------------- Liviu Dudau (2): drm/arm: hdlcd: Set the CRTC's port before binding the encoder. drm/arm: hdlcd: Use CMA helper for plane buffer address calculation drivers/gpu/drm/arm/hdlcd_crtc.c | 9 +-------- drivers/gpu/drm/arm/hdlcd_drv.c | 9 +++++++++ 2 files changed, 10 insertions(+), 8 deletions(-)