Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp3779193pxb; Mon, 9 Nov 2020 22:51:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJzR6LMrCtvs32YwjJf55kr/KRjnL8hVC3ZKq0oaBI8+LptW+mzOm75jWjRoFLVDgJsWifFk X-Received: by 2002:a17:906:a996:: with SMTP id jr22mr19202421ejb.463.1604991062074; Mon, 09 Nov 2020 22:51:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604991062; cv=none; d=google.com; s=arc-20160816; b=sy7/KWvk2Tn6yRilwdjj6iPbs0Z3EGRCnn3K0Y0DPlmzxfROX3oz5M6+wUImwEuu9N rhGBVy1hgMnMH4/yeukMS2FWGyQLWSc0HeQ7yvRHmC0pX2VmORlPf9p8R+AUnH+ZDHXH CoC03hE7MWTjQAmSm3qTziDD9unb0YW2MdlbiIh6Ta8VhRhjpngBSiSx99cCC5GmceG+ 5PRIo7CHuROpRNC6yGlFOZoMb0EfYWR4yK85ua5jsBClhgHHBjYqLMTNqsI4x32M98kZ kZ9MitduIrFzy+0le5h8vgJP3kY6R5LFBURibWJxbBrdJW6vXD8JNeRMgfpFuE84ST5m y+IQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=NBj9yf7JPcv+mdaInvqgT7nlmv+A5z96ii6RNMo5eKU=; b=bD57Jucu1Y3/zmpO6hcER1rDqypLNI+87L0hNds6/Kn1jq1vsJySoxnTqw5G/SPFw0 HjaRTCyOPMd94CIK3RUNBgdgspa3FIE3DsI3Cy0DVB+xgmU3skx6apYO3GJVLicnz4se uCXA3Nqu2fuo10Z6sT+bsPTnQLgZZBc+mgyXuxxK3LUWRfX2GAlJ02j6Mt0LafzDXzpV glUMGpFvKje9upRp1gJPfuQE1l3NFD35M5C50qQSush/WdB1s+nWpy6slgNR9abWOEig RBIbt7TMhEmnMenl7nyeLeItWqsRLg1B8fzX41MqLJdB2liVA7bkDsbJA/+Xr+FgUk3g lTnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=lfYx8QpX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s16si6239194eja.292.2020.11.09.22.50.39; Mon, 09 Nov 2020 22:51:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-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=@chromium.org header.s=google header.b=lfYx8QpX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731072AbgKJGrN (ORCPT + 99 others); Tue, 10 Nov 2020 01:47:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727089AbgKJGrN (ORCPT ); Tue, 10 Nov 2020 01:47:13 -0500 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DC3BC0613CF for ; Mon, 9 Nov 2020 22:47:11 -0800 (PST) Received: by mail-pl1-x643.google.com with SMTP id k7so6000660plk.3 for ; Mon, 09 Nov 2020 22:47:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NBj9yf7JPcv+mdaInvqgT7nlmv+A5z96ii6RNMo5eKU=; b=lfYx8QpXLXcwlJ1H8XZjzDwW0T3mFB53p5B/Zc17ROZ0luPZ+mT82fy2CZRLx3dIRv vLGSanK4yH6gmhCA6VPSb1rc9cppbOncGbBLbSLydZvtGVVx0gv9ICgJpYD9+2Yj2dk5 WJ/rdBShm/6F4qUakXEhX8FwLF9/W9Hnv/vXc= 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:mime-version :content-transfer-encoding; bh=NBj9yf7JPcv+mdaInvqgT7nlmv+A5z96ii6RNMo5eKU=; b=atLZYlV1vx8W0WlzB+UUR/WtzoZRAJBUu+t2N+9WcttyrKVi0nZqK1QuHl1XwabCY9 vHl2TG8Uh7OGINoTddSxnFP1G5Y/wopxMETty9DLQAuFuESXEKm9OW1e887XPgiJFDa9 slC2DawbRaaB46JlVeB0zF/VcKDSSWzSnt69zuaEkXejkEaBSBqZ4ZRErQTkcKEtEbrJ ryVxJC1jedECGMld+KkyoEV+yFi+8hyxuzLDvhn7TtuOYRXwDl8t4dcRGhc/y3whTPJH 836hGTUMQIuFvKe7C1/ENVGKQCPtgXM1vQOZJWn4ihUn0Z5LjP93sHyHfNad+60KM4+0 tgvw== X-Gm-Message-State: AOAM531W7T9bBGk7LM4hMftu7nDRC73jZuvPV1/sysN+DFtKM4Hid+fo +cosm7A1RoPLrCznuQnxGlmIvg== X-Received: by 2002:a17:902:c20c:b029:d7:d13f:4172 with SMTP id 12-20020a170902c20cb02900d7d13f4172mr11454245pll.21.1604990831112; Mon, 09 Nov 2020 22:47:11 -0800 (PST) Received: from localhost (56.72.82.34.bc.googleusercontent.com. [34.82.72.56]) by smtp.gmail.com with ESMTPSA id z11sm13496771pfk.52.2020.11.09.22.47.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 09 Nov 2020 22:47:10 -0800 (PST) From: Fritz Koenig To: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, stanimir.varbanov@linaro.org, vgarodia@codeaurora.org, dikshita@codeaurora.org, acourbot@chromium.org, tfiga@chromium.org Cc: Fritz Koenig Subject: [PATCH] venus: guard load_scale Date: Tue, 10 Nov 2020 06:46:51 +0000 Message-Id: <20201110064650.143800-1-frkoenig@chromium.org> X-Mailer: git-send-email 2.29.2.299.gdc1121823c-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org load_scale can only be safely called after the encoder has been initialized. Signed-off-by: Fritz Koenig --- drivers/media/platform/qcom/venus/pm_helpers.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/media/platform/qcom/venus/pm_helpers.h b/drivers/media/platform/qcom/venus/pm_helpers.h index aa2f6afa23544..32e27db1fa740 100644 --- a/drivers/media/platform/qcom/venus/pm_helpers.h +++ b/drivers/media/platform/qcom/venus/pm_helpers.h @@ -35,6 +35,10 @@ static inline int venus_pm_load_scale(struct venus_inst *inst) if (!core->pm_ops || !core->pm_ops->load_scale) return 0; + if (inst->session_type == VIDC_SESSION_TYPE_ENC && + inst->enc_state == VENUS_ENC_STATE_INIT) + return 0; + return core->pm_ops->load_scale(inst); } -- 2.29.2.299.gdc1121823c-goog