2024-03-27 18:12:13

by Konrad Dybcio

[permalink] [raw]
Subject: [PATCH v3 10/19] media: venus: core: Use GENMASK for dma_mask

The raw literals mean very little. Substitute it with more telling
bitops macros.

Reviewed-by: Bryan O'Donoghue <[email protected]>
Signed-off-by: Konrad Dybcio <[email protected]>
---
drivers/media/platform/qcom/venus/core.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 51ac9eff244c..5d41ecddcef6 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -562,7 +562,7 @@ static const struct venus_resources msm8916_res = {
.clks_num = 3,
.max_load = 352800, /* 720p@30 + 1080p@30 */
.hfi_version = HFI_VERSION_1XX,
- .dma_mask = 0xddc00000 - 1,
+ .dma_mask = (GENMASK(31, 30) | GENMASK(28, 26) | GENMASK(24, 22)) - 1,
.fwname = "qcom/venus-1.8/venus.mbn",
};

@@ -592,7 +592,7 @@ static const struct venus_resources msm8996_res = {
.vcodec_clks_num = 1,
.max_load = 2563200,
.hfi_version = HFI_VERSION_3XX,
- .dma_mask = 0xddc00000 - 1,
+ .dma_mask = (GENMASK(31, 30) | GENMASK(28, 26) | GENMASK(24, 22)) - 1,
.fwname = "qcom/venus-4.2/venus.mbn",
};

@@ -693,7 +693,7 @@ static const struct venus_resources sdm845_res = {
.max_load = 3110400, /* 4096x2160@90 */
.hfi_version = HFI_VERSION_4XX,
.vpu_version = VPU_VERSION_AR50,
- .dma_mask = 0xe0000000 - 1,
+ .dma_mask = GENMASK(31, 29) - 1,
.fwname = "qcom/venus-5.2/venus.mbn",
};

@@ -715,7 +715,7 @@ static const struct venus_resources sdm845_res_v2 = {
.max_load = 3110400, /* 4096x2160@90 */
.hfi_version = HFI_VERSION_4XX,
.vpu_version = VPU_VERSION_AR50,
- .dma_mask = 0xe0000000 - 1,
+ .dma_mask = GENMASK(31, 29) - 1,
.cp_start = 0,
.cp_size = 0x70800000,
.cp_nonpixel_start = 0x1000000,
@@ -759,7 +759,7 @@ static const struct venus_resources sc7180_res = {
.opp_pmdomain = pd_names_cx,
.hfi_version = HFI_VERSION_4XX,
.vpu_version = VPU_VERSION_AR50,
- .dma_mask = 0xe0000000 - 1,
+ .dma_mask = GENMASK(31, 29) - 1,
.cp_start = 0,
.cp_size = 0x70800000,
.cp_nonpixel_start = 0x1000000,
@@ -814,7 +814,7 @@ static const struct venus_resources sm8250_res = {
.hfi_version = HFI_VERSION_6XX,
.vpu_version = VPU_VERSION_IRIS2,
.num_vpp_pipes = 4,
- .dma_mask = 0xe0000000 - 1,
+ .dma_mask = GENMASK(31, 29) - 1,
.fwname = "qcom/vpu-1.0/venus.mbn",
};

@@ -868,7 +868,7 @@ static const struct venus_resources sc7280_res = {
.hfi_version = HFI_VERSION_6XX,
.vpu_version = VPU_VERSION_IRIS2_1,
.num_vpp_pipes = 1,
- .dma_mask = 0xe0000000 - 1,
+ .dma_mask = GENMASK(31, 29) - 1,
.cp_start = 0,
.cp_size = 0x25800000,
.cp_nonpixel_start = 0x1000000,

--
2.44.0



2024-04-05 08:00:26

by Dikshita Agarwal

[permalink] [raw]
Subject: Re: [PATCH v3 10/19] media: venus: core: Use GENMASK for dma_mask



On 3/27/2024 11:38 PM, Konrad Dybcio wrote:
> The raw literals mean very little. Substitute it with more telling
> bitops macros.
>
> Reviewed-by: Bryan O'Donoghue <[email protected]>
> Signed-off-by: Konrad Dybcio <[email protected]>
> ---
> drivers/media/platform/qcom/venus/core.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
> index 51ac9eff244c..5d41ecddcef6 100644
> --- a/drivers/media/platform/qcom/venus/core.c
> +++ b/drivers/media/platform/qcom/venus/core.c
> @@ -562,7 +562,7 @@ static const struct venus_resources msm8916_res = {
> .clks_num = 3,
> .max_load = 352800, /* 720p@30 + 1080p@30 */
> .hfi_version = HFI_VERSION_1XX,
> - .dma_mask = 0xddc00000 - 1,
> + .dma_mask = (GENMASK(31, 30) | GENMASK(28, 26) | GENMASK(24, 22)) - 1,
> .fwname = "qcom/venus-1.8/venus.mbn",
> };
>
> @@ -592,7 +592,7 @@ static const struct venus_resources msm8996_res = {
> .vcodec_clks_num = 1,
> .max_load = 2563200,
> .hfi_version = HFI_VERSION_3XX,
> - .dma_mask = 0xddc00000 - 1,
> + .dma_mask = (GENMASK(31, 30) | GENMASK(28, 26) | GENMASK(24, 22)) - 1,
> .fwname = "qcom/venus-4.2/venus.mbn",
> };
>
> @@ -693,7 +693,7 @@ static const struct venus_resources sdm845_res = {
> .max_load = 3110400, /* 4096x2160@90 */
> .hfi_version = HFI_VERSION_4XX,
> .vpu_version = VPU_VERSION_AR50,
> - .dma_mask = 0xe0000000 - 1,
> + .dma_mask = GENMASK(31, 29) - 1,
> .fwname = "qcom/venus-5.2/venus.mbn",
> };
>
> @@ -715,7 +715,7 @@ static const struct venus_resources sdm845_res_v2 = {
> .max_load = 3110400, /* 4096x2160@90 */
> .hfi_version = HFI_VERSION_4XX,
> .vpu_version = VPU_VERSION_AR50,
> - .dma_mask = 0xe0000000 - 1,
> + .dma_mask = GENMASK(31, 29) - 1,
> .cp_start = 0,
> .cp_size = 0x70800000,
> .cp_nonpixel_start = 0x1000000,
> @@ -759,7 +759,7 @@ static const struct venus_resources sc7180_res = {
> .opp_pmdomain = pd_names_cx,
> .hfi_version = HFI_VERSION_4XX,
> .vpu_version = VPU_VERSION_AR50,
> - .dma_mask = 0xe0000000 - 1,
> + .dma_mask = GENMASK(31, 29) - 1,
> .cp_start = 0,
> .cp_size = 0x70800000,
> .cp_nonpixel_start = 0x1000000,
> @@ -814,7 +814,7 @@ static const struct venus_resources sm8250_res = {
> .hfi_version = HFI_VERSION_6XX,
> .vpu_version = VPU_VERSION_IRIS2,
> .num_vpp_pipes = 4,
> - .dma_mask = 0xe0000000 - 1,
> + .dma_mask = GENMASK(31, 29) - 1,
> .fwname = "qcom/vpu-1.0/venus.mbn",
> };
>
> @@ -868,7 +868,7 @@ static const struct venus_resources sc7280_res = {
> .hfi_version = HFI_VERSION_6XX,
> .vpu_version = VPU_VERSION_IRIS2_1,
> .num_vpp_pipes = 1,
> - .dma_mask = 0xe0000000 - 1,
> + .dma_mask = GENMASK(31, 29) - 1,
> .cp_start = 0,
> .cp_size = 0x25800000,
> .cp_nonpixel_start = 0x1000000,
>
Reviewed-by: Dikshita Agarwal <[email protected]>