mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Aakarsh Jain <aakarsh.jain@samsung.com>
To: linux-arm-kernel@lists.infradead.org,
	linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
	devicetree@vger.kernel.org
Cc: m.szyprowski@samsung.com, andrzej.hajda@intel.com,
	mchehab@kernel.org, hverkuil-cisco@xs4all.nl,
	krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org,
	conor+dt@kernel.org, linux-samsung-soc@vger.kernel.org,
	andi@etezian.org, gost.dev@samsung.com, alim.akhtar@samsung.com,
	aswani.reddy@samsung.com, pankaj.dubey@samsung.com,
	ajaykumar.rs@samsung.com, aakarsh.jain@samsung.com,
	linux-fsd@tesla.com, Smitha T Murthy <smithatmurthy@gmail.com>
Subject: [Patch v5 06/11] media: s5p-mfc: Add support for UHD encoding.
Date: Wed,  6 Dec 2023 12:00:40 +0530	[thread overview]
Message-ID: <20231206063045.97234-7-aakarsh.jain@samsung.com> (raw)
In-Reply-To: <20231206063045.97234-1-aakarsh.jain@samsung.com>

MFC driver had restriction on max resolution of 1080p, updated it for
UHD. Added corresponding support to set recommended profile and level
for H264 in UHD scenario.

Cc: linux-fsd@tesla.com
Signed-off-by: Smitha T Murthy <smithatmurthy@gmail.com>
Signed-off-by: Aakarsh Jain <aakarsh.jain@samsung.com>
---
 drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c |  9 ++++++---
 .../media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c  | 12 ++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
index 6b495a738291..b01b9511e50c 100644
--- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
@@ -1461,9 +1461,12 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
 			mfc_err("Unsupported format by this MFC version.\n");
 			return -EINVAL;
 		}
-
-		v4l_bound_align_image(&pix_fmt_mp->width, 8, 1920, 1,
-			&pix_fmt_mp->height, 4, 1080, 1, 0);
+		if (IS_MFCV12(dev))
+			v4l_bound_align_image(&pix_fmt_mp->width, 8, 3840, 1, &pix_fmt_mp
+					->height, 4, 2160, 1, 0);
+		else
+			v4l_bound_align_image(&pix_fmt_mp->width, 8, 1920, 1, &pix_fmt_mp
+					->height, 4, 1080, 1, 0);
 	} else {
 		mfc_err("invalid buf type\n");
 		return -EINVAL;
diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
index 4a0d0e228e78..572293f3b190 100644
--- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
@@ -1071,6 +1071,18 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
 	reg |= ((p->num_b_frame & 0x3) << 16);
 	writel(reg, mfc_regs->e_gop_config);
 
+	/* UHD encoding case */
+	if (ctx->img_width == 3840 && ctx->img_height == 2160) {
+		if (p_h264->level < 51) {
+			mfc_debug(2, "Set Level 5.1 for UHD\n");
+			p_h264->level = 51;
+		}
+		if (p_h264->profile != 0x2) {
+			mfc_debug(2, "Set High profile for UHD\n");
+			p_h264->profile = 0x2;
+		}
+	}
+
 	/* profile & level */
 	reg = 0;
 	/** level */
-- 
2.17.1


  parent reply	other threads:[~2023-12-06  6:37 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20231206063105epcas5p3034f89af2be6922ab04771de099a124a@epcas5p3.samsung.com>
2023-12-06  6:30 ` [Patch v5 00/11] Add MFC V12 support Aakarsh Jain
     [not found]   ` <CGME20231206063108epcas5p1af3d9d0442c8abebe91d769cc68284d5@epcas5p1.samsung.com>
2023-12-06  6:30     ` [Patch v5 01/11] dt-bindings: media: s5p-mfc: Add mfcv12 variant Aakarsh Jain
2023-12-06 10:32       ` Krzysztof Kozlowski
     [not found]   ` <CGME20231206063111epcas5p112aeeca899892a154c9a68c8e8873647@epcas5p1.samsung.com>
2023-12-06  6:30     ` [Patch v5 02/11] media: s5p-mfc: Rename IS_MFCV10 macro Aakarsh Jain
     [not found]   ` <CGME20231206063114epcas5p4637c47d1bc778bf293fd9d98b89bbb8a@epcas5p4.samsung.com>
2023-12-06  6:30     ` [Patch v5 03/11] media: s5p-mfc: Add initial support for MFCv12 Aakarsh Jain
     [not found]   ` <CGME20231206063117epcas5p251b8b355642fa50678802d72d0ca3556@epcas5p2.samsung.com>
2023-12-06  6:30     ` [Patch v5 04/11] media: s5p-mfc: Add YV12 and I420 multiplanar format support Aakarsh Jain
     [not found]   ` <CGME20231206063121epcas5p17a110abeea781dcb8760b4da4c8e4074@epcas5p1.samsung.com>
2023-12-06  6:30     ` [Patch v5 05/11] media: s5p-mfc: Add support for rate controls in MFCv12 Aakarsh Jain
     [not found]   ` <CGME20231206063125epcas5p2c5d07f51ba83198ccb8fbab005bab8f6@epcas5p2.samsung.com>
2023-12-06  6:30     ` Aakarsh Jain [this message]
     [not found]   ` <CGME20231206063128epcas5p3145907e75b404400a552b8bd66e1c175@epcas5p3.samsung.com>
2023-12-06  6:30     ` [Patch v5 07/11] media: s5p-mfc: Add support for DMABUF for encoder Aakarsh Jain
     [not found]   ` <CGME20231206063131epcas5p2e0fc772f8f8ac35897920d24a0193d71@epcas5p2.samsung.com>
2023-12-06  6:30     ` [Patch v5 08/11] media: s5p-mfc: Set context for valid case before calling try_run Aakarsh Jain
     [not found]   ` <CGME20231206063134epcas5p2b3b9ca0351cd9c1cb169d7a4a3a30b80@epcas5p2.samsung.com>
2023-12-06  6:30     ` [Patch v5 09/11] media: s5p-mfc: Load firmware for each run in MFCv12 Aakarsh Jain
2023-12-06 12:57       ` Hans Verkuil
2023-12-13  7:59         ` Aakarsh Jain
     [not found]   ` <CGME20231206063137epcas5p3450b1c70bdf7461afeeb6a3db341818c@epcas5p3.samsung.com>
2023-12-06  6:30     ` [Patch v5 10/11] media: s5p-mfc: DPB Count Independent of VIDIOC_REQBUF Aakarsh Jain
     [not found]   ` <CGME20231206063140epcas5p1ba86525117f4d9ec9172ae7cb18b7420@epcas5p1.samsung.com>
2023-12-06  6:30     ` [Patch v5 11/11] arm64: dts: fsd: Add MFC related DT enteries Aakarsh Jain
2023-12-06 10:33       ` Krzysztof Kozlowski
2023-12-13 14:05       ` Krzysztof Kozlowski
2023-12-13 14:06       ` (subset) " Krzysztof Kozlowski
2023-12-06 12:59   ` [Patch v5 00/11] Add MFC V12 support Hans Verkuil
2023-12-13  7:58     ` Aakarsh Jain

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231206063045.97234-7-aakarsh.jain@samsung.com \
    --to=aakarsh.jain@samsung.com \
    --cc=ajaykumar.rs@samsung.com \
    --cc=alim.akhtar@samsung.com \
    --cc=andi@etezian.org \
    --cc=andrzej.hajda@intel.com \
    --cc=aswani.reddy@samsung.com \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=gost.dev@samsung.com \
    --cc=hverkuil-cisco@xs4all.nl \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-fsd@tesla.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=mchehab@kernel.org \
    --cc=pankaj.dubey@samsung.com \
    --cc=robh+dt@kernel.org \
    --cc=smithatmurthy@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®