github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 13:37:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

video: rockchip: mpp: adapt to kernel 5.10

Browse Source 
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ie34b851e57c4f80c798117cea026cf7255859423
This commit is contained in:
Yandong Lin 2021-07-14 10:30:05 +08:00 committed by Tao Huang
parent f7382476af
commit 6d15ea1ac3
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/video/rockchip/mpp/mpp_common.c
View File

@ -1832,21 +1832,21 @@ int mpp_set_grf(struct mpp_grf_info *grf_info)
int mpp_time_record(struct mpp_task *task)
{
if (mpp_debug_unlikely(DEBUG_TIMING) && task)
do_gettimeofday(&task->start);
ktime_get_real_ts64(&task->start);
return 0;
}
int mpp_time_diff(struct mpp_task *task)
{
struct timeval end;
struct timespec64 end;
struct mpp_dev *mpp = task->session->mpp;
do_gettimeofday(&end);
mpp_debug(DEBUG_TIMING, "%s: pid: %d, session: %p, time: %ld us\n",
ktime_get_real_ts64(&end);
mpp_debug(DEBUG_TIMING, "%s: pid: %d, session: %p, time: %lld us\n",
dev_name(mpp->dev), task->session->pid, task->session,
(end.tv_sec - task->start.tv_sec) * 1000000 +
(end.tv_usec - task->start.tv_usec));
(end.tv_nsec - task->start.tv_nsec)/1000);
return 0;
}
@ -2018,11 +2018,11 @@ static ssize_t fops_write_u32(struct file *file, const char __user *buf,
return count;
}
static const struct file_operations procfs_fops_u32 = {
.open = fops_open_u32,
.read = seq_read,
.release = single_release,
.write = fops_write_u32,
static const struct proc_ops procfs_fops_u32 = {
.proc_open = fops_open_u32,
.proc_read = seq_read,
.proc_release = single_release,
.proc_write = fops_write_u32,
};
struct proc_dir_entry *

2
drivers/video/rockchip/mpp/mpp_common.h
View File

@ -369,7 +369,7 @@ struct mpp_task {
struct kref ref;
/* record context running start time */
struct timeval start;
struct timespec64 start;
/* hardware info for current task */
struct mpp_hw_info *hw_info;
u32 task_index;

2
drivers/video/rockchip/mpp/mpp_rkvdec.c
View File

@ -1298,7 +1298,7 @@ static int rkvdec_devfreq_init(struct mpp_dev *mpp)
struct rkvdec_dev *dec = to_rkvdec_dev(mpp);
mutex_init(&dec->set_clk_lock);
dec->parent_devfreq = devfreq_get_devfreq_by_phandle(mpp->dev, 0);
dec->parent_devfreq = devfreq_get_devfreq_by_phandle(mpp->dev, "rkvdec_devfreq", 0);
if (IS_ERR_OR_NULL(dec->parent_devfreq)) {
if (PTR_ERR(dec->parent_devfreq) == -EPROBE_DEFER) {
dev_warn(mpp->dev, "parent devfreq is not ready, retry\n");