Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp307977pxy; Wed, 5 May 2021 02:46:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6ld+f2tiJDTifx9AsKuHIeQQYDCzM085/8T9lINQ1+ZBnBdUc3M+NDiC0oDSc/KUIbV2r X-Received: by 2002:a17:902:f203:b029:ee:e32f:2a28 with SMTP id m3-20020a170902f203b02900eee32f2a28mr11268028plc.45.1620207961998; Wed, 05 May 2021 02:46:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620207961; cv=none; d=google.com; s=arc-20160816; b=G7tZIVkCUNxN02l47igHMU/11yS6rGmDu5xlrjaMeGMr90wjYLNgjdz3T/s+a8f8Bq Ro/RmHGSLFtqFKbm15S5/0LCsVEKtWEIaRAgWzzo4xLCbF4zoImhbCg/jZqBhh5gC4da VPIn54zdQoFWzQ16KdsVudztIlB1cZ6HPy5uY9sICiNZAn3raY6/wuOC2412XQBcMCbv ncmimtjh/HgdpZPaS+cZ+zG9WzATWE3RNYR+00cK1qbQ+I3CadhqW+6XVEnzERtnadHc VfdoLwohKvXl40s/utgFtOnpljbXd5q8ug00pYebC4uazxssmh09YiHwoQ6sZPMgM6Uo xqAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=8NehB0bHaN0i3xYOIzTYzlkaJczlWkn3wPru+u3fu2s=; b=GYFbllxqZHZ908PRYIpJhU6DyM/YIEe/VHRgLd94IJYIlIDr+CmjXR24IY4l7jQiHD eUr/2rq2qBZ8GlXuFJo0Wu6XmtxZjM09zc0vhrLMTwlqFVQds+PekUq5eOhCJcn6mRG6 iCgMCSyqijFqn/5z1kYmtYL8izzRxzFGhieB+rG0gp9wB3Lf1EogIoblrqfCVuVSLLfR 1bfTt9fFUwqe4hHIy9UZhsdXZrlWS2zC/JdQmcFVklxD9y9dRJRAayyEYibxWw+8BlWI 534RS+FtaKDjid+6aEl3hgMp+nXdSsOiVPcTfUPrdRrCBYoWaTGS1X2XzXdKdYXC42ok Bm7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=OJwXWSgC; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s14si23507829pfw.209.2021.05.05.02.45.49; Wed, 05 May 2021 02:46:01 -0700 (PDT) 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=fail header.i=@kernel.org header.s=k20201202 header.b=OJwXWSgC; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233235AbhEEJoV (ORCPT + 99 others); Wed, 5 May 2021 05:44:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:48622 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232400AbhEEJnQ (ORCPT ); Wed, 5 May 2021 05:43:16 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1DCD961411; Wed, 5 May 2021 09:42:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620207739; bh=/VfMQN3+pkon4IAGYHihI8JDgg/MmcbaQd2LgSvJOKs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OJwXWSgCTeFz4nYyd0dPxgy9oWhU8iKG/zEMSgLxJk9nEFTQlcGrcj6aQAzFg8GOx QVVoLds9pHATVB973bb6D5NJ/4900udi760KWYgOCfjTG2huOov9iIGMjl8fYqrUTj tqQjLvebLD9FOGARehRd+WMzGSPCanIGJ36e1RZp7wDOdRn+8ap5QHz3kYwNh9pLf3 FBfnEmhMRBPKhjcZkUJM02ecdANSZeZkA3wBhZcwmg11kwyOLUwolHZZL/5zqltfvg FT8BgIxPvmzD4sDImXahZtGrgOFuiXwD/NEFHYWSMcs7ziApJJZaCfjh5keDxY9TFq ZAUI+Gxg5QIfg== Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1leE2q-00AHwF-Vt; Wed, 05 May 2021 11:42:16 +0200 From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Ezequiel Garcia , Greg Kroah-Hartman , Hans Verkuil , Mauro Carvalho Chehab , Philipp Zabel , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev Subject: [PATCH 09/25] media: hantro: do a PM resume earlier Date: Wed, 5 May 2021 11:41:59 +0200 Message-Id: <82114a4bd9c7bc1188c6a7167a6e74bb3360961d.1620207353.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The device_run() first enables the clock and then tries to resume PM runtime, checking for errors. Well, if for some reason the pm_runtime can not resume, it would be better to detect it beforehand. So, change the order inside device_run(). Reviewed-by: Ezequiel Garcia Fixes: 775fec69008d ("media: add Rockchip VPU JPEG encoder driver") Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/hantro/hantro_drv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c index 595e82a82728..4387edaa1d0d 100644 --- a/drivers/staging/media/hantro/hantro_drv.c +++ b/drivers/staging/media/hantro/hantro_drv.c @@ -152,13 +152,14 @@ static void device_run(void *priv) src = hantro_get_src_buf(ctx); dst = hantro_get_dst_buf(ctx); - ret = clk_bulk_enable(ctx->dev->variant->num_clocks, ctx->dev->clocks); - if (ret) - goto err_cancel_job; ret = pm_runtime_get_sync(ctx->dev->dev); if (ret < 0) goto err_cancel_job; + ret = clk_bulk_enable(ctx->dev->variant->num_clocks, ctx->dev->clocks); + if (ret) + goto err_cancel_job; + v4l2_m2m_buf_copy_metadata(src, dst, true); ctx->codec_ops->run(ctx); -- 2.30.2