From patchwork Sat Jan 5 18:31:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ayaka X-Patchwork-Id: 10749343 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2FB3F1399 for ; Sat, 5 Jan 2019 18:32:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F82E28712 for ; Sat, 5 Jan 2019 18:32:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 13F9128818; Sat, 5 Jan 2019 18:32:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5F0DD28712 for ; Sat, 5 Jan 2019 18:32:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ShczyosaNsai66u62jem/IDxB92VwsP9UKxS5/KYxx8=; b=VvYPWv0q7wIbx6 UnScaM+KpYm5HA98TdK1cMMigVnYavwpQGb6Hxt69Lq9bgiXLAXq3fGAjIpYGy9ky13Axwk+vMBBD eA2Dga7Egypp12iyDKpRoiR9ztj7v+q+yrqJCU3h3egtbgDjgAp3ftp9wtabuHqUJ0IthNuzaRzqL 2wwMF7IAC43jvJGvshbIB/BUxop7lpwyS7rx3hBviCq+Z4coSyurhQ5xa06EHwiA9SlULubZxuSzT gQaDYMtaAYqKCQlh7F5reP3guA2fK47U6QYOnZ4riDF6kV8gm68fWWqMwIKF/E5ERx4R/Ij01NCsS 3kVtOfUOr6TnWQ3Bit4w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gfqkG-0004gZ-Vm; Sat, 05 Jan 2019 18:32:29 +0000 Received: from kozue.soulik.info ([2001:19f0:7000:8404:5054:ff:fe75:428f]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gfqjs-0004E9-8u; Sat, 05 Jan 2019 18:32:11 +0000 Received: from misaki.sumomo.pri (unknown [IPv6:2001:470:b30d:2:c604:15ff:0:a00]) by kozue.soulik.info (Postfix) with ESMTPA id 38166101784; Sun, 6 Jan 2019 03:32:42 +0900 (JST) From: Randy Li To: linux-rockchip@lists.infradead.org Subject: [PATCH 2/4] staging: video: rockchip: fixup for upstream Date: Sun, 6 Jan 2019 02:31:48 +0800 Message-Id: <20190105183150.20266-3-ayaka@soulik.info> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190105183150.20266-1-ayaka@soulik.info> References: <20190105183150.20266-1-ayaka@soulik.info> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190105_103204_997452_E0A93929 X-CRM114-Status: GOOD ( 10.00 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hverkuil@xs4all.nl, nicolas.dufresne@collabora.com, heiko@sntech.de, Randy Li , linux-kernel@vger.kernel.org, paul.kocialkowski@bootlin.com, myy@miouyouyou.fr, mchehab@kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Fixing those deprecated function from vendor kernel. Removing those features don't exist in upstream kernel. Signed-off-by: Randy Li --- drivers/staging/rockchip-mpp/mpp_dev_common.c | 12 ++++++------ drivers/staging/rockchip-mpp/mpp_dev_common.h | 2 +- drivers/staging/rockchip-mpp/mpp_dev_rkvdec.c | 7 +++---- drivers/staging/rockchip-mpp/mpp_dev_vdpu1.c | 5 ++--- drivers/staging/rockchip-mpp/mpp_dev_vdpu2.c | 5 ++--- drivers/staging/rockchip-mpp/mpp_dev_vepu1.c | 5 ++--- drivers/staging/rockchip-mpp/mpp_dev_vepu2.c | 5 ++--- 7 files changed, 18 insertions(+), 23 deletions(-) diff --git a/drivers/staging/rockchip-mpp/mpp_dev_common.c b/drivers/staging/rockchip-mpp/mpp_dev_common.c index 159aa5d244ce..9a257c254d4d 100644 --- a/drivers/staging/rockchip-mpp/mpp_dev_common.c +++ b/drivers/staging/rockchip-mpp/mpp_dev_common.c @@ -937,18 +937,18 @@ EXPORT_SYMBOL(mpp_dev_read); void mpp_debug_time_record(struct mpp_task *task) { if (unlikely(debug & DEBUG_TIMING) && task) - do_gettimeofday(&task->start); + getboottime64(&task->start); } EXPORT_SYMBOL(mpp_debug_time_record); void mpp_debug_time_diff(struct mpp_task *task) { - struct timeval end; + struct timespec64 end; - do_gettimeofday(&end); - mpp_debug(DEBUG_TIMING, "time: %ld us\n", - (end.tv_sec - task->start.tv_sec) * 1000000 + - (end.tv_usec - task->start.tv_usec)); + getboottime64(&end); + mpp_debug(DEBUG_TIMING, "time: %lld ms\n", + (end.tv_sec - task->start.tv_sec) * 1000 + + (end.tv_nsec - task->start.tv_nsec) / 1000000); } EXPORT_SYMBOL(mpp_debug_time_diff); diff --git a/drivers/staging/rockchip-mpp/mpp_dev_common.h b/drivers/staging/rockchip-mpp/mpp_dev_common.h index 8a7dc7444dc3..76d53ec2c452 100644 --- a/drivers/staging/rockchip-mpp/mpp_dev_common.h +++ b/drivers/staging/rockchip-mpp/mpp_dev_common.h @@ -124,7 +124,7 @@ struct mpp_task { struct work_struct work; /* record context running start time */ - struct timeval start; + struct timespec64 start; }; /* diff --git a/drivers/staging/rockchip-mpp/mpp_dev_rkvdec.c b/drivers/staging/rockchip-mpp/mpp_dev_rkvdec.c index a3da27cfc10e..44d76eba901f 100644 --- a/drivers/staging/rockchip-mpp/mpp_dev_rkvdec.c +++ b/drivers/staging/rockchip-mpp/mpp_dev_rkvdec.c @@ -19,10 +19,10 @@ #include #include #include -#include #include #include #include +#include #include "mpp_debug.h" #include "mpp_dev_common.h" @@ -230,8 +230,7 @@ static int fill_scaling_list_pps(struct rkvdec_task *task, int fd, int offset, return -ENOENT; } - ret = dma_buf_begin_cpu_access(dmabuf, 0, dmabuf->size, - DMA_FROM_DEVICE); + ret = dma_buf_begin_cpu_access(dmabuf, DMA_FROM_DEVICE); if (ret) { dev_err(dev, "can't access the pps buffer\n"); goto done; @@ -277,7 +276,7 @@ static int fill_scaling_list_pps(struct rkvdec_task *task, int fd, int offset, done: dma_buf_vunmap(dmabuf, vaddr); - dma_buf_end_cpu_access(dmabuf, 0, dmabuf->size, DMA_FROM_DEVICE); + dma_buf_end_cpu_access(dmabuf, DMA_FROM_DEVICE); dma_buf_put(dmabuf); return ret; diff --git a/drivers/staging/rockchip-mpp/mpp_dev_vdpu1.c b/drivers/staging/rockchip-mpp/mpp_dev_vdpu1.c index 4371a1a6080b..63ffd79bfe83 100644 --- a/drivers/staging/rockchip-mpp/mpp_dev_vdpu1.c +++ b/drivers/staging/rockchip-mpp/mpp_dev_vdpu1.c @@ -460,9 +460,8 @@ static int rockchip_mpp_rkvdpu_assign_reset(struct rockchip_rkvdpu_dev *dec_dev) { struct rockchip_mpp_dev *mpp_dev = &dec_dev->mpp_dev; - /* TODO: use devm_reset_control_get_share() instead */ - dec_dev->rst_a = devm_reset_control_get(mpp_dev->dev, "video_a"); - dec_dev->rst_h = devm_reset_control_get(mpp_dev->dev, "video_h"); + dec_dev->rst_a = devm_reset_control_get_shared(mpp_dev->dev, "video_a"); + dec_dev->rst_h = devm_reset_control_get_shared(mpp_dev->dev, "video_h"); if (IS_ERR_OR_NULL(dec_dev->rst_a)) { mpp_err("No aclk reset resource define\n"); diff --git a/drivers/staging/rockchip-mpp/mpp_dev_vdpu2.c b/drivers/staging/rockchip-mpp/mpp_dev_vdpu2.c index b131790f72a3..5789c8940543 100644 --- a/drivers/staging/rockchip-mpp/mpp_dev_vdpu2.c +++ b/drivers/staging/rockchip-mpp/mpp_dev_vdpu2.c @@ -428,9 +428,8 @@ static int rockchip_mpp_rkvdpu_assign_reset(struct rockchip_rkvdpu_dev *dec_dev) { struct rockchip_mpp_dev *mpp_dev = &dec_dev->mpp_dev; - /* TODO: use devm_reset_control_get_share() instead */ - dec_dev->rst_a = devm_reset_control_get(mpp_dev->dev, "video_a"); - dec_dev->rst_h = devm_reset_control_get(mpp_dev->dev, "video_h"); + dec_dev->rst_a = devm_reset_control_get_shared(mpp_dev->dev, "video_a"); + dec_dev->rst_h = devm_reset_control_get_shared(mpp_dev->dev, "video_h"); if (IS_ERR_OR_NULL(dec_dev->rst_a)) { mpp_err("No aclk reset resource define\n"); diff --git a/drivers/staging/rockchip-mpp/mpp_dev_vepu1.c b/drivers/staging/rockchip-mpp/mpp_dev_vepu1.c index 64619092c792..ebe8174e931e 100644 --- a/drivers/staging/rockchip-mpp/mpp_dev_vepu1.c +++ b/drivers/staging/rockchip-mpp/mpp_dev_vepu1.c @@ -330,9 +330,8 @@ static int rockchip_mpp_rkvepu_assign_reset(struct rockchip_rkvepu_dev *enc_dev) { struct rockchip_mpp_dev *mpp_dev = &enc_dev->mpp_dev; - /* TODO: use devm_reset_control_get_share() instead */ - enc_dev->rst_a = devm_reset_control_get(mpp_dev->dev, "video_a"); - enc_dev->rst_h = devm_reset_control_get(mpp_dev->dev, "video_h"); + enc_dev->rst_a = devm_reset_control_get_shared(mpp_dev->dev, "video_a"); + enc_dev->rst_h = devm_reset_control_get_shared(mpp_dev->dev, "video_h"); if (IS_ERR_OR_NULL(enc_dev->rst_a)) { mpp_err("No aclk reset resource define\n"); diff --git a/drivers/staging/rockchip-mpp/mpp_dev_vepu2.c b/drivers/staging/rockchip-mpp/mpp_dev_vepu2.c index 48ec401145d5..889aaccf25c5 100644 --- a/drivers/staging/rockchip-mpp/mpp_dev_vepu2.c +++ b/drivers/staging/rockchip-mpp/mpp_dev_vepu2.c @@ -327,9 +327,8 @@ static int rockchip_mpp_rkvepu_assign_reset(struct rockchip_rkvepu_dev *enc_dev) { struct rockchip_mpp_dev *mpp_dev = &enc_dev->mpp_dev; - /* TODO: use devm_reset_control_get_share() instead */ - enc_dev->rst_a = devm_reset_control_get(mpp_dev->dev, "video_a"); - enc_dev->rst_h = devm_reset_control_get(mpp_dev->dev, "video_h"); + enc_dev->rst_a = devm_reset_control_get_shared(mpp_dev->dev, "video_a"); + enc_dev->rst_h = devm_reset_control_get_shared(mpp_dev->dev, "video_h"); if (IS_ERR_OR_NULL(enc_dev->rst_a)) { mpp_err("No aclk reset resource define\n");