commit | 45fe6c4f1d0a59ab96093daf78137549ab6a4e84 | [log] [tgz] |
---|---|---|
author | Alexandre Courbot <acourbot@chromium.org> | Wed Nov 10 02:38:53 2021 |
committer | Commit Bot <commit-bot@chromium.org> | Wed Nov 10 20:34:27 2021 |
tree | fa71ca9026caf097edd340ab194f09fdaeced3d7 | |
parent | aece4de8872bd5651851b3d0eae02e01830f566a [diff] |
Revert "CHROMIUM: drivers: media: virtio: fix reported V4L2 planes layout" This reverts commit 82e4012a8ae5c8468ee5b84cda09134a10167dd5. Reason for revert: ARCVM encoder stops functioning because it still expects the old (incorrect) format description. BUG=b:205488531 BUG=b:205356442 TEST=ARCVM encoder works again. Original change's description: > CHROMIUM: drivers: media: virtio: fix reported V4L2 planes layout > > There is a mismatch between the way virtio-video and V4L2 define their > planes. For virtio-video, a plane is always a color plane, and whether > color planes are grouped together in a single buffer is set by an > attribute. For V4L2, a plane is a buffer that can contain one or several > color planes. > > V4L2 uses this latter definition for the "planes" it reports to > user-space, but the driver currently unconditionally maps the virtio > color planes to V4L2 plane buffers, despite always using the > SINGLE_BUFFER layout when communicating formats to the host. This > results in incorrect information being given to user-space, e.g. the > NV12 pixel format having 3 planes (NV12 in V4L2 is always single buffer, > its multi-buffer variant is called NV12M). > > Fix this by aggregating the virtio-planes into a single buffer to > conform to what V4L2 expects. > > Signed-off-by: Alexandre Courbot <acourbot@chromium.org> > > BUG=b:161774071 > TEST=Android Youtube can play videos on Hatch. > > Change-Id: I99c8a7dde58c9048a4f7a08c3925bc6a2626f543 > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3247492 > Auto-Submit: Alexandre Courbot <acourbot@chromium.org> > Tested-by: Alexandre Courbot <acourbot@chromium.org> > Commit-Queue: Alexandre Courbot <acourbot@chromium.org> > Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> # Not skipping CQ checks because original CL landed > 1 day ago. Bug: b:161774071 Change-Id: I8ed8bf6fae1e89a053fce1e7d8b6c78ddf4d17df Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3271531 Reviewed-by: Alexandre Courbot <acourbot@chromium.org> Reviewed-by: David Staessens <dstaessens@chromium.org> Commit-Queue: Alexandre Courbot <acourbot@chromium.org> Tested-by: Alexandre Courbot <acourbot@chromium.org>
BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases. These patches will be merged automatically in the corresponding common kernels. If the patch is already in upstream Linux, post a backport of the patch that conforms to the patch requirements below.
EXPORT_SYMBOL_GPL()
require an in-tree modular driver that uses the symbol -- so include the new driver or changes to an existing driver in the same patchset as the export.LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.
script/checkpatch.pl
UPSTREAM:
, BACKPORT:
, FROMGIT:
, FROMLIST:
, or ANDROID:
.Change-Id:
tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)Bug:
tag.Signed-off-by:
tag by the author and the submitterAdditional requirements are listed below based on patch type
UPSTREAM:
, BACKPORT:
UPSTREAM:
.(cherry picked from commit ...)
lineimportant patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org>
- then Joe Smith would upload the patch for the common kernel as
UPSTREAM: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) Signed-off-by: Joe Smith <joe.smith@foo.org>
BACKPORT:
instead of UPSTREAM:
.UPSTREAM:
(cherry picked from commit ...)
lineBACKPORT: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) [joe: Resolved minor conflict in drivers/foo/bar.c ] Signed-off-by: Joe Smith <joe.smith@foo.org>
FROMGIT:
, FROMLIST:
,FROMGIT:
(cherry picked from commit <sha1> <repo> <branch>)
. This must be a stable maintainer branch (not rebased, so don't use linux-next
for example).BACKPORT: FROMGIT:
important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org>
- then Joe Smith would upload the patch for the common kernel as
FROMGIT: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 (cherry picked from commit 878a2fd9de10b03d11d2f622250285c7e63deace https://git.kernel.org/pub/scm/linux/kernel/git/foo/bar.git test-branch) Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
FROMLIST:
Link:
tag with a link to the submittal on lore.kernel.orgBug:
tag with the Android bug (required for patches not accepted into a maintainer tree)BACKPORT: FROMLIST:
FROMLIST: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Link: https://lore.kernel.org/lkml/20190619171517.GA17557@someone.com/ Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
ANDROID:
ANDROID:
Fixes:
tag that cites the patch with the bugANDROID: fix android-specific bug in foobar.c This is the detailed description of the important fix Fixes: 1234abcd2468 ("foobar: add cool feature") Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
ANDROID:
Bug:
tag with the Android bug (required for android-specific features)