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

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

Merge "msm: cpp: Add support for updating buffer distance for metadata."

parents f0bf6428 1ea44107

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -118,8 +118,8 @@ Example: 
			qcom,we-mmu-pf-ptr-off = <12>;

			qcom,we-mmu-pf-ptr-off = <12>;

			qcom,dup-we-mmu-pf-ptr-off = <17>;

			qcom,dup-we-mmu-pf-ptr-off = <17>;

			qcom,ref-we-mmu-pf-ptr-off = <22>;

			qcom,ref-we-mmu-pf-ptr-off = <22>;

			qcom,set-group-buffer-len = <91>;

			qcom,set-group-buffer-len = <135>;

			qcom,dup-frame-indicator-off = <48>;

			qcom,dup-frame-indicator-off = <70>;





		};

		};

	};
 
	};

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -630,8 +630,8 @@ 
			qcom,we-mmu-pf-ptr-off = <12>;

			qcom,we-mmu-pf-ptr-off = <12>;

			qcom,dup-we-mmu-pf-ptr-off = <17>;

			qcom,dup-we-mmu-pf-ptr-off = <17>;

			qcom,ref-we-mmu-pf-ptr-off = <22>;

			qcom,ref-we-mmu-pf-ptr-off = <22>;

			qcom,set-group-buffer-len = <91>;

			qcom,set-group-buffer-len = <135>;

			qcom,dup-frame-indicator-off = <48>;

			qcom,dup-frame-indicator-off = <70>;

		};

		};

	};

	};

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+7 −5
Original line number Original line Diff line number Diff line
@@ -2035,7 +2035,7 @@ static int32_t msm_cpp_set_group_buffer(struct cpp_device *cpp_dev, 
	unsigned long out_phyaddr0, out_phyaddr1, distance;

	unsigned long out_phyaddr0, out_phyaddr1, distance;

	int32_t rc = 0;

	int32_t rc = 0;

	uint32_t set_group_buffer_len, set_group_buffer_len_bytes,

	uint32_t set_group_buffer_len, set_group_buffer_len_bytes,

		dup_frame_off, ubwc_enabled, i = 0;

		dup_frame_off, ubwc_enabled, j, i = 0;





	do {

	do {

		if (new_frame->batch_info.batch_mode != BATCH_MODE_VIDEO) {

		if (new_frame->batch_info.batch_mode != BATCH_MODE_VIDEO) {
@@ -2111,11 +2111,13 @@ static int32_t msm_cpp_set_group_buffer(struct cpp_device *cpp_dev, 
			}

			}

			distance = out_phyaddr1 - out_phyaddr0;

			distance = out_phyaddr1 - out_phyaddr0;

			out_phyaddr0 = out_phyaddr1;

			out_phyaddr0 = out_phyaddr1;

			for (j = 0; j < PAYLOAD_NUM_PLANES; j++)

				*ptr++ = distance;

				*ptr++ = distance;



			if (ubwc_enabled) {

				for (j = 0; j < PAYLOAD_NUM_PLANES; j++)

					*ptr++ = distance;

					*ptr++ = distance;

			*ptr++ = distance;

			}

			if (ubwc_enabled)

				*ptr++ = distance;

		}

		}

		if (rc)

		if (rc)

			break;

			break;