Em Fri, 28 Jun 2019 15:13:03 +0200 Hans Verkuil <hverk...@xs4all.nl> escreveu:
> On 6/27/19 8:55 PM, Stefan Wahren wrote: > > This is an attempt to help Dave Stevenson to get all the fixes and > > improvements of the bcm2835-camera driver into mainline. > > > > Mostly i only polished the commit logs for upstream. > > > > The series based on the latest bugfix V2 of staging: bcm2835-camera: Resto= > > re > > return behavior of ctrl_set_bitrate(). > > > > Dave Stevenson (31): > > staging: bcm2835-camera: Ensure H264 header bytes get a sensible > > timestamp > > staging: bcm2835-camera: Check the error for REPEAT_SEQ_HEADER > > staging: bcm2835-camera: Replace spinlock protecting context_map with > > mutex > > staging: bcm2835-camera: Do not bulk receive from service thread > > staging: bcm2835-camera: Correctly denote key frames in encoded data > > staging: bcm2835-camera: Return early on errors > > staging: bcm2835-camera: Remove dead email addresses > > staging: bcm2835-camera: Fix comment style violations. > > staging: bcm2835-camera: Fix spacing around operators > > staging: bcm2835-camera: Reduce length of enum names > > staging: bcm2835-camera: Fix multiple line dereference errors > > staging: bcm2835-camera: Fix brace style issues. > > staging: bcm2835-camera: Fix missing lines between items > > staging: bcm2835-camera: Fix open parenthesis alignment > > staging: bcm2835-camera: Ensure all buffers are returned on disable > > staging: bcm2835-camera: Remove check of the number of buffers > > supplied > > staging: bcm2835-camera: Handle empty EOS buffers whilst streaming > > staging: bcm2835-camera: Set sequence number correctly > > staging: bcm2835-camera: Ensure timestamps never go backwards. > > staging: bcm2835-camera: Add multiple inclusion protection to headers > > staging: bcm2835-camera: Unify header inclusion defines > > staging: bcm2835-camera: Fix multiple assignments should be avoided > > staging: bcm2835-camera: Fix up mmal-parameters.h > > staging: bcm2835-camera: Use enums for max value in controls > > staging: bcm2835-camera: Correct V4L2_CID_COLORFX_CBCR behaviour > > staging: bcm2835-camera: Remove/amend some obsolete comments > > staging: mmal-vchiq: Avoid use of bool in structures > > staging: bcm2835-camera: Fix stride on RGB3/BGR3 formats > > staging: bcm2835-camera: Add sanity checks for queue_setup/CREATE_BUFS > > staging: bcm2835-camera: Set the field value within ach buffer > > ach -> each > > > staging: bcm2835-camera: Correct ctrl min/max/step/def to 64bit > > > > .../vc04_services/bcm2835-camera/bcm2835-camera.c | 378 ++++++++++++----= > > ----- > > .../vc04_services/bcm2835-camera/bcm2835-camera.h | 34 +- > > .../vc04_services/bcm2835-camera/controls.c | 184 +++++----- > > .../vc04_services/bcm2835-camera/mmal-common.h | 12 +- > > .../vc04_services/bcm2835-camera/mmal-encodings.h | 9 +- > > .../vc04_services/bcm2835-camera/mmal-msg-common.h | 9 +- > > .../vc04_services/bcm2835-camera/mmal-msg-format.h | 104 +++--- > > .../vc04_services/bcm2835-camera/mmal-msg-port.h | 133 ++++---- > > .../vc04_services/bcm2835-camera/mmal-msg.h | 150 ++++---- > > .../vc04_services/bcm2835-camera/mmal-parameters.h | 286 +++++++++------- > > .../vc04_services/bcm2835-camera/mmal-vchiq.c | 159 +++++---- > > .../vc04_services/bcm2835-camera/mmal-vchiq.h | 22 +- > > 12 files changed, 826 insertions(+), 654 deletions(-) > > > > =2D- > > 2.7.4 > > > > This series looks good. Others made some comments that should be addressed, > and the H264 changes should, I think, be dealt with in a separate patch > series. > > I guess this should go in via Greg? Works for me. I won't be able to handle this before the merge window, as I'll be on PTO next week. > When you make a v2 (excluding the H264 > changes, and incorporating Dan's comments), then you can add my: > > Acked-by: Hans Verkuil <hverkuil-ci...@xs4all.nl> Greg, once the issues get fixed - and if you want to pick this for this merge window, feel fee to pick with my ack: Acked-by: Mauro Carvalho Chehab <mchehab+sams...@kernel.org> Otherwise, if too late for this merge window, It is probably better to apply those against the linux-media tree after -rc1. Thanks, Mauro