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

Commit f2912d45 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: add property to select dpu smmu mapping based on hw... 

Merge "drm/msm/sde: add property to select dpu smmu mapping based on hw version" into dev/msm-4.14-display
parents 59fedb7a 093f9b18

Documentation/devicetree/bindings/display/msm/sde.txt

+3 −0
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ Optional properties: 
				feature is available or not.

- qcom,sde-has-idle-pc:		Boolean property to indicate if target has idle

				power collapse feature available or not.

- qcom,fullsize-va-map:		Boolean property to indicate smmu mapping range

				for mdp should be full range (4GB).

- qcom,sde-has-mixer-gc:	Boolean property to indicate if mixer has gamma correction

				feature available or not.

- qcom,sde-has-dest-scaler: 	Boolean property to indicate if destination scaler
@@ -602,6 +604,7 @@ Example: 
    qcom,sde-highest-bank-bit = <15>;

    qcom,sde-has-mixer-gc;

    qcom,sde-has-idle-pc;

    qcom,fullsize-va-map;

    qcom,sde-has-dest-scaler;

    qcom,sde-max-dest-scaler-input-linewidth = <2048>;

    qcom,sde-max-dest-scaler-output-linewidth = <2560>;

drivers/gpu/drm/msm/msm_smmu.c

+8 −0
Original line number Diff line number Diff line
@@ -407,11 +407,19 @@ struct msm_mmu *msm_smmu_new(struct device *dev, 
{

	struct msm_smmu *smmu;

	struct device *client_dev;

	bool smmu_full_map;



	smmu = kzalloc(sizeof(*smmu), GFP_KERNEL);

	if (!smmu)

		return ERR_PTR(-ENOMEM);



	smmu_full_map = of_property_read_bool(dev->of_node,

					"qcom,fullsize-va-map");

	if (smmu_full_map) {

		msm_smmu_domains[domain].va_start = SZ_128K;

		msm_smmu_domains[domain].va_size = SZ_4G - SZ_128K;

	}



	client_dev = msm_smmu_device_create(dev, domain, smmu);

	if (IS_ERR(client_dev)) {

		kfree(smmu);