From patchwork Wed May 24 14:12:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13254044 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59396C7EE2C for ; Wed, 24 May 2023 14:13:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235449AbjEXONx (ORCPT ); Wed, 24 May 2023 10:13:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229919AbjEXONw (ORCPT ); Wed, 24 May 2023 10:13:52 -0400 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D544E12E for ; Wed, 24 May 2023 07:13:50 -0700 (PDT) Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-64d341bdedcso734233b3a.3 for ; Wed, 24 May 2023 07:13:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1684937630; x=1687529630; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wO3RSNxA2bvcMwE7iGwPIm41zuTKHIjUu9E4v9/gL8E=; b=fgp9s7kSBrKrbjGdMoq4qs1uiIKiZHyebpai2HjRqwrXnPo1utEpsXXwaxX7uG8xp3 aPZbk7/ylkmoPxU6R9MHJJ7G+zkppEUbVWbogyZAugWpkF/+hw3n196IrnY8/mY9/Hpv 938OV0hPP1FEzTH0e6QWzScI0p1w5fsci0HCE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684937630; x=1687529630; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wO3RSNxA2bvcMwE7iGwPIm41zuTKHIjUu9E4v9/gL8E=; b=SEAZdgw9a4sj6W+QyVbxNhNXDErnm6ofOoeZ/4LPh62qWio0zD4KhWVA/jd4MO+wfo LqmmrIj74UOYdctD35p8NNVIO7oaHDv+2meYYAJWCWkeUkBueGC24vOFXdR0HLK0328R bHrk2CS8qaMnZaBpsY4KUSnEPLrhVlkWrPc75TxJretnrc9VQa6acsbB3Em9i5Py7GLq sx+PVrccL9VymS/AxbW5WVW2JppBTMuWOUZgcPK/TiE4jVWRIqj5uN4W6CxlJOjFAyBe hZ+Whs04ezUbLlepHBA02zad4JDWzQBZq/QFXIQcvolJSQnf4twSvTueTfdVSAiDkqjF fjKw== X-Gm-Message-State: AC+VfDwxweOViwDmd/kBBr2bKSwLM4klUG2H+EU5tjp/ODPJO2G8c6pm oork9IkfwuW3kNLspPRZO3hUag== X-Google-Smtp-Source: ACHHUZ4P4sRzt2TYQMCb9B1mSIsTqQyFCrQvyJYBiIM5XwQc3vp6t6VJD39OEfRbHyL/iuAVDfBSEQ== X-Received: by 2002:a05:6a00:cd2:b0:63d:4752:4da3 with SMTP id b18-20020a056a000cd200b0063d47524da3mr4035715pfv.25.1684937630019; Wed, 24 May 2023 07:13:50 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:9a0f:9704:f5b2:168b]) by smtp.gmail.com with ESMTPSA id 22-20020aa79116000000b0063b898b3502sm7528503pfh.153.2023.05.24.07.13.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 07:13:49 -0700 (PDT) From: Sergey Senozhatsky To: Stanimir Varbanov , Vikash Garodia , Andy Gross , Bjorn Andersson , Konrad Dybcio Cc: Tomasz Figa , Hans Verkuil , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv3] media: venus: provide video device lock Date: Wed, 24 May 2023 23:12:48 +0900 Message-ID: <20230524141312.2558810-1-senozhatsky@chromium.org> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog In-Reply-To: <20230524135737.2557837-1-senozhatsky@chromium.org> References: <20230524135737.2557837-1-senozhatsky@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Video device has to provide ->lock so that __video_do_ioctl() can serialize IOCTL calls. Provided dedicated enc/dec mutex-s for that purpose. Signed-off-by: Sergey Senozhatsky Reviewed-by: Bryan O'Donoghue Signed-off-by: Sergey Senozhatsky --- drivers/media/platform/qcom/venus/core.h | 4 ++++ drivers/media/platform/qcom/venus/vdec.c | 2 ++ drivers/media/platform/qcom/venus/venc.c | 2 ++ 3 files changed, 8 insertions(+) diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index 4f81669986ba..b6c9a653a007 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -113,7 +113,9 @@ struct venus_format { * @opp_pmdomain: an OPP power-domain * @resets: an array of reset signals * @vdev_dec: a reference to video device structure for decoder instances + * @vdev_dec_lock: decoder instance video device ioctl lock * @vdev_enc: a reference to video device structure for encoder instances + * @vdev_enc_lock: encoder instance video device ioctl lock * @v4l2_dev: a holder for v4l2 device structure * @res: a reference to venus resources structure * @dev: convenience struct device pointer @@ -165,7 +167,9 @@ struct venus_core { struct device *opp_pmdomain; struct reset_control *resets[VIDC_RESETS_NUM_MAX]; struct video_device *vdev_dec; + struct mutex vdev_dec_lock; struct video_device *vdev_enc; + struct mutex vdev_enc_lock; struct v4l2_device v4l2_dev; const struct venus_resources *res; struct device *dev; diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index 51a53bf82bd3..7e9363714bfb 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -1760,6 +1760,7 @@ static int vdec_probe(struct platform_device *pdev) if (!vdev) return -ENOMEM; + mutex_init(&core->vdev_dec_lock); strscpy(vdev->name, "qcom-venus-decoder", sizeof(vdev->name)); vdev->release = video_device_release; vdev->fops = &vdec_fops; @@ -1767,6 +1768,7 @@ static int vdec_probe(struct platform_device *pdev) vdev->vfl_dir = VFL_DIR_M2M; vdev->v4l2_dev = &core->v4l2_dev; vdev->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING; + vdev->lock = &core->vdev_dec_lock; ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1); if (ret) diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index 4666f42feea3..8522ed339d5d 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -1558,6 +1558,7 @@ static int venc_probe(struct platform_device *pdev) if (!vdev) return -ENOMEM; + mutex_init(&core->vdev_enc_lock); strscpy(vdev->name, "qcom-venus-encoder", sizeof(vdev->name)); vdev->release = video_device_release; vdev->fops = &venc_fops; @@ -1565,6 +1566,7 @@ static int venc_probe(struct platform_device *pdev) vdev->vfl_dir = VFL_DIR_M2M; vdev->v4l2_dev = &core->v4l2_dev; vdev->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING; + vdev->lock = &core->vdev_enc_lock; ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1); if (ret)