Skip to content

Restore rp1-cfe and hevc_d changes reverted by 113a659b4662 - #7684

Merged
popcornmix merged 2 commits into
raspberrypi:rpi-6.18.yfrom
popcornmix:rp1-cfe-restore
Oct 15, 2026
Merged

popcornmix merged 2 commits into
raspberrypi:rpi-6.18.yfrom
popcornmix:rp1-cfe-restore

Conversation

@popcornmix

Copy link
Copy Markdown
Collaborator

Commit 113a659 ("drm/vc4: Don't assume 4:2:0 subsampling in the scaler phase calculation") inadvertently reverted two unrelated changes:

  • 3d107ae ("media: rp1-cfe: Add an unbind callback to tear down the graph")
  • 4bb2406 ("media/hevc_d: Do not reject slice header with bad ref_idx entries")

This restores both.

Commit 113a659 ("drm/vc4: Don't assume 4:2:0 subsampling in the
scaler phase calculation") inadvertently reverted the rp1-cfe changes
from commit 3d107ae ("media: rp1-cfe: Add an unbind callback to
tear down the graph"). Restore them.

Fixes: 113a659 ("drm/vc4: Don't assume 4:2:0 subsampling in the scaler phase calculation")
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
Commit 113a659 ("drm/vc4: Don't assume 4:2:0 subsampling in the
scaler phase calculation") inadvertently reverted commit 4bb2406
("media/hevc_d: Do not reject slice header with bad ref_idx entries").
Restore it.

Fixes: 113a659 ("drm/vc4: Don't assume 4:2:0 subsampling in the scaler phase calculation")
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
@popcornmix
popcornmix merged commit a1a601d into raspberrypi:rpi-6.18.y Oct 15, 2026
12 checks passed
@popcornmix
popcornmix deleted the rp1-cfe-restore branch October 15, 2026 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants