From patchwork Mon Feb 22 16:03:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 12099091 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.7 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=ham 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 34D20C433E0 for ; Mon, 22 Feb 2021 16:05:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 09BE364E61 for ; Mon, 22 Feb 2021 16:05:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231469AbhBVQFi (ORCPT ); Mon, 22 Feb 2021 11:05:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231284AbhBVQEv (ORCPT ); Mon, 22 Feb 2021 11:04:51 -0500 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E24C6C0698C3 for ; Mon, 22 Feb 2021 08:02:03 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id h98so14822665wrh.11 for ; Mon, 22 Feb 2021 08:02:03 -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=mpQeOWIwxrnqUYF09ycSkk2SsgXNTv3iPduq13x2l1Y=; b=MRz/MQ+sZNM8+7X2P1PkePpVmdDMq+djL+3uq3107kAI7MSiYwyLyNeWIGYIigR/Nd Z3PORLom9TOIr8cvSACVQ9SbaCqqU2SoE22rMBpqps8qUxHHLsyBjsfuFNW8naJeLWaw RpNPpbweJh80yIwVzF6X8Sv8AT+UJJmmyuhYHCLnVK7kDFKnZmrCQHEaSuoksl04A4oh 2KffzXxcKM0ZZ90Fs5XZzhXJwz8PkdwKdFzUCJZFP4VRoQGTUiz4aj35cJHlYt2WiCEx ZkRzsWKzuka8igwerHeq3yi6GMqX2Pw879+EDaizWjEB+dkECM4QIviktigMvCB0hPJk AO/w== 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=mpQeOWIwxrnqUYF09ycSkk2SsgXNTv3iPduq13x2l1Y=; b=jXy0FI9W48qtRXp/k+kUd9gRhfCBJsGkvVGcVvBH9CztyzA5UcyX7hvOZOY8E6FzpM SbeSGo08xLZOgoj0gjZL+lxyCq9XDX8oNR6idzKBVhku810GfTjAFp9I/kSQNzAE7Baq DFmEAtNdMQ4rRKqV1sVK1GvpWiAAlpBHOSbzNH3b5jn49Zb4XudJtO7iqmyByq+uBLvX OP0xGv+k42sWDS4jWK6o/B18As0r/edPkQGtHjc3jZ5718GXj1RFzCweM0EQqXZQCJKU snTZka5GHhrN/ykmMiCpAcHgo8oygZSy4I+Y0o21V95oYQE7RNVH/NYrHk83pre4Oq1Z 4abg== X-Gm-Message-State: AOAM532gKou9X/6Bp3edJgxJW0QIDbGT9AhwhrZLfQR7FFLWq87fb8tT mOkz7i+XbO/rm6KVCK46TjPYGA== X-Google-Smtp-Source: ABdhPJwG6AJH4vVRD6OQKeKTxQDNn8aFd/KrY6Lakydrbc1lmxwYZWIp59hLD8s2EWtsTxXXL21sig== X-Received: by 2002:adf:e585:: with SMTP id l5mr21667227wrm.85.1614009722745; Mon, 22 Feb 2021 08:02:02 -0800 (PST) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id c3sm7373697wrw.80.2021.02.22.08.02.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 08:02:02 -0800 (PST) From: Bryan O'Donoghue To: stanimir.varbanov@linaro.org, agross@kernel.org, bjorn.andersson@linaro.org, mchehab@kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: bryan.odonoghue@linaro.org, dikshita@codeaurora.org, jonathan@marek.ca, vgarodia@codeaurora.org Subject: [PATCH 25/25] media: venus: vdec: Fix decoder cmd STOP issue Date: Mon, 22 Feb 2021 16:03:00 +0000 Message-Id: <20210222160300.1811121-26-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210222160300.1811121-1-bryan.odonoghue@linaro.org> References: <20210222160300.1811121-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Stanimir Varbanov Fixes an issue when issuing a stop command to the controller, negating the following firmware error. "SFR message from FW: Exception: TID = Unknown IP = 0x3b7dc FA = 0x0 cause = 0x6" Signed-off-by: Stanimir Varbanov Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/hfi_cmds.c | 2 +- drivers/media/platform/qcom/venus/vdec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c index cc282b0df8c3..0a32bb44506c 100644 --- a/drivers/media/platform/qcom/venus/hfi_cmds.c +++ b/drivers/media/platform/qcom/venus/hfi_cmds.c @@ -254,7 +254,7 @@ int pkt_session_unset_buffers(struct hfi_session_release_buffer_pkt *pkt, int pkt_session_etb_decoder(struct hfi_session_empty_buffer_compressed_pkt *pkt, void *cookie, struct hfi_frame_data *in_frame) { - if (!cookie || !in_frame->device_addr) + if (!cookie) return -EINVAL; pkt->shdr.hdr.size = sizeof(*pkt); diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index 903443a7a757..9fbff40c4568 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -515,7 +515,7 @@ vdec_decoder_cmd(struct file *file, void *fh, struct v4l2_decoder_cmd *cmd) fdata.buffer_type = HFI_BUFFER_INPUT; fdata.flags |= HFI_BUFFERFLAG_EOS; - fdata.device_addr = 0xdeadb000; + fdata.device_addr = 0; ret = hfi_session_process_buf(inst, &fdata);