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

Commit 54d1e3f0 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of kernel.lnx.4.4-160830. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1056438   Iff2fdfb547617425182429d95fb1d3b9a2e4321f   defconfig: arm64: Add coresight abort support for msmcob
1009284   I62e8d8810280fd42e1db1769ab95be877dc536ed   msm: mdss: remove unused APIs from external display head
1050357   I3a15f830e52ee89ea81d0e450b68ef13970d0363   msm: vidc: Amend DCVS condition
1058405   I69b7e5542f561735ed044bdaf49f855b57777c84   msm: qpnp-haptic: Update function declarations
1046061   Id6460f21245808b739ad215fe8073ae7cae8422c   msm: ipa: WDI2.0: hotspot offload using WDI 2.0 interfac
1059549   I4d12ff4d1d87aa984f601760b26b3413484f501a   mfd: qcom-i2c-pmic: prepare for shared interrupt
1060058   Ib84663955c0c0db6124819c4c4749e5c347a3495   scsi: ufs-qcom: skip svs2 configuration for newer contro
1049232   Ie8e65ce9f58cb357204bfa4c6a6e0fccec82d5ba   msm: mdss: Fix to validate data copied from user space
1009284   I481e475ceff2ea0a07a0dfc4083526982674954c   ARM: dts: msm: add audio codec as child of MSM External
1060416   I591f18aa225cc6690bf423f2ae5bc7dafd4dad78   msm: vidc: Compare ion_handles rather than fds
1052818   I0778e43e0a03852ca2944377256a7b401586a747   msm: kgsl: Change %p to %pK in debug messages

Change-Id: Ic23fec60d49070a0b3d9e0b50aeef145d83e5967
CRs-Fixed: 1060058, 1049232, 1050357, 1060416, 1052818, 1009284, 1056438, 1058405, 1059549, 1046061
parents 66b8443a ab26d098

arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi

+10 −8
Original line number Diff line number Diff line
@@ -448,6 +448,14 @@ 
		qcom,mdss-fb-map = <&mdss_fb1>;

	};



	msm_ext_disp: qcom,msm_ext_disp {

		compatible = "qcom,msm-ext-disp";



		hdmi_audio: qcom,msm-hdmi-audio-rx {

			compatible = "qcom,msm-hdmi-audio-codec-rx";

		};

	};



	mdss_dp_ctrl: qcom,dp_ctrl@c990000 {

		cell-index = <0>;

		compatible = "qcom,mdss-dp";
@@ -483,6 +491,8 @@ 


		qcom,dp-usbpd-detection = <&pmicobalt_pdphy>;



		qcom,msm_ext_disp = <&msm_ext_disp>;



		qcom,core-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;
@@ -595,10 +605,6 @@ 
			      };

	};



	msm_ext_disp: qcom,msm_ext_disp {

		compatible = "qcom,msm-ext-disp";

	};



	mdss_hdmi_tx: qcom,hdmi_tx@c9a0000 {

		cell-index = <0>;

		compatible = "qcom,hdmi-tx";
@@ -631,10 +637,6 @@ 


		qcom,mdss-fb-map = <&mdss_fb2>;

		qcom,pluggable;



		hdmi_audio: qcom,msm-hdmi-audio-rx {

			compatible = "qcom,msm-hdmi-audio-codec-rx";

		};

	};

};

arch/arm64/configs/msmcortex-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -573,6 +573,7 @@ CONFIG_DEBUG_SET_MODULE_RONX=y 
CONFIG_DEBUG_RODATA=y

CONFIG_DEBUG_ALIGN_RODATA=y

CONFIG_CORESIGHT=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_LINKS_AND_SINKS=y

CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y

CONFIG_CORESIGHT_QCOM_REPLICATOR=y

arch/arm64/configs/msmcortex_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -637,6 +637,7 @@ CONFIG_DEBUG_SET_MODULE_RONX=y 
CONFIG_DEBUG_RODATA=y

CONFIG_FREE_PAGES_RDONLY=y

CONFIG_CORESIGHT=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y

CONFIG_CORESIGHT_SOURCE_ETM4X=y

CONFIG_CORESIGHT_REMOTE_ETM=y

drivers/gpu/msm/adreno_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static void sync_event_print(struct seq_file *s, 
		break;

	}

	case KGSL_CMD_SYNCPOINT_TYPE_FENCE:

		seq_printf(s, "sync: [%p] %s", sync_event->handle,

		seq_printf(s, "sync: [%pK] %s", sync_event->handle,

		(sync_event->handle && sync_event->handle->fence)

				? sync_event->handle->fence->name : "NULL");

		break;

drivers/gpu/msm/kgsl.c

+2 −3
Original line number Diff line number Diff line
@@ -4457,9 +4457,8 @@ int kgsl_device_platform_probe(struct kgsl_device *device) 
	disable_irq(device->pwrctrl.interrupt_num);



	KGSL_DRV_INFO(device,

		"dev_id %d regs phys 0x%08lx size 0x%08x virt %p\n",

		device->id, device->reg_phys, device->reg_len,

		device->reg_virt);

		"dev_id %d regs phys 0x%08lx size 0x%08x\n",

		device->id, device->reg_phys, device->reg_len);



	rwlock_init(&device->context_lock);