cc7ab6a6b1
* Attach Meson64 to mainline with a bunch of patches. Tested, but need further work. * Enable DVFS on N2 which sometimes works, sometime doesn't, cleanup * Enable beta targets for Meson64 kernel family * Bump with version
36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
From 90ce9c74ea9d30a855cfadb314a2aa82e986676a Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Tue, 5 Nov 2019 23:06:34 +0000
|
|
Subject: [PATCH] WIP: media: hantro: g1 mpeg2 src_fmt
|
|
|
|
Fixes: ceaac6dc5b7a
|
|
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
|
|
---
|
|
drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c b/drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c
|
|
index f3bf67d8a289..c20d74d4a55e 100644
|
|
--- a/drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c
|
|
+++ b/drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c
|
|
@@ -125,7 +125,7 @@ hantro_g1_mpeg2_dec_set_buffers(struct hantro_dev *vpu, struct hantro_ctx *ctx,
|
|
current_addr = addr;
|
|
|
|
if (picture->picture_structure == PICT_BOTTOM_FIELD)
|
|
- addr += ALIGN(ctx->dst_fmt.width, 16);
|
|
+ addr += ALIGN(ctx->src_fmt.width, MB_DIM);
|
|
vdpu_write_relaxed(vpu, addr, G1_REG_DEC_OUT_BASE);
|
|
|
|
if (!forward_addr)
|
|
@@ -204,8 +204,8 @@ void hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx)
|
|
G1_REG_DEC_AXI_WR_ID(0);
|
|
vdpu_write_relaxed(vpu, reg, G1_SWREG(3));
|
|
|
|
- reg = G1_REG_PIC_MB_WIDTH(MB_WIDTH(ctx->dst_fmt.width)) |
|
|
- G1_REG_PIC_MB_HEIGHT_P(MB_HEIGHT(ctx->dst_fmt.height)) |
|
|
+ reg = G1_REG_PIC_MB_WIDTH(MB_WIDTH(ctx->src_fmt.width)) |
|
|
+ G1_REG_PIC_MB_HEIGHT_P(MB_HEIGHT(ctx->src_fmt.height)) |
|
|
G1_REG_ALT_SCAN_E(picture->alternate_scan) |
|
|
G1_REG_TOPFIELDFIRST_E(picture->top_field_first);
|
|
vdpu_write_relaxed(vpu, reg, G1_SWREG(4));
|