diff --git a/drivers/video/rockchip/mpp/mpp_common.c b/drivers/video/rockchip/mpp/mpp_common.c index f3a03c95f852..fcdbc00fa293 100644 --- a/drivers/video/rockchip/mpp/mpp_common.c +++ b/drivers/video/rockchip/mpp/mpp_common.c @@ -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 * diff --git a/drivers/video/rockchip/mpp/mpp_common.h b/drivers/video/rockchip/mpp/mpp_common.h index 8f910deec98b..991e6050e259 100644 --- a/drivers/video/rockchip/mpp/mpp_common.h +++ b/drivers/video/rockchip/mpp/mpp_common.h @@ -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; diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec.c b/drivers/video/rockchip/mpp/mpp_rkvdec.c index bd49eaab7eb2..bd4ba960c4cd 100644 --- a/drivers/video/rockchip/mpp/mpp_rkvdec.c +++ b/drivers/video/rockchip/mpp/mpp_rkvdec.c @@ -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");