CFE/Unicam: Fix breakage from #7406#7444
Merged
Merged
Conversation
…mats The commit 08f9794 ("media: bcm2835-unicam: Fix RGB format / mbus code association") introduced a check to see whether the format requested is the same as the fourcc in the format list. However, this breaks the case when userspace requested an unpacked fourcc, e.g. RG10. Unicam can work with or without unpacking pixels, e.g. pRAA or RG10, depending on what userspace requests. In the unpacking case, a dedicated register is being set. If the userspace requests pRAA, this works, because the check validates the pipeline: v4l2-ctl -d /dev/video0 --set-fmt-video=width=3280,height=2464,pixelformat=pRAA \ --stream-mmap --stream-count=1 --stream-to=frame.raw but, with v4l2-ctl -d /dev/video0 --set-fmt-video=width=3280,height=2464,pixelformat=RG10 \ --stream-mmap --stream-count=1 --stream-to=frame.raw unicam complains at validation level: image: format mismatch: 0x300f <=> RG10 little-endian (0x30314752) This should work, because MEDIA_BUS_FMT_SRGGB10_1X10 can be packed into either RG10 or pRAA depending on the packing register. To fix this, modified the condition check to also allow in the case when requested format (fmt->pixelformat) is equal to fmtinfo->unpacked_fourcc. Fixes: 08f9794 ("media: bcm2835-unicam: Fix RGB format / mbus code association") Signed-off-by: Eugen Hristev <ehristev@kernel.org> Reviewed-by: Jai Luthra <jai.luthra@ideasonboard.com> Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Commit 67f3a61 ("media: rp1-cfe-downstream: Fix RGB format / mbus code association") missed the handling of the unpacked and compressed output formats in the same way the original Unicam patch did. Fix it. Fixes: 67f3a61 ("media: rp1-cfe-downstream: Fix RGB format / mbus code association") Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Commit e552091 ("media: rp1-cfe: Fix RGB format / mbus code association") missed the handling of the unpacked and compressed output formats in the same way the original Unicam patch did. Fix it. Fixes: e552091 ("media: rp1-cfe: Fix RGB format / mbus code association") Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I missed a follow up patch from upstream in #7406, and then copied the same error into the CFE driver.
Fix them up. (The Unicam patch hasn't been accepted and merged upstream, but has R-b responses).