Skip to content

fixup! media: apple: avd: make get_ref_buf shared #546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sofus13 wants to merge 1 commit into
base: asahi-wip
Choose a base branch
from
+7 −7
Open

fixup! media: apple: avd: make get_ref_buf shared #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/media/platform/apple/avd/avd-drv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ void avd_buf_free(struct avd_dev *avd, struct avd_buf *buf)
}

struct avd_decoded_buffer *
get_ref_buf(struct avd_ctx *ctx, struct vb2_v4l2_buffer *dst, u64 timestamp)
avd_get_ref_buf(struct avd_ctx *ctx, struct vb2_v4l2_buffer *dst, u64 timestamp)
{
struct v4l2_m2m_ctx *m2m_ctx = ctx->fh.m2m_ctx;
struct vb2_queue *cap_q = &m2m_ctx->cap_q_ctx.q;
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/platform/apple/avd/avd-hevc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static void stream_refs(struct avd_ctx *ctx, struct avd_hevc_run *run)
for (int i = 0; i < decode->num_active_dpb_entries; i++) {
dpb = &decode->dpb[i];

ref_buf = get_ref_buf(ctx, &dst->base.vb, dpb->timestamp);
ref_buf = avd_get_ref_buf(ctx, &dst->base.vb, dpb->timestamp);

dma_addr_t rvra_addr =
vb2_dma_contig_plane_dma_addr(&ref_buf->base.vb.vb2_buf, 0)
Expand Down Expand Up @@ -503,7 +503,7 @@ static void stream_slice_mv(struct avd_ctx *ctx, struct avd_hevc_run *run,
? sl->ref_idx_l0 : sl->ref_idx_l1;

dst = vb2_to_avd_decoded_buf(&run->base.bufs.dst->vb2_buf);
ref = get_ref_buf(ctx, &dst->base.vb,
ref = avd_get_ref_buf(ctx, &dst->base.vb,
decode->dpb[ref_list[sl->collocated_ref_idx]].timestamp);

ref_valid =
Expand Down
6 changes: 3 additions & 3 deletions drivers/media/platform/apple/avd/avd-vp9.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@ static void set_refs(struct avd_ctx *ctx, struct avd_vp9_run *run)

dst = vb2_to_avd_decoded_buf(&run->base.bufs.dst->vb2_buf);

ref_buf[0] = get_ref_buf(ctx, &dst->base.vb, frame->last_frame_ts);
ref_buf[1] = get_ref_buf(ctx, &dst->base.vb, frame->golden_frame_ts);
ref_buf[2] = get_ref_buf(ctx, &dst->base.vb, frame->alt_frame_ts);
ref_buf[0] = avd_get_ref_buf(ctx, &dst->base.vb, frame->last_frame_ts);
ref_buf[1] = avd_get_ref_buf(ctx, &dst->base.vb, frame->golden_frame_ts);
ref_buf[2] = avd_get_ref_buf(ctx, &dst->base.vb, frame->alt_frame_ts);

push(INST_DMA3, "cm3_dma_config_7");
push(INST_DMA3, "cm3_dma_config_8");
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/apple/avd/avd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ vb2_to_avd_decoded_buf(struct vb2_buffer *buf)
return container_of(buf, struct avd_decoded_buffer, base.vb.vb2_buf);
}
struct avd_decoded_buffer *
get_ref_buf(struct avd_ctx *ctx, struct vb2_v4l2_buffer *dst, u64 timestamp);
avd_get_ref_buf(struct avd_ctx *ctx, struct vb2_v4l2_buffer *dst, u64 timestamp);

struct avd_coded_fmt_ops {
void (*adjust_decoded_fmt)(struct avd_ctx *ctx,
Expand Down