Merge "msm: mdss: Add support to halt pipe fetches" (2902485b) · Commits · e / devices / android_kernel_sony_msm8994

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

+16 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,10 @@ Required properties
		previous property, the amount of fetch ids
		defined should match the number of offsets
		defined in property: qcom,mdss-pipe-vig-off
		- qcom,mdss-pipe-vig-xin-id: Array of VBIF clients ids (xins) corresponding
		to the respective VIG pipes. Number of xin ids
		defined should match the number of offsets
		defined in property: qcom,mdss-pipe-vig-off
		- qcom,mdss-pipe-rgb-off: Array of offsets for MDP source surface pipes of
		type RGB, the offsets are calculated from
		register "mdp_phys" defined in reg property.
		@@ -34,6 +38,10 @@ Required properties
		previous property, the amount of fetch ids
		defined should match the number of offsets
		defined in property: qcom,mdss-pipe-rgb-off
		- qcom,mdss-pipe-rgb-xin-id: Array of VBIF clients ids (xins) corresponding
		to the respective RGB pipes. Number of xin ids
		defined should match the number of offsets
		defined in property: qcom,mdss-pipe-rgb-off
		- qcom,mdss-pipe-dma-off: Array of offsets for MDP source surface pipes of
		type DMA, the offsets are calculated from
		register "mdp_phys" defined in reg property.
		@@ -45,6 +53,10 @@ Required properties
		previous property, the amount of fetch ids
		defined should match the number of offsets
		defined in property: qcom,mdss-pipe-dma-off
		- qcom,mdss-pipe-dma-xin-id: Array of VBIF clients ids (xins) corresponding
		to the respective DMA pipes. Number of xin ids
		defined should match the number of offsets
		defined in property: qcom,mdss-pipe-dma-off
		- qcom,mdss-smp-data: Array of shared memory pool data. There should
		be only two values in this property. The first
		value corresponds to the number of smp blocks
		@@ -332,6 +344,10 @@ Example:
		qcom,mdss-has-decimation;
		qcom,mdss-has-wfd-blk;

		qcom,mdss-pipe-vig-xin-id = <0 4 8>;
		qcom,mdss-pipe-rgb-xin-id = <1 5 9>;
		qcom,mdss-pipe-dma-xin-id = <2 10>;

		qcom,mdss-ctl-off = <0x00000600 0x00000700 0x00000800
		0x00000900 0x0000A00>;
		qcom,mdss-mixer-intf-off = <0x00003200 0x00003600

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

+5 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013 The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2014 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
		@@ -48,6 +48,10 @@
		qcom,mdss-pipe-rgb-fetch-id = <16 17 18 22>;
		qcom,mdss-pipe-dma-fetch-id = <10 13>;

		qcom,mdss-pipe-vig-xin-id = <0 4 8 12>;
		qcom,mdss-pipe-rgb-xin-id = <1 5 9 13>;
		qcom,mdss-pipe-dma-xin-id = <2 10>;

		qcom,mdss-pipe-rgb-fixed-mmb = <2 0 1>,
		<2 2 3>,
		<2 4 5>,

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

+6 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2014, 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
		@@ -43,6 +43,11 @@
		qcom,mdss-pipe-vig-fetch-id = <1>;
		qcom,mdss-pipe-rgb-fetch-id = <7>;
		qcom,mdss-pipe-dma-fetch-id = <4>;

		qcom,mdss-pipe-vig-xin-id = <0>;
		qcom,mdss-pipe-rgb-xin-id = <1>;
		qcom,mdss-pipe-dma-xin-id = <2>;

		qcom,mdss-smp-data = <7 4096>;
		qcom,mdss-sspp-len = <0x00000400>;

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

+6 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2014, 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
		@@ -45,6 +45,11 @@
		qcom,mdss-pipe-vig-fetch-id = <1 4 7>;
		qcom,mdss-pipe-rgb-fetch-id = <16 17 18>;
		qcom,mdss-pipe-dma-fetch-id = <10 13>;

		qcom,mdss-pipe-vig-xin-id = <0 4 8>;
		qcom,mdss-pipe-rgb-xin-id = <1 5 9>;
		qcom,mdss-pipe-dma-xin-id = <2 10>;

		qcom,mdss-smp-data = <22 4096>;
		qcom,mdss-sspp-len = <0x00000400>;

drivers/video/msm/mdss/mdss.h

+3 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2014, 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
		@@ -98,6 +98,8 @@ struct mdss_data_type {
		size_t mdp_reg_size;
		char __iomem *vbif_base;

		struct mutex reg_lock;

		u32 irq;
		u32 irq_mask;
		u32 irq_ena;