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

Commit 4acd1efd authored by Ian Maund's avatar Ian Maund
Browse files

Merge tmp-30f491c9 into msm-3.10 



This merge brings pending commits from LA.BR.1 back to msm-3.10 as of
commit 5f0207b.

* (85 commits)
  cma: Add 100ms delay before retrying for CMA allocation
  msm: mdss: update parameter validation for partial update
  msm: mdss: sysfs node to disable smart blit
  msm: mdss: Blit optimazation for overlaping layers
  msm: camera: eeprom: change log level in eeprom
  msm: mdss: Fix flooding of partial update enable in logs
  defconfig : 8916 : Remove debug flags for less memory footprint
  msm: mdss: Validate CSC ioctl for black screen in mdp3
  defconfig: Enable dm-verity for 8916 target
  msm: mdss: Fix case of pack pattern being 0 in mdp3
  msm: camera: Add support for LED flash fast factory boot mode
  msm: mdss: optimize bw calculation when there is no blend
  ARM: dts: msm: specify the panel ROI restrictions for truly wvga panel
  msm: mdss: Disable display PP features if partial update is enabled
  msm: mdss: Create sysfs entry for PU state in MDP3
  ARM: dts: update sharp qhd panel init sequnce
  msm: mdss: optimize bw vote for above 720p video playback
  msm: mdss: Fix mdp3 resume when GC and CCS are both enabled
  msm: mdss: Correct erroneous failure when programming LUTs
  ARM: dts: msm: update backlight control for 8909 with PM8916
  msm: mdss: Return success to hist ON ioctl if running in mdp3
  ARM: dts: msm: align the splash memory size to 4MB
  msm: mdss: Fix issues of mdp3 ioctls of GC/Hist luts
  msm: mdss: fix iommu issue in recovery mode for 8909
  msm: pm: Change the init level of pc debug counters
  ASoC: wcd9306: Avoid codec read/writes if device is down
  ASoC: msm8x16-wcd: Avoid codec read/writes if device is down
  msm: vidc: program QDSS mapping addresses based on target
  msm: mdss: Add gamma correction support in mdp3
  msm: mdss: Correct RGB order for LUT programming in mdp3
  mdss: ppp: allow mdp3 to map smmu for buffers used by ppp on 8909
  ARM: dts: remove unused gpio from mdss for 8909 CDP
  ARM: dts: msm: fix rgb color order for sharp qhd panel
  msm: mdss: Retain register settings across suspend/resume
  msm: mdss: Add one device attribute to expose pack pattern
  msm: mdss: reduce PPP bw vote for 1080p video on 8909
  ARM: dts: enable partial update feature on truly wvga panel
  msm: mdss: update partial update sequence in 8909
  msm: driver: Camerav2: Changing pre flash intensity
  msm: vidc: avoid crash due to division by zero
  ARM: dts: msm: Disable modem pil loading from mproc code
  ARM: dts: msm: Modify GPU IB vote as per new DDR clk plan
  ASoC: Kconfig: Enable DS2 for msm8909
  ARM: dts: msm: Add Nominal plus clock support for GPU
  msm: msm8916: camera: Update ov7695 sensor driver
  clock: 8939: Add NOM+ support
  msm: msm8909: camera: Change gc0310 sensor driver
  msm: msm8909: camera: Add gc0310 sensor driver and device tree changes for SKUC
  clock: 8939: Update SVS and NOM Fmax for VFE clk
  msm: adsp-loader: Add support to unload modem/adsp image
  ASoC: qdsp6v2: Avoid sending LAB enable twice to adsp
  defconfig: msm8939: Enable msm_performance module
  msm: mdss: Fix Compact Ioctls overlay_set failure
  msm: driver: Camerav2: Disable front LED for full flash
  Revert "ASoC: wcd9xxx: update button press thresholds"
  Added CONFIG FILTER support for CTS : SEECOMP Test.
  ARM: dts: msm: Update VFE memory map region for 8909
  Revert "ASoC: wcd9xxx: Avoid micbias glitches during audio playback"
  msm: camera: Avoid memory corruption in actuator start routine
  ARM: dts: msm: Change ispif_ahb_clk frequency
  msm: driver: Camerav2: Add eeprom support for camera for msm8909
  msm: mdss: calculate the correct ROI for flipped panels
  ARM: dts: msm: Align splash memory size to 4MB
  msm: mdss: add fudge factor for command mode panel
  msm-camera: Remove error log for ISP lock
  msm: cpp: Handling GET_INST_INFO ioctl for 64 bit kernel
  defconfig: Disable event timer support for msm8916 targets
  defconfig: msm8916: Enable CONFIG_NETFILTER_XT_TARGET_IDLETIMER
  msm: cpp: Add bus client to cpp driver
  Arm: dts: msm: Add csi1 phy clock source to enable csi1 core
  msm: camera: Enable LED Flash support on 8909
  ARM: dts: msm: Add bus master flag to camera dtsi CPP section
  msm: vidc: Increase power collapse timeout value
  msm: mdss: add minimum bus vote during IOMMU attach
  ARM: dts: msm: Update DS QoS settings for 8909
  msm: camera: Add dual LED support in I2C flash driver
  msm: camera: Add lm3642 flash driver
  msm: mdss: fix boot-up issues with splash thread enabled
  ARM: dts: msm: Add LM3642 device node for msm8916 SKUD
  msm-camera: Avoid adding top up to calulated ab/ib for single stream.
  msm: msm8916: camera: Add ov7695 sensor driver and device tree changes
  defconfig: 8916: Disable unused configs
  defconfig : msm8916_64: disable panic on RT throttling
  defconfig: msm8916: disable panic on RT throttling
  msm: camera: isp: Use single composite stats mask for VFE32

Change-Id: I23a08a11ddffed6494df58727361bb0c80c8843c
Signed-off-by: default avatarIan Maund <imaund@codeaurora.org>
parents d5dd0bba 30f491c9

Documentation/devicetree/bindings/fb/mdss-mdp.txt

+2 −0
Original line number Diff line number Diff line
@@ -407,6 +407,8 @@ Fudge Factors: Fudge factors are used to boost demand for 
				values when the overlap bandwidth is the

				predominant value compared to prefill bandwidth

				value.

- qcom,mdss-ib-factor-cmd:	This fudge factor is applied to calculated ib

				values in case of command mode.

- qcom,mdss-clk-factor:		This fudge factor is applied to calculated mdp

				clk rate in default conditions.

Documentation/devicetree/bindings/media/video/msm-cci.txt

+2 −0
Original line number Diff line number Diff line
@@ -68,7 +68,9 @@ Required properties: 
    - "shinetech,hi256"

    - "shinetech,s5k4e1"

    - "ovti,ov5645"

    - "ovti,ov7695"

    - "qcom,mt9m114"

    - "shinetech,gc0310"

- reg : should contain i2c slave address of the device

- qcom,csiphy-sd-index : should contain csiphy instance that will used to

    receive sensor data

Documentation/devicetree/bindings/media/video/msm-cpp.txt

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ Required properties: 
- qcom,clock-rates: clock rate in Hz.

- qcom,min-clock-rate: minimum clock rate in Hz, to be set to CPP hardware in

  case dynamic clock scaling based on prevalent streams need lower clock rate.

- bus_master: Flag for presence of CPP bus master



Example:
@@ -45,4 +46,5 @@ Example: 
			"camss_vfe_cpp_clk","micro_iface_clk", "camss_ahb_clk";

		qcom,clock-rates = <0 465000000 0 0 465000000 0 0>;

		qcom,min-clock-rate = <465000000>;

		bus_master = <0>;

	};

Documentation/devicetree/bindings/media/video/msm-vidc.txt

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ Optional properties: 
- qcom,reg-presets : list of offset-value pairs for registers to be written.

  The offsets are from the base offset specified in 'reg'. This is mainly

  used for QoS, VBIF, etc. presets for video.

- qcom,qdss-presets : list of physical address and memory allocation size pairs.

  when fw_debug_mode is set as HFI_DEBUG_MODE_QDSS, all firmware messages will be

  written to QDSS memory.

- qcom,msm-bus-clients : list of bus clients/consumer each listed as a node.

  The format of the node should follow the layout specified by the bus provider

  for bus consumers at Documentation/devicetree/bindings/arm/msm/msm_bus.txt.
@@ -133,6 +136,8 @@ Example: 
		qcom,hfi = "venus";

		qcom,reg-presets = <0x80004 0x1>,

			<0x80178 0x00001FFF>;

		qcom,qdss-presets = <0xFC307000 0x1000>,

			<0xFC322000 0x1000>;

		qcom,max-hw-load = <1224450>; /* 4k @ 30 + 1080p @ 30*/

		clock-names = "foo_clk", "bar_clk", "baz_clk";

		qcom,clock-configs = <0x3 0x1 0x0>;

arch/arm/boot/dts/qcom/dsi-panel-sharp-qhd-video.dtsi

+1 −3
Original line number Diff line number Diff line
@@ -33,13 +33,11 @@ 
		qcom,mdss-dsi-v-top-border = <0>;

		qcom,mdss-dsi-v-bottom-border = <0>;

		qcom,mdss-dsi-bpp = <24>;

		qcom,mdss-dsi-color-order = "rgb_swap_bgr";

		qcom,mdss-dsi-underflow-color = <0xff>;

		qcom,mdss-dsi-border-color = <0>;

		qcom,mdss-dsi-on-command = [05 01 00 00 32 00 02 01 00

					05 01 00 00 0a 00 02 11 00

					15 01 00 00 0a 00 02 53 2c

					15 01 00 00 0a 00 02 51 ff

					15 01 00 00 0a 00 02 53 0c

					05 01 00 00 0a 00 02 29 00

					15 01 00 00 0a 00 02 ae 03

					15 01 00 00 0a 00 02 3a 77];