mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 21:39:02 +00:00
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
57 lines
2.3 KiB
Diff
57 lines
2.3 KiB
Diff
From e9a5a945f942f149e482132783203884c1ac9cf0 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Tue, 5 Nov 2019 23:09:18 +0000
|
|
Subject: [PATCH] WIP: media: hantro: vp8 src_fmt
|
|
|
|
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
|
|
---
|
|
drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 4 ++--
|
|
drivers/staging/media/hantro/hantro_vp8.c | 4 ++--
|
|
drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c | 4 ++--
|
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/staging/media/hantro/hantro_g1_vp8_dec.c b/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
|
|
index cad18094fee0..5acc1b14f734 100644
|
|
--- a/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
|
|
+++ b/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
|
|
@@ -430,8 +430,8 @@ void hantro_g1_vp8_dec_run(struct hantro_ctx *ctx)
|
|
{
|
|
const struct v4l2_ctrl_vp8_frame_header *hdr;
|
|
struct hantro_dev *vpu = ctx->dev;
|
|
- size_t height = ctx->dst_fmt.height;
|
|
- size_t width = ctx->dst_fmt.width;
|
|
+ size_t height = ctx->src_fmt.height;
|
|
+ size_t width = ctx->src_fmt.width;
|
|
u32 mb_width, mb_height;
|
|
u32 reg;
|
|
|
|
diff --git a/drivers/staging/media/hantro/hantro_vp8.c b/drivers/staging/media/hantro/hantro_vp8.c
|
|
index 0e02d147b189..e010c9088fde 100644
|
|
--- a/drivers/staging/media/hantro/hantro_vp8.c
|
|
+++ b/drivers/staging/media/hantro/hantro_vp8.c
|
|
@@ -151,8 +151,8 @@ int hantro_vp8_dec_init(struct hantro_ctx *ctx)
|
|
int ret;
|
|
|
|
/* segment map table size calculation */
|
|
- mb_width = DIV_ROUND_UP(ctx->dst_fmt.width, 16);
|
|
- mb_height = DIV_ROUND_UP(ctx->dst_fmt.height, 16);
|
|
+ mb_width = MB_WIDTH(ctx->src_fmt.width);
|
|
+ mb_height = MB_HEIGHT(ctx->src_fmt.height);
|
|
segment_map_size = round_up(DIV_ROUND_UP(mb_width * mb_height, 4), 64);
|
|
|
|
/*
|
|
diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c b/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c
|
|
index 76d7ed3fd69a..458f1f1f43ad 100644
|
|
--- a/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c
|
|
+++ b/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c
|
|
@@ -508,8 +508,8 @@ void rk3399_vpu_vp8_dec_run(struct hantro_ctx *ctx)
|
|
{
|
|
const struct v4l2_ctrl_vp8_frame_header *hdr;
|
|
struct hantro_dev *vpu = ctx->dev;
|
|
- size_t height = ctx->dst_fmt.height;
|
|
- size_t width = ctx->dst_fmt.width;
|
|
+ size_t height = ctx->src_fmt.height;
|
|
+ size_t width = ctx->src_fmt.width;
|
|
u32 mb_width, mb_height;
|
|
u32 reg;
|
|
|