54 lines
2.4 KiB
Diff
54 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Sabatino <[email protected]>
|
|
Date: Tue, 16 Sep 2025 14:21:22 +0200
|
|
Subject: fix vdpu381/383 compilation on 32 bit archs
|
|
|
|
---
|
|
drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c | 2 +-
|
|
drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c | 2 +-
|
|
drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c
|
|
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c
|
|
@@ -439,7 +439,7 @@ static int rkvdec_h264_run(struct rkvdec_ctx *ctx)
|
|
unsigned long axi_rate = clk_get_rate(rkvdec->axi_clk);
|
|
|
|
if (axi_rate)
|
|
- watchdog_time = 2 * (1000 * timeout_threshold) / axi_rate;
|
|
+ watchdog_time = div_u64(2 * (1000 * timeout_threshold), axi_rate);
|
|
else
|
|
watchdog_time = 2000;
|
|
schedule_delayed_work(&rkvdec->watchdog_work,
|
|
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c
|
|
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c
|
|
@@ -550,7 +550,7 @@ static int rkvdec_h264_run(struct rkvdec_ctx *ctx)
|
|
axi_rate = clk_get_rate(rkvdec->axi_clk);
|
|
|
|
if (axi_rate)
|
|
- watchdog_time = 2 * (1000 * timeout_threshold) / axi_rate;
|
|
+ watchdog_time = div_u64(2 * (1000 * timeout_threshold), axi_rate);
|
|
else
|
|
watchdog_time = 2000;
|
|
schedule_delayed_work(&rkvdec->watchdog_work,
|
|
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c
|
|
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c
|
|
@@ -656,7 +656,7 @@ static int rkvdec_hevc_run(struct rkvdec_ctx *ctx)
|
|
axi_rate = clk_get_rate(rkvdec->axi_clk);
|
|
|
|
if (axi_rate)
|
|
- watchdog_time = 2 * (1000 * timeout_threshold) / axi_rate;
|
|
+ watchdog_time = div_u64(2 * (1000 * timeout_threshold), axi_rate);
|
|
else
|
|
watchdog_time = 2000;
|
|
schedule_delayed_work(&rkvdec->watchdog_work,
|
|
--
|
|
Armbian
|
|
|