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

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

Merge changes... 

Merge changes I24e810fc,I30e69b85,I9479e6ae,Ifdee460f,I28c77969,I8d0ca0ff,Ifcd403c0,I9ab602d9,I7b6ca4ed,Icf9b305a,I7ab569ef,I1688f614,I7d5bb5f9,I357125c8,I13ecb676 into kernel.lnx.4.14.r1

* changes:
  Revert "soc: qcom: subsys_notif: Add support for early SSR notifications"
  Revert "ARM: dts: msm: enable SMART_PANEL_ALIGN_MODE on sm8150 target"
  Revert "drm/msm/dsi-staging: Configure hz dependent settings for 7nm DSI PHY"
  Revert "mm: use sc->priority for slab shrink targets"
  Revert "mm: slowly shrink slabs with a relatively small number of objects"
  Revert "mm: put pages into alloc state after offline"
  Revert "Revert "Revert "ARM: dts: msm: Disable ATOS for apps smmu for sm8150"""
  Revert "Revert "iommu: iommu-debug: Mark domain as debug domain""
  Revert "ARM: dts: msm: update fastrpc PM QoS request latency for 8150"
  Revert "rpmsg: glink: Add early reset notifier"
  Revert "net: qrtr: Remove flow count on send failure"
  Revert "usb: gadget: Add check gadget function bind or not"
  Revert "devfreq: Use busy cycles only for GPU bandwidth decisions"
  Revert "devfreq: Weight stall cycles more for GPU bus DCVS"
  Revert "ARM: dts: msm: Add properties for 2.5k panel display"
parents 8495def9 4524ad5f

arch/arm64/boot/dts/qcom/msm-arm-smmu-sm8150-v2.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ 
		#iommu-cells = <2>;

		qcom,skip-init;

		qcom,use-3-lvl-tables;

		qcom,disable-atos;

		#global-interrupts = <1>;

		#size-cells = <1>;

		#address-cells = <1>;

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

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ 
		qcom,sde-highest-bank-bit = <0x2>;

		qcom,sde-ubwc-version = <0x300>;

		qcom,sde-ubwc-bw-calc-version = <0x1>;

		qcom,sde-smart-panel-align-mode = <0xc>;

		qcom,sde-panic-per-pipe;

		qcom,sde-has-cdp;

		qcom,sde-has-src-split;

arch/arm64/boot/dts/qcom/sm8150-sdx50m-mtp-2.5k-panel-overlay.dts

+0 −5
Original line number Diff line number Diff line
@@ -59,8 +59,3 @@ 
&dsi_dual_nt35597_truly_cmd_display {

	qcom,dsi-display-active;

};
 


&pm8150l_wled {

	qcom,string-cfg = <6>;

	qcom,leds-per-string = <8>;

};

arch/arm64/boot/dts/qcom/sm8150.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -2387,7 +2387,7 @@ 
	msm_fastrpc: qcom,msm_fastrpc {

		compatible = "qcom,msm-fastrpc-compute";

		qcom,fastrpc-adsp-audio-pdr;

		qcom,rpc-latency-us = <235>;

		qcom,rpc-latency-us = <611>;



		qcom,msm_fastrpc_compute_cb1 {

			compatible = "qcom,msm-fastrpc-compute-cb";

drivers/devfreq/governor_gpubw_mon.c

+4 −12
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2017, 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
@@ -24,7 +24,6 @@ 
#define HIST                    5

#define TARGET                  80

#define CAP                     75

#define WAIT_THRESHOLD          10

/* AB vote is in multiple of BW_STEP Mega bytes */

#define BW_STEP                 160
@@ -66,9 +65,7 @@ static int devfreq_gpubw_get_target(struct devfreq *df, 
	int result;

	int level = 0;

	int act_level;

	int norm_max_cycles;

	int norm_cycles;

	int wait_active_percent;

	int gpu_percent;

	/*

	 * Normalized AB should at max usage be the gpu_bimc frequency in MHz.
@@ -97,12 +94,8 @@ static int devfreq_gpubw_get_target(struct devfreq *df, 
	if (priv->bus.total_time < LONG_FLOOR)

		return result;



	norm_max_cycles = (unsigned int)(priv->bus.ram_time) /

			(unsigned int) priv->bus.total_time;

	norm_cycles = (unsigned int)(priv->bus.ram_time + priv->bus.ram_wait) /

			(unsigned int) priv->bus.total_time;

	wait_active_percent = (100 * (unsigned int)priv->bus.ram_wait) /

			(unsigned int) priv->bus.ram_time;

	gpu_percent = (100 * (unsigned int)priv->bus.gpu_time) /

			(unsigned int) priv->bus.total_time;
@@ -111,8 +104,8 @@ static int devfreq_gpubw_get_target(struct devfreq *df, 
	 * FAST hint.  Otherwise check the current value against the current

	 * cutoffs.

	 */

	if (norm_max_cycles > priv->bus.max) {

		_update_cutoff(priv, norm_max_cycles);

	if (norm_cycles > priv->bus.max) {

		_update_cutoff(priv, norm_cycles);

		bus_profile->flag = DEVFREQ_FLAG_FAST_HINT;

	} else {

		/* GPU votes for IB not AB so don't under vote the system */
@@ -121,8 +114,7 @@ static int devfreq_gpubw_get_target(struct devfreq *df, 
		act_level = (act_level < 0) ? 0 : act_level;

		act_level = (act_level >= priv->bus.num) ?

		(priv->bus.num - 1) : act_level;

		if ((norm_cycles > priv->bus.up[act_level] ||

				wait_active_percent > WAIT_THRESHOLD) &&

		if (norm_cycles > priv->bus.up[act_level] &&

				gpu_percent > CAP)

			bus_profile->flag = DEVFREQ_FLAG_FAST_HINT;

		else if (norm_cycles < priv->bus.down[act_level] && level)