From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F7623BD22F for ; Mon, 11 May 2026 09:20:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778491239; cv=none; b=PeEQZKK5fGZgwJnjv9GrrSTO7CJ/C2UFfLHz5pXdVsYPU3PXmDnVJZp+zqJ9YSPljQhz08towZaeUpYIxAUmKn2Nj55Zlivb5aE6Mu6MSvDUuCSSZEnfVHETUAopt9vMALk8bckopjuPYpL0xFn+sclZm4CPtUS2QjJ6xNQU+HI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778491239; c=relaxed/simple; bh=0XXM8SATZX5xddyNGVmVrzd/1VHNcnt9h/bLvxKqu7w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=J5APFkI44tGDfvemdxj7kZVcLYmgx7gIWcJPm6KKQKcpumC4r/3TfcBj93O/ikzNOPMAsY+2T/K39mEAtH51kj+mQslfvY23w3PHIBpXOW4kWVMSXYysf4BfHAI1t7LFRTbT4/5L4Dg/NtrX6wnbnQ2CoSjMPkHMS1rwBe3gu9U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=adzzzydg; arc=none smtp.client-ip=209.85.221.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="adzzzydg" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-43d73422431so3140843f8f.2 for ; Mon, 11 May 2026 02:20:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778491235; x=1779096035; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=P3AzCwGuPnUfKtYTICegT0okxDHwk/H/9i6HDV/B1Ww=; b=adzzzydgm+FBvGd37deGXznKfTbxPVIk1U8u2hvdwT7qcDcsd/P3Rur4xl5CeyBDzj jeQUeNKwTbke+S7k/3DhXotn8gnQGJZVfnHciWSEwarm9ABRJz5VEFE1hgzwW8HBS0g4 /HULEctAxqrkksy6O7d5QGhYPutxaQC4AnWxYpjDmKxmVuknlFNgmf19HqD1nE7+k0L8 oakR/rEjNaTjZfKEUsPC6digGYR9ijEOsxFtuabMLbkgQ/D/wfPgFVokVxtKtePc4GmZ 30lE3d3sgCXRYeOdZp2lamkjWfhzJ2xElLFQ9fmNVK7AIV1XHh8bYACj6FZhAPIEy6YB c5pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778491235; x=1779096035; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=P3AzCwGuPnUfKtYTICegT0okxDHwk/H/9i6HDV/B1Ww=; b=qqjdfE7ec1xf85DwQTgAgZbmX6iVn5boHkIGrsYF2bZJY+R33UNvJUMpAMLUXB3+QJ EYxEcV+6LDKQqh3BbewK4kA2N44YdsylED9fjjzzDg7lXsZ3lwBegjQzo+qmqNpH4fnL /Y7Fl4HLuREjLd62kCZ53fHpD7gJQw3tcMdhK4QBCGRzwEbpZw+miBjwlFQnj70tpXGj u1L/1axdd9REpLVBTwci5Cqx87/zjAa2TR59aJFOCqUk5m9nW+vkZrX6HJ2E70ND478L 02ihxBgIuursk2cB9dbrrfE4t6WMTM/+VszFh0S9DW806Gzet+OhkVVbde9Jf3r34QSz qUHQ== X-Forwarded-Encrypted: i=1; AFNElJ9aDDhHrU/vKjouvldDQqqpwJC2Uw5HBzW+w2TBF0wYzVpHVWyP8SWPgzaQd643lY7eASGyLugXabPMohM=@vger.kernel.org X-Gm-Message-State: AOJu0YxG5JL8X2VI3PmSjsu8reut/2joogsIJPcRf79r8d9tW4j3d9s0 PAWn7XCIRBY9qqBma2QJjBXYQvRpnEmISbPDSXEDGdoL8Pjmdl4nZ3TyyDwmYwYxn2cEatuMnlO SfYs6FBQ= X-Gm-Gg: Acq92OEgBIt/vZnvA8M0gPsgGzdu0rK2UjDBMIkGWFsh069fWhSNZq4D2q2aQ2RArXO q4dt0FlDZM5VH5ljQZS7Vf70q2BCw1F6meNtq5o6crLENrf4+pyJubOrXQgmBEtNgHPMmO/++Eg xo8yTE4p5+Lz0GgCqgFfE/18QNZpwS8Wp7iqSY2zjNszFvFMG9lIGow1gOAsK56q7wF+6hcssFK ttHKdtSRNx8LZkd6xopUnhEU9WO8J7lxy6LqzVEE7omeFn3vp3px+gNB2O6IQrt3kKUjq0tNtdN TbAkv8TMK1kWCpzZc1C1pySaFtLJiQk3ZSLLwacQlGXQhkVmy0/4vZLJunkOAf4Ck+pvWOKbBdu nIOcuWCnUpmGpy0GcoXvBc9knQ4KaIYp48NGwAkJyV/nKhGvgdAnsyp4SNNqp18L11gncjgAbxm BL6jb1F09e1ba15JMm486Uf6fOnCyBg9JcqKSvE8b1mf2m X-Received: by 2002:a5d:5f42:0:b0:455:460a:33a5 with SMTP id ffacd0b85a97d-455460a3511mr16709478f8f.34.1778491235232; Mon, 11 May 2026 02:20:35 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:106d:1080:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4549120ec0asm23743240f8f.17.2026.05.11.02.20.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 02:20:34 -0700 (PDT) From: Neil Armstrong Date: Mon, 11 May 2026 11:20:31 +0200 Subject: [PATCH v3 6/6] media: qcom: iris: vdec: allow GEN2 decoding into 10bit format Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260511-topic-sm8x50-iris-10bit-decoding-v3-6-7fc049b93042@linaro.org> References: <20260511-topic-sm8x50-iris-10bit-decoding-v3-0-7fc049b93042@linaro.org> In-Reply-To: <20260511-topic-sm8x50-iris-10bit-decoding-v3-0-7fc049b93042@linaro.org> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.15.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=4832; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=0XXM8SATZX5xddyNGVmVrzd/1VHNcnt9h/bLvxKqu7w=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBqAZ9dmMvT6hxbqJ8xf2FZ3uINwpHDW5NYpaS6MkGv sFkDMASJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCagGfXQAKCRB33NvayMhJ0YfND/ 0eZA0rBVDpF0xsJITUqLEN4s4R1NjLiUYG703AB9PtoNS/8zULIbatBdTuQ4q5kwB7jDeZsYOfgOTE xqJO2B6z3mvAnrWrE/juPT72gx4TnUYDxfg/JFMlo25n9Q0RPaErIFBW7aIdyytsqvMRHAdDX4hJ0S WRS0c7xPMSC/hAoCZf0RrPBV5DCuZFei7wqzGnFpqHy7FousNfmSXCvk0OZQnQZf53SZfXj6pzXV7N UIwH7y3jFNfspWFjsUYkpheX2iasvybuaobxsadqJTWXTjph643M1xOLhCv8znQDlVtBU1XH6zptjp QXOTTDinNK9mkrkh5iDYPOSNQBqnKNZB5YxmerCHKQfYudeG1YRop66Z8v0pgyXjihXxEufEDrOk/1 JBTRRZPi0WlzEIvZbrsDIVxtG4lg9YxVH6RU/mgHoXx5iGZEUpcVNxNrw9UJkFsHUsNB1Cr2Pzoqyx +mHgwqiyBuKkDK63Png/ZqKjiYJEZEPbF9hU02CZ+BgA9Nhd0o1Bx1Av9VYLCkAZxsAKiRsnSU5bhs dAKu3/6mYi3gWwvcDW8Jkdjg5MrIZz9jRK8nhTqIeZVk/DJTa2MGVgKwkC1Egk+YAYPpdhKTJ8JXnZ X7rOqW68j0p5mcv1Th4uM11VFNFDAoTCxtcqIVSFFhyV/2+RikDilsmTh06A== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Add the necessary bits into the gen2 platforms tables and handlers to allow decoding streams into 10bit pixel formats. Signed-off-by: Neil Armstrong --- .../media/platform/qcom/iris/iris_hfi_gen2_response.c | 16 +++++++++++++++- drivers/media/platform/qcom/iris/iris_instance.h | 2 ++ drivers/media/platform/qcom/iris/iris_platform_gen2.c | 8 +++++--- drivers/media/platform/qcom/iris/iris_vdec.c | 8 ++++++++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c index 0541e02d7507..b6d815c01f1d 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c @@ -542,6 +542,15 @@ static void iris_hfi_gen2_read_input_subcr_params(struct iris_inst *inst) pixmp_ip->width = width; pixmp_ip->height = height; + if (subsc_params.bit_depth == BIT_DEPTH_8 && + pixmp_op->pixelformat != V4L2_PIX_FMT_NV12 && + pixmp_op->pixelformat != V4L2_PIX_FMT_QC08C) + pixmp_op->pixelformat = V4L2_PIX_FMT_NV12; + else if (subsc_params.bit_depth == BIT_DEPTH_10 && + pixmp_op->pixelformat != V4L2_PIX_FMT_P010 && + pixmp_op->pixelformat != V4L2_PIX_FMT_QC10C) + pixmp_op->pixelformat = V4L2_PIX_FMT_P010; + switch (pixmp_op->pixelformat) { case V4L2_PIX_FMT_P010: pixmp_op->width = ALIGN(width, 128); @@ -625,7 +634,12 @@ static void iris_hfi_gen2_read_input_subcr_params(struct iris_inst *inst) inst->fw_caps[POC].value = subsc_params.pic_order_cnt; inst->fw_caps[TIER].value = subsc_params.tier; - if (subsc_params.bit_depth != BIT_DEPTH_8 || + if (subsc_params.bit_depth == BIT_DEPTH_8) + inst->fw_caps[BIT_DEPTH].value = BIT_DEPTH_8; + else + inst->fw_caps[BIT_DEPTH].value = BIT_DEPTH_10; + + if ((subsc_params.bit_depth != BIT_DEPTH_8 && subsc_params.bit_depth != BIT_DEPTH_10) || !(subsc_params.coded_frames & HFI_BITMASK_FRAME_MBS_ONLY_FLAG)) { dev_err(core->dev, "unsupported content, bit depth: %x, pic_struct = %x\n", subsc_params.bit_depth, subsc_params.coded_frames); diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/media/platform/qcom/iris/iris_instance.h index 16965150f427..16424d1e94a6 100644 --- a/drivers/media/platform/qcom/iris/iris_instance.h +++ b/drivers/media/platform/qcom/iris/iris_instance.h @@ -25,6 +25,8 @@ enum iris_fmt_type_out { enum iris_fmt_type_cap { IRIS_FMT_NV12, IRIS_FMT_QC08C, + IRIS_FMT_TP10, + IRIS_FMT_QC10C, }; struct iris_fmt { diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c index 5da90d47f9c6..ceed4b5d96ca 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c @@ -56,9 +56,10 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_dec[] = { { .cap_id = PROFILE_HEVC, .min = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN, - .max = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_STILL_PICTURE, + .max = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10, .step_or_mask = BIT(V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN) | - BIT(V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_STILL_PICTURE), + BIT(V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_STILL_PICTURE) | + BIT(V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10), .value = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN, .hfi_id = HFI_PROP_PROFILE, .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, @@ -287,7 +288,7 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_dec[] = { { .cap_id = BIT_DEPTH, .min = BIT_DEPTH_8, - .max = BIT_DEPTH_8, + .max = BIT_DEPTH_10, .step_or_mask = 1, .value = BIT_DEPTH_8, .hfi_id = HFI_PROP_LUMA_CHROMA_BIT_DEPTH, @@ -866,6 +867,7 @@ static const u32 sm8550_vdec_output_config_params[] = { HFI_PROP_OPB_ENABLE, HFI_PROP_COLOR_FORMAT, HFI_PROP_LINEAR_STRIDE_SCANLINE, + HFI_PROP_UBWC_STRIDE_SCANLINE, }; static const u32 sm8550_venc_output_config_params[] = { diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/platform/qcom/iris/iris_vdec.c index f4d9951ed04c..65cf509e4aef 100644 --- a/drivers/media/platform/qcom/iris/iris_vdec.c +++ b/drivers/media/platform/qcom/iris/iris_vdec.c @@ -70,6 +70,14 @@ static const struct iris_fmt iris_vdec_formats_cap[] = { .pixfmt = V4L2_PIX_FMT_QC08C, .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, }, + [IRIS_FMT_TP10] = { + .pixfmt = V4L2_PIX_FMT_P010, + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, + }, + [IRIS_FMT_QC10C] = { + .pixfmt = V4L2_PIX_FMT_QC10C, + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, + }, }; static const struct iris_fmt * -- 2.34.1