Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84b72f1c authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Allocate dsp hfi queues from cdsp memory"

parents c78e874c a8b35d91

arch/arm64/boot/dts/qcom/sm8150-vidc.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -128,5 +128,10 @@ 
			compatible = "qcom,msm-vidc,mem-adsp";

			memory-region = <&adsp_mem>;

		};



		qcom,msm-vidc,mem_cdsp {

			compatible = "qcom,msm-vidc,mem-cdsp";

			memory-region = <&cdsp_mem>;

		};

	};

};

drivers/media/platform/msm/vidc/msm_v4l2_vidc.c

+5 −5
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static const struct of_device_id msm_vidc_dt_match[] = { 
	{.compatible = "qcom,msm-vidc"},

	{.compatible = "qcom,msm-vidc,context-bank"},

	{.compatible = "qcom,msm-vidc,bus"},

	{.compatible = "qcom,msm-vidc,mem-adsp"},

	{.compatible = "qcom,msm-vidc,mem-cdsp"},

	{}

};
@@ -680,9 +680,9 @@ static int msm_vidc_probe_vidc_device(struct platform_device *pdev) 
	return rc;

}



static int msm_vidc_probe_mem_adsp(struct platform_device *pdev)

static int msm_vidc_probe_mem_cdsp(struct platform_device *pdev)

{

	return read_mem_adsp_resources_from_dt(pdev);

	return read_mem_cdsp_resources_from_dt(pdev);

}



static int msm_vidc_probe_context_bank(struct platform_device *pdev)
@@ -711,8 +711,8 @@ static int msm_vidc_probe(struct platform_device *pdev) 
		"qcom,msm-vidc,context-bank")) {

		return msm_vidc_probe_context_bank(pdev);

	} else if (of_device_is_compatible(pdev->dev.of_node,

		"qcom,msm-vidc,mem-adsp")) {

		return msm_vidc_probe_mem_adsp(pdev);

		"qcom,msm-vidc,mem-cdsp")) {

		return msm_vidc_probe_mem_cdsp(pdev);

	}



	/* How did we end up here? */

drivers/media/platform/msm/vidc/msm_vidc_res_parse.c

+4 −4
Original line number Diff line number Diff line
@@ -377,10 +377,10 @@ static int msm_vidc_load_allowed_clocks_table( 
	return 0;

}



static int msm_vidc_populate_mem_adsp(struct device *dev,

static int msm_vidc_populate_mem_cdsp(struct device *dev,

		struct msm_vidc_platform_resources *res)

{

	res->mem_adsp.dev = dev;

	res->mem_cdsp.dev = dev;



	return 0;

}
@@ -1288,7 +1288,7 @@ int read_bus_resources_from_dt(struct platform_device *pdev) 
	return msm_vidc_populate_bus(&pdev->dev, &core->resources);

}



int read_mem_adsp_resources_from_dt(struct platform_device *pdev)

int read_mem_cdsp_resources_from_dt(struct platform_device *pdev)

{

	struct msm_vidc_core *core;
@@ -1308,5 +1308,5 @@ int read_mem_adsp_resources_from_dt(struct platform_device *pdev) 
		return -EINVAL;

	}



	return msm_vidc_populate_mem_adsp(&pdev->dev, &core->resources);

	return msm_vidc_populate_mem_cdsp(&pdev->dev, &core->resources);

}

drivers/media/platform/msm/vidc/msm_vidc_res_parse.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ int read_platform_resources_from_dt( 
int read_context_bank_resources_from_dt(struct platform_device *pdev);



int read_bus_resources_from_dt(struct platform_device *pdev);

int read_mem_adsp_resources_from_dt(struct platform_device *pdev);

int read_mem_cdsp_resources_from_dt(struct platform_device *pdev);



int msm_vidc_load_u32_table(struct platform_device *pdev,

		struct device_node *of_node, char *table_name, int struct_size,

drivers/media/platform/msm/vidc/msm_vidc_resources.h

+2 −2
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ struct subcache_set { 
	u32 count;

};



struct msm_vidc_mem_adsp {

struct msm_vidc_mem_cdsp {

	struct device *dev;

};
@@ -196,7 +196,7 @@ struct msm_vidc_platform_resources { 
	struct msm_vidc_codec_data *codec_data;

	int codec_data_count;

	struct msm_vidc_csc_coeff *csc_coeff_data;

	struct msm_vidc_mem_adsp mem_adsp;

	struct msm_vidc_mem_cdsp mem_cdsp;

};



static inline bool is_iommu_present(struct msm_vidc_platform_resources *res)