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

Commit 8a9c7ec6 authored by Namratha Siddappa's avatar Namratha Siddappa
Browse files

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



* quic/dev/msm-4.14-display:
  ARM: dts: msm: Modify panel porch settings for QRD SM8150
  drivers/misc/hdcp: load HDCP SRM app
  drm/msm: track msm_gem_obj in active_list with a boolean

Change-Id: Ic884f526cad79a92a0fdeae511f18efaf1dbffd5
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents a1701005 d6c8f1a5

arch/arm64/boot/dts/qcom/dsi-panel-sw43404-amoled-dsc-wqhd-cmd.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ 
				qcom,mdss-dsi-panel-framerate = <60>;

				qcom,mdss-dsi-panel-width = <1440>;

				qcom,mdss-dsi-panel-height = <2880>;

				qcom,mdss-dsi-h-front-porch = <160>;

				qcom,mdss-dsi-h-back-porch = <72>;

				qcom,mdss-dsi-h-pulse-width = <16>;

				qcom,mdss-dsi-h-front-porch = <60>;

				qcom,mdss-dsi-h-back-porch = <30>;

				qcom,mdss-dsi-h-pulse-width = <12>;

				qcom,mdss-dsi-h-sync-skew = <0>;

				qcom,mdss-dsi-v-back-porch = <8>;

				qcom,mdss-dsi-v-front-porch = <8>;

arch/arm64/boot/dts/qcom/sm8150-sde-display.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -651,9 +651,9 @@ 
&dsi_sw43404_amoled_cmd {

	qcom,mdss-dsi-display-timings {

		timing@0 {

			qcom,mdss-dsi-panel-phy-timings = [00 1a 07 06 22 21 07

				07 04 03 04 00 16 16];

			qcom,display-topology = <2 1 1>;

			qcom,mdss-dsi-panel-phy-timings = [00 16 05 05 20 1f 06

				06 03 03 04 00 13 15];

			qcom,display-topology = <2 2 1>;

			qcom,default-topology-index = <0>;

		};

	};

drivers/gpu/drm/msm/msm_gem.c

+2 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ int msm_gem_get_iova(struct drm_gem_object *obj, 


	*iova = vma->iova;



	if (aspace && aspace->domain_attached) {

	if (aspace &&  !msm_obj->in_active_list) {

		mutex_lock(&aspace->list_lock);

		msm_gem_add_obj_to_aspace_active_list(aspace, obj);

		mutex_unlock(&aspace->list_lock);
@@ -1035,6 +1035,7 @@ static int msm_gem_new_impl(struct drm_device *dev, 
	INIT_LIST_HEAD(&msm_obj->vmas);

	INIT_LIST_HEAD(&msm_obj->iova_list);

	msm_obj->aspace = NULL;

	msm_obj->in_active_list = false;



	if (struct_mutex_locked) {

		WARN_ON(!mutex_is_locked(&dev->struct_mutex));

drivers/gpu/drm/msm/msm_gem.h

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ struct msm_gem_object { 
	struct list_head iova_list;



	struct msm_gem_address_space *aspace;

	bool in_active_list;

};

#define to_msm_bo(x) container_of(x, struct msm_gem_object, base)

drivers/gpu/drm/msm/msm_gem_vma.c

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ static void smmu_aspace_add_to_active( 
{

	WARN_ON(!mutex_is_locked(&aspace->list_lock));

	list_move_tail(&msm_obj->iova_list, &aspace->active_list);

	msm_obj->in_active_list = true;

}



static void smmu_aspace_remove_from_active(
@@ -81,6 +82,7 @@ static void smmu_aspace_remove_from_active( 
	list_for_each_entry_safe(msm_obj, next, &aspace->active_list,

			iova_list) {

		if (msm_obj == obj) {

			msm_obj->in_active_list = false;

			list_del(&msm_obj->iova_list);

			break;

		}