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

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

Promotion of kernel.lnx.4.4-170627.1. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2067021   I117f3737d78d22b9bd6d78abdb8e96f52fc4e874   drm/msm/sde: move pixel format flags to bitmap
2063152   I6abe986251d042ef70701b614b8cef0ee1e30044   btfm: Enable multichannel bit for SCO Rx
2061600   I65152ee6a7cafdbba299f0e0a3cac2e77c8c2660   ARM: dts: msm: Add mdss panel file nodes for msm8998 QRD
2067783   I07709f5a0ce55298a5fe46ffd95bb8bc472e7069   ARM: dts: msm: Defer regulator disable for msm8998 GPU S
2067021   I0d9f49b8b310f0dff1fb787b4ba821a6d4a68140   drm/msm/sde: size check fix for NV12 buffer
2053638   Ib5bf05aade464a0789c7b848457e95d25c4e6f8f   cnss_pci: fix the race condition in firmware file setup
2056130   I3e20fb4fa163755126e30be7aeca747d74215ed2   fs/mbcache: fix mb_cache_lru_list corruption
2067021   I61b953ce892834453e92a8c2cfdcb427456966bb   drm/msm/sde: fix color component order in sde
2063291   I2db110b4f99c8ab6c6878d426b3ebb37149b0b76   msm: ipa3: Ring IPA MHI event ring doorbell on channel s
2064365   I7e583e0ecef064d1ed91b443fe35f98a3b2c0c8a   ARM: dts: msm: add non-removable ufs/emmc property for m
2042581   I68aa102b323716f591841b192477a70397a5536b   soc: qcom: glink_pkt: fix number of intent queued
2067021   Ib5a0b2dacbc1ddc47c069b4348c0d1b9fbd7701e   drm/msm/sde: expose 10 bit pixel format capabilities
2060745   I7c2dbca375c456052ad73889b011553090bcf8f1   drm/msm: add sink capabilities for HDR support
2013052 2065926   Icff5cd81b1a4e9c28f19936dec570751feab0ccf   msm: camera: Fix Use after free bug in msm_vb2.c
2013292   Iae4d5162d39cd05f5c50d75087ec90dfe04a6c43   msm: ipa3: remove delay from AP if QMI fails
2067021   I12eb9fecfd34d488eda92f6217b6ca51e466c6f6   drm/msm/sde: add tp10 compressed format support
2059453   I9c94e44b2f2d5e1b0b8d059b871d1bd9ad2d3fcf   msm: ipa3: Assert on GSI MHI event ring fatal error
2067021   I93bd9557e5c4a4a038891f24730edbbec1dba262   drm/msm/sde: add p010 format support in sde
2065139   Ibc40ee62b2d95c319a7fe34b17813c2b57518f67   power: qpnp-smb2: Unset ONLINE for UNKNOWN USB charger t
2063248   I8fe49638f308eab97455e7cca62b01b617596de4   lpm-levels: Remove IPI check on hot plugged cores

Change-Id: I0fea593b9da8d475147f488b6d90d2a52bb7a753
CRs-Fixed: 2053638, 2042581, 2067021, 2056130, 2064365, 2065139, 2067783, 2063152, 2061600, 2065926, 2013292, 2063248, 2013052, 2059453, 2063291, 2060745
parents 9a500663 35589846

arch/arm/boot/dts/qcom/msm-arm-smmu-8998.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ 
		interrupts = <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>,

			   <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,

			   <GIC_SPI 331 IRQ_TYPE_EDGE_RISING>;

		qcom,deferred-regulator-disable-delay = <80>;

		vdd-supply = <&gdsc_gpu_cx>;

		clocks = <&clock_gcc clk_gcc_gpu_cfg_ahb_clk>,

			<&clock_gcc clk_gcc_bimc_gfx_clk>,

arch/arm/boot/dts/qcom/msm8996.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -1064,6 +1064,7 @@ 
		qcom,pm-qos-irq-cpu = <0>;

		qcom,pm-qos-irq-latency = <70 70>;



		non-removable;

		status = "disabled";

	};
@@ -1268,6 +1269,7 @@ 
		qcom,pm-qos-cpu-group-latency-us = <70 70>;

		qcom,pm-qos-default-cpu = <0>;



		non-removable;

		status = "disabled";

	};

arch/arm/boot/dts/qcom/msm8998-qrd-overlay.dts

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <dt-bindings/clock/msm-clocks-8998.h>

#include <dt-bindings/interrupt-controller/irq.h>



#include "msm8998-mdss-panels.dtsi"

#include "msm8998-qrd.dtsi"



/ {

drivers/bluetooth/btfm_slim_wcn3990.c

+3 −3
Original line number Diff line number Diff line
@@ -88,12 +88,12 @@ int btfm_slim_chrk_enable_port(struct btfmslim *btfmslim, uint8_t port_num, 


	BTFMSLIM_DBG("port(%d) enable(%d)", port_num, enable);

	if (rxport) {

		if (enable && btfmslim->sample_rate == 48000) {

			/* For A2DP Rx */

		if (enable) {

			/* For SCO Rx, A2DP Rx */

			reg_val = 0x1;

			port_bit = port_num - 0x10;

			reg = CHRK_SB_PGD_RX_PORTn_MULTI_CHNL_0(port_bit);

			BTFMSLIM_DBG("writing reg_val (%d) to reg(%x) for A2DP",

			BTFMSLIM_DBG("writing reg_val (%d) to reg(%x)",

					reg_val, reg);

			ret = btfm_slim_write(btfmslim, reg, 1, &reg_val, IFD);

			if (ret) {

drivers/cpuidle/lpm-levels.c

+5 −1
Original line number Diff line number Diff line
@@ -1119,10 +1119,14 @@ static int cluster_configure(struct lpm_cluster *cluster, int idx, 
		bool from_idle, int predicted)

{

	struct lpm_cluster_level *level = &cluster->levels[idx];

	struct cpumask online_cpus;

	int ret, i;



	cpumask_and(&online_cpus, &cluster->num_children_in_sync,

					cpu_online_mask);



	if (!cpumask_equal(&cluster->num_children_in_sync, &cluster->child_cpus)

			|| is_IPI_pending(&cluster->num_children_in_sync)) {

			|| is_IPI_pending(&online_cpus)) {

		return -EPERM;

	}