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

Commit 6cbb1a9b authored by Saikumar Kurapati's avatar Saikumar Kurapati
Browse files

Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14 



* quic/dev/msm-4.14-display:
  drm/msm/sde: add sde_crtc lock to protect sde_crtc mixers
  drm/msm-lease: create DRM MSM LEASE driver
  drm: msm: dsi-staging: Fix error handling in case of EPROBE_DEFER
  disp: msm: dp: add timeout state for simulated AUX transfers
  disp: msm: dp: update the connected state during clean up
  disp: msm: dp: disable audio during display clean up
  disp: msm: dp: add session check for audio register programming

Change-Id: I04dc711eb7738f38fdf31ecdfa7af45ac1ffac81
Signed-off-by: default avatarSaikumar Kurapati <saikk@codeaurora.org>
parents 29444f60 97761dba

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

0 → 100644
+28 −0
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc. SDE KMS LEASE



Snapdragon Display Engine Lease registers with the Linux DRM/KMS framework to

facilitate DRM driver creation, publishing /dev/dri/card<n>, n=1,2,... from

card0 with objects implicitly leased.



Required properties

- compatible: Must be "qcom,sde-kms-lease".

- qcom,lease-connectors: Connector names leased to the card.

- qcom,lease-planes: Plane names leased to the card.



Optional properties

- qcom,dev-name: Name of the lease device.



Example:

	card1: qcom,sde-kms-lease@0 {

		compatible = "qcom,sde-kms-lease";

		qcom,dev-name = "msm_drm1";

		qcom,lease-connectors = "DSI-1";

		qcom,lease-planes = "plane-0", "plane-8";

	};



	card2: qcom,sde-kms-lease@1 {

		compatible = "qcom,sde-kms-lease";

		qcom,dev-name = "msm_drm2";

		qcom,lease-connectors = "DSI-2";

		qcom,lease-planes = "plane-1", "plane-9";

	};

drivers/clk/qcom/mdss/mdss-pll-util.c

+12 −5
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -337,7 +337,7 @@ static void mdss_pll_free_bootmem(u32 mem_addr, u32 size) 
		free_reserved_page(pfn_to_page(pfn_idx));

}



static int mdss_pll_util_parse_dt_dfps(struct platform_device *pdev,

static int mdss_pll_util_parse_dt_dfps_sub(struct platform_device *pdev,

					struct mdss_pll_resources *pll_res)

{

	int rc = 0;
@@ -424,9 +424,6 @@ int mdss_pll_util_resource_parse(struct platform_device *pdev, 
		goto clk_err;

	}



	if (mdss_pll_util_parse_dt_dfps(pdev, pll_res))

		pr_err("dfps not enabled!\n");



	return rc;



clk_err:
@@ -435,3 +432,13 @@ int mdss_pll_util_resource_parse(struct platform_device *pdev, 
end:

	return rc;

}



void mdss_pll_util_parse_dt_dfps(struct platform_device *pdev,

				struct mdss_pll_resources *pll_res)

{

	int rc = 0;



	rc = mdss_pll_util_parse_dt_dfps_sub(pdev, pll_res);

	if (rc)

		pr_err("dfps not enabled!\n");

}

drivers/clk/qcom/mdss/mdss-pll.c

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -366,6 +366,8 @@ static int mdss_pll_probe(struct platform_device *pdev) 
		goto clock_register_error;

	}



	mdss_pll_util_parse_dt_dfps(pdev, pll_res);



	return rc;



clock_register_error:

drivers/clk/qcom/mdss/mdss-pll.h

+2 −0
Original line number Diff line number Diff line
@@ -251,6 +251,8 @@ int mdss_pll_util_resource_enable(struct mdss_pll_resources *pll_res, 
								bool enable);

int mdss_pll_util_resource_parse(struct platform_device *pdev,

				struct mdss_pll_resources *pll_res);

void mdss_pll_util_parse_dt_dfps(struct platform_device *pdev,

				struct mdss_pll_resources *pll_res);

struct dss_vreg *mdss_pll_get_mp_by_reg_name(struct mdss_pll_resources *pll_res

		, char *name);

#endif

drivers/gpu/drm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -245,6 +245,8 @@ source "drivers/gpu/drm/msm/Kconfig" 


source "drivers/gpu/drm/msm-hyp/Kconfig"



source "drivers/gpu/drm/msm-lease/Kconfig"



source "drivers/gpu/drm/fsl-dcu/Kconfig"



source "drivers/gpu/drm/tegra/Kconfig"