Message ID | 20161129025503.13658-1-stefan@agner.ch |
---|---|
State | New |
Headers | show |
Hi Dave, On 2016-11-28 18:55, Stefan Agner wrote: > Hi Dave, > > Some fixes and cleanup, mainly around fbdev emulation. It also adds a > new module parameter which allows to specify the color depth/bpp for > the fbdev emulation (like the IMX DRM driver). > > There have been some fixes in that driver which are not yet in > drm-next, but it seems to merge cleanly... Friendly reminder... Or any specific reason you did not merge that yet? -- Stefan > > -- > Stefan > > > The following changes since commit 7625e05286cf3f37c8a5e633379a4d014ddbe555: > > Merge branch 'drm-tda998x-devel' of > git://git.armlinux.org.uk/~rmk/linux-arm into drm-next (2016-11-25 > 09:55:33 +1000) > > are available in the git repository at: > > http://git.agner.ch/git/linux-drm-fsl-dcu.git > 73fe26a48659abd2b85d2f87d3cf2400ddb313d7 > > for you to fetch changes up to 73fe26a48659abd2b85d2f87d3cf2400ddb313d7: > > drm/fsl-dcu: introduce kernel parameter to specify fbdev depth > (2016-11-28 17:33:59 -0800) > > ---------------------------------------------------------------- > Fabio Estevam (2): > drm/fsl-dcu: Remove unneeded NULL check > drm/fsl-dcu: Propagate the real error code > > Stefan Agner (4): > drm/fsl-dcu: unload driver before disabling clocks > drm/fsl-dcu: disable outputs before unloading driver > drm/fsl-dcu: remove separate compilation unit for fbdev emulation > drm/fsl-dcu: introduce kernel parameter to specify fbdev depth > > drivers/gpu/drm/fsl-dcu/Makefile | 1 - > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 26 ++++++++++++++++++-------- > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 1 - > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c | 23 ----------------------- > 4 files changed, 18 insertions(+), 33 deletions(-) > delete mode 100644 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c
On 7 December 2016 at 11:51, Stefan Agner <stefan@agner.ch> wrote: > Hi Dave, > > On 2016-11-28 18:55, Stefan Agner wrote: >> Hi Dave, >> >> Some fixes and cleanup, mainly around fbdev emulation. It also adds a >> new module parameter which allows to specify the color depth/bpp for >> the fbdev emulation (like the IMX DRM driver). >> >> There have been some fixes in that driver which are not yet in >> drm-next, but it seems to merge cleanly... > > Friendly reminder... Or any specific reason you did not merge that yet? There was a reason this failed to work when I tried but I can't remember why now, however in future can you use tags as it makes the merge nicer to read, instead of having just a git SHA in the pull request. Dave.
On 7 December 2016 at 12:44, Dave Airlie <airlied@gmail.com> wrote: > On 7 December 2016 at 11:51, Stefan Agner <stefan@agner.ch> wrote: >> Hi Dave, >> >> On 2016-11-28 18:55, Stefan Agner wrote: >>> Hi Dave, >>> >>> Some fixes and cleanup, mainly around fbdev emulation. It also adds a >>> new module parameter which allows to specify the color depth/bpp for >>> the fbdev emulation (like the IMX DRM driver). >>> >>> There have been some fixes in that driver which are not yet in >>> drm-next, but it seems to merge cleanly... >> >> Friendly reminder... Or any specific reason you did not merge that yet? > > There was a reason this failed to work when I tried but I can't > remember why now, > > however in future can you use tags as it makes the merge nicer to > read, instead of having > just a git SHA in the pull request. Actually can you please regenerate with a tag now, git pull --log --no-ff http://git.agner.ch/git/linux-drm-fsl-dcu.git 73fe26a48659abd2b85d2f87d3cf2400ddb313d7 error: no such remote ref 73fe26a48659abd2b85d2f87d3cf2400ddb313d Dave.