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

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

Merge "msm: VPU: Add 4th pipe for display output port"

parents 94efcea5 62531966

drivers/media/platform/msm/vpu/vpu_property.h

+2 −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
@@ -299,6 +299,7 @@ struct vpu_frame_info { 
#define	OUTPUT_DEST_MDSS0	2

#define	OUTPUT_DEST_MDSS1	3

#define	OUTPUT_DEST_MDSS2	4

#define	OUTPUT_DEST_MDSS3	5



enum vpu_video_format {

	/* outcoming video stream is in 2D format */

drivers/media/platform/msm/vpu/vpu_translate.c

+2 −0
Original line number Diff line number Diff line
@@ -213,6 +213,8 @@ u32 translate_output_destination(u32 out) 
			hfi_destination = OUTPUT_DEST_MDSS1;

		else if (out & VPU_PIPE_DISPLAY2)

			hfi_destination = OUTPUT_DEST_MDSS2;

		else if (out & VPU_PIPE_DISPLAY3)

			hfi_destination = OUTPUT_DEST_MDSS3;

		else

			pr_warn("Unsupported output pipe: %d\n", out);

	} else {

include/uapi/media/msm_vpu.h

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ struct v4l2_format_vpu_extension { 
#define VPU_PIPE_DISPLAY0		(1 << 18)

#define VPU_PIPE_DISPLAY1		(1 << 19)

#define VPU_PIPE_DISPLAY2		(1 << 20)

#define VPU_PIPE_DISPLAY3		(1 << 21)



/*

 * V P U   E V E N T S :   I D s   A N D   D A T A   P A Y L O A D S