Re: [PATCH v3 11/19] media: venus: core: Remove cp_start

[Dikshita Agarwal <quic_dikshita@quicinc.com>]

On 3/27/2024 11:38 PM, Konrad Dybcio wrote:
> It's hardcoded to be zero. Always. Ever since msm-3.10. Or maybe
> even before. Remove it!
> 
> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> ---
>  drivers/media/platform/qcom/venus/core.c     | 4 ----
>  drivers/media/platform/qcom/venus/core.h     | 1 -
>  drivers/media/platform/qcom/venus/firmware.c | 3 +--
>  3 files changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
> index 5d41ecddcef6..b10d083b8b17 100644
> --- a/drivers/media/platform/qcom/venus/core.c
> +++ b/drivers/media/platform/qcom/venus/core.c
> @@ -647,7 +647,6 @@ static const struct venus_resources sdm660_res = {
>  	.vcodec_clks_num = 1,
>  	.max_load = 1036800,
>  	.hfi_version = HFI_VERSION_3XX,
> -	.cp_start = 0,
>  	.cp_size = 0x79000000,
>  	.cp_nonpixel_start = 0x1000000,
>  	.cp_nonpixel_size = 0x28000000,
> @@ -716,7 +715,6 @@ static const struct venus_resources sdm845_res_v2 = {
>  	.hfi_version = HFI_VERSION_4XX,
>  	.vpu_version = VPU_VERSION_AR50,
>  	.dma_mask = GENMASK(31, 29) - 1,
> -	.cp_start = 0,
>  	.cp_size = 0x70800000,
>  	.cp_nonpixel_start = 0x1000000,
>  	.cp_nonpixel_size = 0x24800000,
> @@ -760,7 +758,6 @@ static const struct venus_resources sc7180_res = {
>  	.hfi_version = HFI_VERSION_4XX,
>  	.vpu_version = VPU_VERSION_AR50,
>  	.dma_mask = GENMASK(31, 29) - 1,
> -	.cp_start = 0,
>  	.cp_size = 0x70800000,
>  	.cp_nonpixel_start = 0x1000000,
>  	.cp_nonpixel_size = 0x24800000,
> @@ -869,7 +866,6 @@ static const struct venus_resources sc7280_res = {
>  	.vpu_version = VPU_VERSION_IRIS2_1,
>  	.num_vpp_pipes = 1,
>  	.dma_mask = GENMASK(31, 29) - 1,
> -	.cp_start = 0,
>  	.cp_size = 0x25800000,
>  	.cp_nonpixel_start = 0x1000000,
>  	.cp_nonpixel_size = 0x24800000,
> diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
> index e083ebb3ab4b..19908f028441 100644
> --- a/drivers/media/platform/qcom/venus/core.h
> +++ b/drivers/media/platform/qcom/venus/core.h
> @@ -80,7 +80,6 @@ struct venus_resources {
>  	enum vpu_version vpu_version;
>  	u8 num_vpp_pipes;
>  	u32 max_load;
> -	u32 cp_start;
>  	u32 cp_size;
>  	u32 cp_nonpixel_start;
>  	u32 cp_nonpixel_size;
> diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c
> index fe7da2b30482..16e578780be7 100644
> --- a/drivers/media/platform/qcom/venus/firmware.c
> +++ b/drivers/media/platform/qcom/venus/firmware.c
> @@ -245,7 +245,6 @@ int venus_boot(struct venus_core *core)
>  	if (core->use_tz && res->cp_size) {
>  		/*
>  		 * Clues for porting using downstream data:
> -		 * cp_start = 0
>  		 * cp_size = venus_ns/virtual-addr-pool[0] - yes, address and not size!
>  		 *   This works, as the non-secure context bank is placed
>  		 *   contiguously right after the Content Protection region.
> @@ -253,7 +252,7 @@ int venus_boot(struct venus_core *core)
>  		 * cp_nonpixel_start = venus_sec_non_pixel/virtual-addr-pool[0]
>  		 * cp_nonpixel_size = venus_sec_non_pixel/virtual-addr-pool[1]
>  		 */
> -		ret = qcom_scm_mem_protect_video_var(res->cp_start,
> +		ret = qcom_scm_mem_protect_video_var(0,
>  						     res->cp_size,
>  						     res->cp_nonpixel_start,
>  						     res->cp_nonpixel_size);
> 
Reviewed-by: Dikshita Agarwal <quic_dikshita@quicinc.com>