From patchwork Mon Mar 8 10:52:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 395378 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1600688jai; Mon, 8 Mar 2021 02:53:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJxdOIBO7mlFJ5IMvbjwwxiEA8Q94zcaouZRGbPX2QB3cj37Kj3ccbSSsFtHeVvcimmbVG0U X-Received: by 2002:a05:6402:1d95:: with SMTP id dk21mr21299150edb.280.1615200788316; Mon, 08 Mar 2021 02:53:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615200788; cv=none; d=google.com; s=arc-20160816; b=iH4LGJP68m/o7VuzF8oGXLqZcloXNLozs45aqqCEkQhKtp1zgiMstU+CkLMjeEP80w ywYfWxcUHkbuolRRSc9lJ/OwU4YYhuAkc9w1h606TceF10XTp3Dq0EwY2IwdTpbkZ/ur cNRqm/AYHPhvjeUyKkwbJdT5OqxdEiiDGoVw8PIiSYsEINaIyvJEruFfORPKu1Fd8Yx4 NgCUE8IVHQUy82/1EZyTplEJy2V28fyCjhezGzEMZXfi93rLHQ0yVzpTR9XSIxfxof4B pFJ+ULSR/96dAHLd/6LoxELl4LWUE0hn/vPSOq674E7/s2H0gKcEpif3zAnAcXwkA4qk +qFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=a1XuaInoR0tuPlY8Xeovw7fyTewNoHYbnAtL2fQF1jw=; b=0xTmZX2yqhqB/1PIbk05vJV6+BSDUnYYw4ww8vmqKZLLBgbxsb3YusfAz0IndsudQX UaHrWdHgFn5CjkQuKK1lsHINAh9Fk10zv5+eDlgyQ2LKi5aUQ92EAuRSnjiHgdvQeDt2 I/FA83jHGAvgci5/TJdMGmmE8Yh5giLsbK//0wTQtFyGGEaPMdDkljU5QO3U4TIkaUPs I4p4nP9WeM/S4OEsMglVH7c+Jf4Y7JnEMdnU3HHLfqU4dqEUwTNlEWBvnc33AF3ZWgqD xd5LopVUXIzFhfNahwjj6zmHYVRtHoe2+iJw24dPh9k78+CqUrn6SZ7pGvt7N/AAV8xi 0A0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B6EOG3eE; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a4si6492505ejy.263.2021.03.08.02.53.07; Mon, 08 Mar 2021 02:53:08 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B6EOG3eE; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230343AbhCHKwg (ORCPT + 13 others); Mon, 8 Mar 2021 05:52:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230444AbhCHKwZ (ORCPT ); Mon, 8 Mar 2021 05:52:25 -0500 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30FC7C06175F for ; Mon, 8 Mar 2021 02:52:25 -0800 (PST) Received: by mail-ej1-x634.google.com with SMTP id jt13so19420915ejb.0 for ; Mon, 08 Mar 2021 02:52:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a1XuaInoR0tuPlY8Xeovw7fyTewNoHYbnAtL2fQF1jw=; b=B6EOG3eEDx+Oq57f8XKABz8GGzN0l2eN6WPn8VX6m4aDlgPmjORd1DkwyCup85xFv9 md/fvXE7/rZ/ZdyT+mHt4QU7hohPSHIQ4PSd5RVHkBwZg3Mg76shM8kQizn/2IJNQaTi 4DHbm2JTmTy/uQqdiT0IO8iv2s7BZLf90C0HEZkWInFBREhFnQlhZkaaoj/51mVu3jVB hycNuaCsudNIvFqSITsfzDXS4mmVXbyJDTAJOSqG9SNtfjXosX0VWtQslSH3cn2Kwc6i ObkYDgZd6oJKcQjbQ4PnAKIR7Ul8GBJk6PLXa0B60m1DKWyylB76nCigzyzvfbY/kAUg fdEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a1XuaInoR0tuPlY8Xeovw7fyTewNoHYbnAtL2fQF1jw=; b=TEsBieKzCbysHr0wuSx3SUeX18x6fs2+P79/ZKUb7VrFqfobYITOpa53bl/FjLKymA DQq3rnKPt9vaxWe76g5N/zTEibdw8wX8kNd8cQQ3lgp0xTGrVZ0BV2uqBwClvhw85sXB RLJMjBhMQz/lhmLRWpjoHHJ8K7I7f0LHEFhC+iEm/WgKtzu+Fcev7/W+CXWiq41YHEs4 kztkDPmlNTQwgH5Ztbtw7j2WtaojAjabICiqXCN9+cti68WBNPjzWmanrvYroR46rcZG eTrquEKvzkfoiBNSPloESHLg1B+cSTrM6m0H8XAtOSyiydn8LpIo/FfsNUvGdpZYqftK hdPQ== X-Gm-Message-State: AOAM531RjBIOrzezzCOk68pXoUTrLcvORUBSIbFW6j/nPDxeEkJLzgbh eNzVa1Er2TMvVMCfHe8l/rmr+g== X-Received: by 2002:a17:906:e84:: with SMTP id p4mr14252657ejf.30.1615200743927; Mon, 08 Mar 2021 02:52:23 -0800 (PST) Received: from localhost.localdomain (95-43-196-84.ip.btc-net.bg. [95.43.196.84]) by smtp.gmail.com with ESMTPSA id y9sm6386297ejd.110.2021.03.08.02.52.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 02:52:23 -0800 (PST) From: Stanimir Varbanov To: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: bryan.odonoghue@linaro.org, Stanimir Varbanov , stable@vger.kernel.org Subject: [PATCH 1/5] venus: hfi_parser: Don't initialize parser on v1 Date: Mon, 8 Mar 2021 12:52:01 +0200 Message-Id: <20210308105205.445148-2-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210308105205.445148-1-stanimir.varbanov@linaro.org> References: <20210308105205.445148-1-stanimir.varbanov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The Venus v1 behaves differently comparing with the other Venus version in respect to capability parsing and when they are send to the driver. So we don't need to initialize hfi parser for multiple invocations like what we do for > v1 Venus versions. Fixes: 10865c98986b ("media: venus: parser: Prepare parser for multiple invocations") Cc: stable@vger.kernel.org # v5.10+ Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/hfi_parser.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/drivers/media/platform/qcom/venus/hfi_parser.c b/drivers/media/platform/qcom/venus/hfi_parser.c index 7263c0c32695..ce230974761d 100644 --- a/drivers/media/platform/qcom/venus/hfi_parser.c +++ b/drivers/media/platform/qcom/venus/hfi_parser.c @@ -277,8 +277,10 @@ u32 hfi_parser(struct venus_core *core, struct venus_inst *inst, void *buf, parser_init(inst, &codecs, &domain); - core->codecs_count = 0; - memset(core->caps, 0, sizeof(core->caps)); + if (core->res->hfi_version > HFI_VERSION_1XX) { + core->codecs_count = 0; + memset(core->caps, 0, sizeof(core->caps)); + } while (words_count) { data = word + 1; From patchwork Mon Mar 8 10:52:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 395380 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1600698jai; Mon, 8 Mar 2021 02:53:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJwS6JukabBaibi9IO0dMawwGhn+TOtogmVrcWgAHfIkBzmaZJGi9eMS12SnJ8YNtTlI2i9A X-Received: by 2002:aa7:d686:: with SMTP id d6mr21948597edr.146.1615200789465; Mon, 08 Mar 2021 02:53:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615200789; cv=none; d=google.com; s=arc-20160816; b=G581rNIHr6UubrlJtEfkwMCxP2etOnRbv7aRq5EVi43H3s+lthY3cztNdPTS/bIeO0 T4hYCWJ2zK2osM/8wmPBVrmrvK6GIzOr+f4p0yM7NI8JACm+KZQ/vu3Y+KYAOzvrtPPS VW8pdTKrE+RFDR87J9u07xualz7/BajhNZasWfmsW3Oz5qqk2uMq8kR8LI9a/qWIAW0N 6xtMvQHoz4ngCzH0GLA1JuFEyInTH8oRmPdUKrR0u88JdbeMxzOiIEPMhXUdCKU2fT0J ChlGaXCuRxped7iyuNoxKCsc7EyyyiDs3qoLiAqPw7Ptj49kiSA758PyHsLdNA0rWZ+R oyLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Nu5tkdFsaHazmRd4/55M771FR4RELHyaxuVaBLaaiaE=; b=cYlcW7LmiKU2AlHOjiikL+UZg0WtrhnhjPxeadUCnA6XWL0GQdVAvkMPQFM5ZcRyJW 2pJtRhbRqn6hFJ+7Bqj2vNZrsMnqeEgkPuxZQB5Pcdzngxv51YVzH2LpImDQbnSEPXbZ mQex6b7HaFTyujNMeHptOF5tIh98PZXz8+KS3a0Jp2bWVNr/KIjfhAIeCw2qzGX/4vRK mp/YBizP7ZLGRelcWdytKEEgs/kkuzUqmhqmksItAJr9WjxQ9vbWLTHpCOKReK+izgZK 41PH2OgqOXmc04I5/Jo+NJLQDk+LOdxa7G/D7592e4VQSgUbt0EhulqlzuVkuRyGdzCg x0ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nPiYOkvq; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a4si6492505ejy.263.2021.03.08.02.53.09; Mon, 08 Mar 2021 02:53:09 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nPiYOkvq; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231220AbhCHKwg (ORCPT + 13 others); Mon, 8 Mar 2021 05:52:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230522AbhCHKw0 (ORCPT ); Mon, 8 Mar 2021 05:52:26 -0500 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F8B2C061761 for ; Mon, 8 Mar 2021 02:52:26 -0800 (PST) Received: by mail-ed1-x529.google.com with SMTP id bd6so13931824edb.10 for ; Mon, 08 Mar 2021 02:52:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Nu5tkdFsaHazmRd4/55M771FR4RELHyaxuVaBLaaiaE=; b=nPiYOkvqpxOFvenVXbshjw+7ue8UcdngITP3Sc2q0OMxuvLvE1iLAgDD0kEXI1Oi2X iVoxHCNlKRcZ1UDTmVoy1EddhAVFAXQp7fDPOHnQ5rVwN4uOtw0Ios0vhPRiioS4LjDT UQT7+jt3RP9nIau/UNZKAey75BzkItjF/yEYXERQWRE34VICWmsEGMjSlS5MQkPrANDz zl47MnYwfHTb2utiHgCFg/PxM7bfqBuUp/VF1/Nb1zVPQf5prUFWFooMVBpEC5U07K07 Ic0wQxw9y7463ThW4pGK2htYBvJ/foc/0VtJM+z35a0/EVsfiiQ5CPeMVL69WjVW1B6Y K8EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Nu5tkdFsaHazmRd4/55M771FR4RELHyaxuVaBLaaiaE=; b=sqUp2Xi9yXsCkJIsKFPRoAxBa6HQXnkAdCjHaa6GmxCURAQqDHuJeisvvFDkuZMPuS cDctH8t72cxplxdaBp4Cm+By3bJUJQa1MBJ4Nk37qtF47CnUeHfyOdo/Cp3nEBKiJYLs Upg9fWdyi9mVENMH43y67BNk3/jcXq06tlbCl3KE1GlQqY8qSXcRU1q+j4ix57OX7bLI Vq1YhvxYCFkAPJnFIOkI6n4sVU5C8ejhULUMNkAMZJk0khJDgUFuZx62Ur+Rw2Y50ixU leP4m5fj9MkmRBFj+jiIHTho65sz1Z54B/EfqiMwskcsZWBBnofSKwj1d8jW1DqaaKr1 wDxg== X-Gm-Message-State: AOAM531RllmNZoakIki3bANk8s3/xuowWd6zpmUPDn6QDeaTKwgsUN8w dHbDQmOQevD6H5rs9xIpbNMCUw== X-Received: by 2002:aa7:cb8f:: with SMTP id r15mr21684254edt.130.1615200744772; Mon, 08 Mar 2021 02:52:24 -0800 (PST) Received: from localhost.localdomain (95-43-196-84.ip.btc-net.bg. [95.43.196.84]) by smtp.gmail.com with ESMTPSA id y9sm6386297ejd.110.2021.03.08.02.52.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 02:52:24 -0800 (PST) From: Stanimir Varbanov To: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: bryan.odonoghue@linaro.org, Stanimir Varbanov , stable@vger.kernel.org Subject: [PATCH 2/5] venus: hfi_parser: Check for instance after hfi platform get Date: Mon, 8 Mar 2021 12:52:02 +0200 Message-Id: <20210308105205.445148-3-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210308105205.445148-1-stanimir.varbanov@linaro.org> References: <20210308105205.445148-1-stanimir.varbanov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The inst function argument is != NULL only for Venus v1 and we did not migrate v1 to a hfi_platform abstraction yet. So check for instance != NULL only after hfi_platform_get returns no error. Fixes: e29929266be1 ("media: venus: Get codecs and capabilities from hfi platform") Cc: stable@vger.kernel.org # v5.12+ Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/hfi_parser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/drivers/media/platform/qcom/venus/hfi_parser.c b/drivers/media/platform/qcom/venus/hfi_parser.c index ce230974761d..5b8389b98299 100644 --- a/drivers/media/platform/qcom/venus/hfi_parser.c +++ b/drivers/media/platform/qcom/venus/hfi_parser.c @@ -235,13 +235,13 @@ static int hfi_platform_parser(struct venus_core *core, struct venus_inst *inst) u32 enc_codecs, dec_codecs, count = 0; unsigned int entries; - if (inst) - return 0; - plat = hfi_platform_get(core->res->hfi_version); if (!plat) return -EINVAL; + if (inst) + return 0; + if (plat->codecs) plat->codecs(&enc_codecs, &dec_codecs, &count); From patchwork Mon Mar 8 10:52:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 395381 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1600722jai; Mon, 8 Mar 2021 02:53:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzgDK+3HktJrCp304IlFwIqiwXPgc1cBaxzyfYxuhV8isdD1fXLbn4/NsKuvwiTpwN7b/oz X-Received: by 2002:a05:6402:278b:: with SMTP id b11mr21564874ede.380.1615200792019; Mon, 08 Mar 2021 02:53:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615200792; cv=none; d=google.com; s=arc-20160816; b=bOw0Jj1T1w+PKUQg4a8wdDZW2jzDHE+Y0Ih0KXMhnJoXuGL38sdJ0Ls3t1oHYrwXcE SW6QbFe53bmrVWHHHQWSTZPPZt7UosZ+2fg7UCwjGY8IRBjJ2xXIQO+ZEPW86pSbsU80 a5jTQhvdZZ3YspzzOkElVOtBi2+IF912mw7CTcW+k1pnvRl5CSJES23qpyKFfmdQ32EV aNVEAW+w9RkHLNDWrGuF5UMGpIUOJAUvMLzT8BJ7dPRWSde75+W6Dy4kOpZHknP4BV9N Qk+BuXxjSP+Jsowr83gqs0WSrll+zcyPFtLEDMhJhS4med4hLIeSRWc+WH23hCaHM2bs Yo5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vu6fN70TTMvQg6UpQaIpvnuDMkcE3D856HE5/O9eVos=; b=GzfgmscrYATjTVGowVlAE3c2WTOwtuhEKfbBB5PSJ2p6NVE4dH3dDKfFq7WtHFeFN0 2QFcxn3ZVoOHyckZ9uZ6c3L55KgCkcINqG+0DoCofPFxuY1AJ627t7Z9Gi/XbHWcYHx3 pvDI+zOFlTExz/kl6W6eCO9jX2k3YJXgWNz4I7zZgbAgDuQ+FVBesx2CLvnrEJkwbWKp UUWpTMhJJhTY73r206N2wrRVUlorBD8gppUxw7gv7mykVMpygop6Bdqeiaqca5y1ktyO hs0/d3FZ3q0nNiHRaDNI/qQWwRmHsGyOqgVSR8jFBA10spn1fqxdSPcxl/uQPmEj3+lr 0hWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I9bVMJm2; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a4si6492505ejy.263.2021.03.08.02.53.11; Mon, 08 Mar 2021 02:53:12 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I9bVMJm2; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230453AbhCHKwi (ORCPT + 13 others); Mon, 8 Mar 2021 05:52:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231126AbhCHKw1 (ORCPT ); Mon, 8 Mar 2021 05:52:27 -0500 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDF2EC061762 for ; Mon, 8 Mar 2021 02:52:26 -0800 (PST) Received: by mail-ed1-x532.google.com with SMTP id d13so14015850edp.4 for ; Mon, 08 Mar 2021 02:52:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vu6fN70TTMvQg6UpQaIpvnuDMkcE3D856HE5/O9eVos=; b=I9bVMJm2IYuaF1WJONsRrQL9lxbzBYV/KBi6GsajUUxw0G6KcT5pUs9ZV/ft/DNqUN 6SRVw2/HTp3R3kFqSGekcqHY9vussFZFQJhzRENZrZvWHSgrq0HXXj8MEjqpOlpGD8A8 6yXsUALVqrNgyJRBmhV12DutvsQsd8kyATyS4Q9N3ms2pA1K9HZOqq1WP+mZTfmVam9r tEntzXE5Tn1ni6S4gbqzJvKGSeOh5lo4wZauAve3TF92SQ2HxgukcnYbcBZFS8tBjiju 7zqxtNWndLT+nXIVXCfJue6XbYCKKwkHpNE8usPmFXIWVFdMWKRxdz7iGFptOqusyefE Pp7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vu6fN70TTMvQg6UpQaIpvnuDMkcE3D856HE5/O9eVos=; b=bO+vNfHTCCD8gTBtdvC5X4Ho2q/lkjLYTeI5LXs60Xrvu5Sx5S8AWl+xBog1QrF6tP SaG+6VT9s8gt5CHyFYRco/d86UAq4vMQtZYp3YAqK5F81HnKNxoCU+9ImJhTpJXjEfHn 3ZcKpQLrEWKF9O7YpM3jt8KbtuBW5mPrqDAqJV+NjGAgjzAv4NVOJjkOtgYPlp3ULyjM zHSJNesZXJ4MEjXh4M7B55nEDQEJ7SZzIcrhB1XmTQRo7BS4QIpQDvkIZ5acvcKPyiiu +6k0eHw++UItyGRxr1+m2Tox3ktQGw3lK5aQfFXq0KZPk7PgRHBID5XTYHKK1izGvhtm S6/g== X-Gm-Message-State: AOAM533bY5uvzwJFOjs48bnlzL8ml82aiOhoUkL6wV4ANECqYh1qYQLw 79wLIWxjxwVk6muEXZbEBXb0vA== X-Received: by 2002:a05:6402:2215:: with SMTP id cq21mr21940639edb.281.1615200745696; Mon, 08 Mar 2021 02:52:25 -0800 (PST) Received: from localhost.localdomain (95-43-196-84.ip.btc-net.bg. [95.43.196.84]) by smtp.gmail.com with ESMTPSA id y9sm6386297ejd.110.2021.03.08.02.52.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 02:52:25 -0800 (PST) From: Stanimir Varbanov To: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: bryan.odonoghue@linaro.org, Stanimir Varbanov , stable@vger.kernel.org Subject: [PATCH 3/5] venus: pm_helpers: Set opp clock name for v1 Date: Mon, 8 Mar 2021 12:52:03 +0200 Message-Id: <20210308105205.445148-4-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210308105205.445148-1-stanimir.varbanov@linaro.org> References: <20210308105205.445148-1-stanimir.varbanov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The rate of the core clock is set through devm_pm_opp_set_rate and to avoid errors from it we have to set the name of the clock via dev_pm_opp_set_clkname. Fixes: 9a538b83612c ("media: venus: core: Add support for opp tables/perf voting") Cc: stable@vger.kernel.org # v5.10+ Signed-off-by: Stanimir Varbanov --- .../media/platform/qcom/venus/pm_helpers.c | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c index 43c4e3d9e281..12f6d3ab89ff 100644 --- a/drivers/media/platform/qcom/venus/pm_helpers.c +++ b/drivers/media/platform/qcom/venus/pm_helpers.c @@ -280,8 +280,24 @@ static int load_scale_v1(struct venus_inst *inst) static int core_get_v1(struct device *dev) { struct venus_core *core = dev_get_drvdata(dev); + int ret; + + ret = core_clks_get(core); + if (ret) + return ret; + + core->opp_table = dev_pm_opp_set_clkname(core->dev, "core"); + if (IS_ERR(core->opp_table)) + return PTR_ERR(core->opp_table); - return core_clks_get(core); + return 0; +} + +static void core_put_v1(struct device *dev) +{ + struct venus_core *core = dev_get_drvdata(dev); + + dev_pm_opp_put_clkname(core->opp_table); } static int core_power_v1(struct device *dev, int on) @@ -299,6 +315,7 @@ static int core_power_v1(struct device *dev, int on) static const struct venus_pm_ops pm_ops_v1 = { .core_get = core_get_v1, + .core_put = core_put_v1, .core_power = core_power_v1, .load_scale = load_scale_v1, }; @@ -371,6 +388,7 @@ static int venc_power_v3(struct device *dev, int on) static const struct venus_pm_ops pm_ops_v3 = { .core_get = core_get_v1, + .core_put = core_put_v1, .core_power = core_power_v1, .vdec_get = vdec_get_v3, .vdec_power = vdec_power_v3, From patchwork Mon Mar 8 10:52:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 395925 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BAB8C433E0 for ; Mon, 8 Mar 2021 10:53:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 44BA865204 for ; Mon, 8 Mar 2021 10:53:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231126AbhCHKwj (ORCPT ); Mon, 8 Mar 2021 05:52:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231545AbhCHKw2 (ORCPT ); Mon, 8 Mar 2021 05:52:28 -0500 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB381C061760 for ; Mon, 8 Mar 2021 02:52:27 -0800 (PST) Received: by mail-ed1-x532.google.com with SMTP id m9so13968995edd.5 for ; Mon, 08 Mar 2021 02:52:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mq2bNlOS5Jw/xNPQTz8uc9sf4/Pi/bHXqeAAfOe3FVo=; b=B3/CEv3mHHdgJCsQtXoMb0eBAr+GG6/Y9BFIPpz9x/hrGMBoJAPJaxrjz5QI3XSL+u E3HUSkYkKbziV10c744WNS7MARvQ/03sK4XdRxPDaZvsr4FsYRt7/raGp2sZbjtDa6Ds YUE8O+1HrAa5mVKu5S4IYFTAj9GLVnMSV2hU2akfGtAqR9BJSyTrb83WE8qNAk75fNZ/ VwJ9UJD6M94l5WndVBKN/RcJRhNsvsHAF+RStQsyWKSTsZEE8tgs2XeDitZUIAqNLaQU StBkw/NlMjRu8SbVtBSLH0VO38ueTWWh7Sx8qWHos6mExIL2t15MQntr3nKLKXu3ncB7 9uzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mq2bNlOS5Jw/xNPQTz8uc9sf4/Pi/bHXqeAAfOe3FVo=; b=HeRAodd15WyMtmApcuJM3phshg5hm2N63CWDHs4jkGTKuIvXuOcGmGrYSKYqPZxwRY 3uFmI5xEmDtQpvLS6arGJey0mUhnL/bD2dUwrNNTg79gbq5B4/FhGSpnKmgnTajwG3nT abOykcmkU49TLrLQtWOTFCDVYzxvnTfe9aX9I6MZM1KQfhP96hRA4lDha5y9vLBUr6Kw a5KpCXzsVPjxGdkPAFSIj9n4kUoSOtKZE4FOTUTKXVJ4TtD6K1eBf31gy47jVrGouCLa +bSKysC+UPHUFRJxUZgsDye2/7eu0Kum1uQp7VY67u1hSmqKAIgm6BZnH5mlVXwgLONS Ye5w== X-Gm-Message-State: AOAM5308OLOSIcgRaxrlD05YQPMsjz4Ux0XK6q/rTmVakvvGCU6R5Yc8 cF3L3ow98GRwlVmwf4c8aDZvbw== X-Google-Smtp-Source: ABdhPJyOZIcI62WDUpXXqFZiTJ3osRWWB+/yVSWqdZfpOPJT7COdN9pv+PRDKpaTdbDB13CljdftWA== X-Received: by 2002:a50:81c5:: with SMTP id 63mr22261809ede.356.1615200746576; Mon, 08 Mar 2021 02:52:26 -0800 (PST) Received: from localhost.localdomain (95-43-196-84.ip.btc-net.bg. [95.43.196.84]) by smtp.gmail.com with ESMTPSA id y9sm6386297ejd.110.2021.03.08.02.52.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 02:52:26 -0800 (PST) From: Stanimir Varbanov To: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: bryan.odonoghue@linaro.org, Stanimir Varbanov , stable@vger.kernel.org Subject: [PATCH 4/5] venus: venc_ctrls: Change default header mode Date: Mon, 8 Mar 2021 12:52:04 +0200 Message-Id: <20210308105205.445148-5-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210308105205.445148-1-stanimir.varbanov@linaro.org> References: <20210308105205.445148-1-stanimir.varbanov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org It is observed that on Venus v1 the default header-mode is producing a bitstream which is not playble. Change the default header-mode to joined with 1st frame. Fixes: 002c22bd360e ("media: venus: venc: set inband mode property to FW.") Cc: stable@vger.kernel.org # v5.12+ Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/venc_ctrls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c b/drivers/media/platform/qcom/venus/venc_ctrls.c index a52b80055173..abef0037bf55 100644 --- a/drivers/media/platform/qcom/venus/venc_ctrls.c +++ b/drivers/media/platform/qcom/venus/venc_ctrls.c @@ -359,7 +359,7 @@ int venc_ctrl_init(struct venus_inst *inst) V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME, ~((1 << V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE) | (1 << V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME)), - V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE); + V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME); v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops, V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE, From patchwork Mon Mar 8 10:52:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 395383 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1600766jai; Mon, 8 Mar 2021 02:53:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJwSUKlNxvK6JzJbyTojPqTArgky5FYF106REqOMWD7ty4J5ki960DliBfKC4X3yD/xLEdYv X-Received: by 2002:a17:906:1e4f:: with SMTP id i15mr14134936ejj.349.1615200795052; Mon, 08 Mar 2021 02:53:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615200795; cv=none; d=google.com; s=arc-20160816; b=HZMkvDAuI4V/3apu3ypCEa1wOxtW9K+XY+xkdgIPR9hUtRJ83i7XdP3VZ59dpvWJsk oxVfVJieXHYgofWImNF0x/26f8YGHmMHCdFoNSmCGao0+JNbLm8MANO0Ft8GiKF2amVi X7g5L75j/fSVEng25VnneZBXzvb7kvA9UmBfmftIgSQMDpcPWbIjUJtCpfkxzYp40kPx SgVNuL76Darg/P8Msuyu/uYE+5YGMWz7Mu+FC/yJUtJZOXIfovD9yBwzbVCjmv3QS/Ar 5qlvTWh+pZ3XmnPxlZ4ke0r1QL07HeRUclOc9Tt7Cmc0pWtwZo8UpjoOHas/uyM75p61 Nr+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ed2ZmyjgMuArkep/x+pkAPo7evPjB1BAFOc6v5tfSJ4=; b=eqQGogUxINresgYHzDktwVi3kzkmi2maH8W5DmmhHhml8lafiebsuwjx2B4140UiUv jK32U9IHf4OmNVr6nvZZtl3EBWl0inH792cY09GY7tim6Mc//KcYUjI+wZBO0I9frtwX +s/Ree3xhqtHNKIvKN+TI9RN/jD0GWxZh47Blvhzmz8N+f+XwoJtgdOAh1YMsB0FWg2R 7wbWZgytG6d7HOL4zpOQrC44M3aSwQUtfpKT/bfAl42WYu2V4bAYEHz5k00qx5EuAdVC ZrKSy1rF/HGWo7SwMP5GbHPKZitnqIhiMjBhFPHs3qtI09sIisT8Pef93OxCatwMXGLV L70g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i5DDN26A; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a4si6492505ejy.263.2021.03.08.02.53.14; Mon, 08 Mar 2021 02:53:15 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i5DDN26A; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230519AbhCHKwj (ORCPT + 13 others); Mon, 8 Mar 2021 05:52:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231556AbhCHKw3 (ORCPT ); Mon, 8 Mar 2021 05:52:29 -0500 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 827C4C06175F for ; Mon, 8 Mar 2021 02:52:28 -0800 (PST) Received: by mail-ed1-x535.google.com with SMTP id l12so14012986edt.3 for ; Mon, 08 Mar 2021 02:52:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ed2ZmyjgMuArkep/x+pkAPo7evPjB1BAFOc6v5tfSJ4=; b=i5DDN26Aj7bY9aXwfNceG+NhoTZBh+NU6hUF/EKYDC6mCxMGzFyBmTzQESYeydRhCA uSppQ2DS3VpD/t8ejN/f5KIMxoOycbCeLS7IaBOgNqXDUgugs+voyYawCtnzH67M/ljq gTXTmn3PPxpyM59Z2m+JcIR1DnUMZHx18wo2nCpUbnSkTytm9ZiSTbUb911czkyVzO67 DANktJwG/D6nddWMppt8f8xEVQUNV/sUlvpDceE5Mp8koEzSsUU5hbke/Ic3bJWOGSl2 TjanvsUTbskjUfVkwh7k/Si2eOOI7kZWsy7e16I/bOwNHsb5mKhdiKVsUi2FYTpI2v4i mLVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ed2ZmyjgMuArkep/x+pkAPo7evPjB1BAFOc6v5tfSJ4=; b=MjWdCrQJeSKvE/teVHTVit4eQR6LUs8hOG1/Z6HW/b/RB22Ki3RB/qUYSilwqkyPIj WcaHMTbjnRB9vo33STUqzNs4BmVjL1OM0IAdt1ibrpHclgty/i6nBiUAomhjK5EZqmY2 LbHKCEDv/PAPgaUPF0j1V7GYwLmlGpMk0PQe8ko7lWq55Ddf09Iwa4RJC76ZILRara33 /M4bVdFbMowcd6Me/mFeD0CESbDstuxcKUvNBlN9fOR5OyYKngbSttLaSY+vx3NBKNQi 7u4bIUj1AyxFUEPrBwHvESKLzyj/FkvZBZeM/XFFaCE55ZTmBrQllqe2BroVIu1ElN7o oOwg== X-Gm-Message-State: AOAM532Th/ZmbvCyuUl7PY9jAdVA0YT9wa5lxleSBfDGvit8n/mrzCdy nUu2e7NA26H9h3CVn1KhCPzODg== X-Received: by 2002:a05:6402:254f:: with SMTP id l15mr2366106edb.189.1615200747272; Mon, 08 Mar 2021 02:52:27 -0800 (PST) Received: from localhost.localdomain (95-43-196-84.ip.btc-net.bg. [95.43.196.84]) by smtp.gmail.com with ESMTPSA id y9sm6386297ejd.110.2021.03.08.02.52.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 02:52:27 -0800 (PST) From: Stanimir Varbanov To: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: bryan.odonoghue@linaro.org, Stanimir Varbanov , stable@vger.kernel.org Subject: [PATCH 5/5] venus: hfi_cmds: Support plane-actual-info property from v1 Date: Mon, 8 Mar 2021 12:52:05 +0200 Message-Id: <20210308105205.445148-6-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210308105205.445148-1-stanimir.varbanov@linaro.org> References: <20210308105205.445148-1-stanimir.varbanov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The property is supported from v1 and upwards. So move it to set_property_1x. Fixes: 01e869e78756 ("media: venus: venc: fix handlig of S_SELECTION and G_SELECTION") Cc: stable@vger.kernel.org # v5.12+ Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/hfi_cmds.c | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) -- 2.25.1 diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c index 4f7565834469..558510a8dfc8 100644 --- a/drivers/media/platform/qcom/venus/hfi_cmds.c +++ b/drivers/media/platform/qcom/venus/hfi_cmds.c @@ -1039,6 +1039,18 @@ static int pkt_session_set_property_1x(struct hfi_session_set_property_pkt *pkt, pkt->shdr.hdr.size += sizeof(u32) + sizeof(*hierp); break; } + case HFI_PROPERTY_PARAM_UNCOMPRESSED_PLANE_ACTUAL_INFO: { + struct hfi_uncompressed_plane_actual_info *in = pdata; + struct hfi_uncompressed_plane_actual_info *info = prop_data; + + info->buffer_type = in->buffer_type; + info->num_planes = in->num_planes; + info->plane_format[0] = in->plane_format[0]; + if (in->num_planes > 1) + info->plane_format[1] = in->plane_format[1]; + pkt->shdr.hdr.size += sizeof(u32) + sizeof(*info); + break; + } /* FOLLOWING PROPERTIES ARE NOT IMPLEMENTED IN CORE YET */ case HFI_PROPERTY_CONFIG_BUFFER_REQUIREMENTS: @@ -1205,18 +1217,6 @@ pkt_session_set_property_4xx(struct hfi_session_set_property_pkt *pkt, pkt->shdr.hdr.size += sizeof(u32) + sizeof(*cu); break; } - case HFI_PROPERTY_PARAM_UNCOMPRESSED_PLANE_ACTUAL_INFO: { - struct hfi_uncompressed_plane_actual_info *in = pdata; - struct hfi_uncompressed_plane_actual_info *info = prop_data; - - info->buffer_type = in->buffer_type; - info->num_planes = in->num_planes; - info->plane_format[0] = in->plane_format[0]; - if (in->num_planes > 1) - info->plane_format[1] = in->plane_format[1]; - pkt->shdr.hdr.size += sizeof(u32) + sizeof(*info); - break; - } case HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE: case HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER: case HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE: