by Sandy Huang

[permalink] [raw]

Subject: Re: [PATCH v2 03/43] drm/rockchip: Respect page offset for PRIME mmap calls

在 2018/1/26 21:16, Thierry Escande 写道:
> From: Ørjan Eide <[email protected]>
>
> When mapping external DMA-bufs through the PRIME mmap call, we might be
> given an offset which has to be respected. However for the internal DRM
> GEM mmap path, we have to ignore the fake mmap offset used to identify
> the buffer only. Currently the code always zeroes out vma->vm_pgoff,
> which breaks the former.
>
> This patch fixes the problem by moving the vm_pgoff assignment to a
> function that is used only for GEM mmap path, so that the PRIME path
> retains the original offset.
>
> Cc: Daniel Kurtz <[email protected]>
> Signed-off-by: Ørjan Eide <[email protected]>
> Signed-off-by: Tomasz Figa <[email protected]>
> Signed-off-by: Sean Paul <[email protected]>
> Signed-off-by: Thierry Escande <[email protected]>
> Tested-by: Heiko Stuebner <[email protected]>
> ---
> drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> index 5d52020deca1..074db7a92809 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> @@ -264,7 +264,6 @@ static int rockchip_drm_gem_object_mmap(struct drm_gem_object *obj,
> * VM_PFNMAP flag that was set by drm_gem_mmap_obj()/drm_gem_mmap().
> */
> vma->vm_flags &= ~VM_PFNMAP;
> - vma->vm_pgoff = 0;
>
> if (rk_obj->pages)
> ret = rockchip_drm_gem_object_mmap_iommu(obj, vma);
> @@ -299,6 +298,12 @@ int rockchip_gem_mmap(struct file *filp, struct vm_area_struct *vma)
> if (ret)
> return ret;
>
> + /*
> + * Set vm_pgoff (used as a fake buffer offset by DRM) to 0 and map the
> + * whole buffer from the start.
> + */
> + vma->vm_pgoff = 0;
> +
> obj = vma->vm_private_data;
>
> return rockchip_drm_gem_object_mmap(obj, vma);
>

Reviewed-by: Sandy huang <[email protected]>

2018-01-30 02:56:23

by Sandy Huang

[permalink] [raw]

Subject: Re: [PATCH v2 10/43] drm/rockchip: add mutex vop lock

?? 2018/1/26 21:16, Thierry Escande д??:
> From: zain wang <[email protected]>
>
> Add a lock to vop to avoid disabling the crtc while waiting for a line
> flag while enabling psr. If we disable in the middle of waiting for the
> line flag, we'll end up timing out or worse.
>
> Signed-off-by: zain wang <[email protected]>
> Signed-off-by: Sean Paul <[email protected]>
> Signed-off-by: Thierry Escande <[email protected]>
> ---
> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 30 +++++++++++++++++++++++------
> 1 file changed, 24 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> index 31304434847a..bf4b1a2f3fa4 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> @@ -117,6 +117,8 @@ struct vop {
> spinlock_t reg_lock;
> /* lock vop irq reg */
> spinlock_t irq_lock;
> + /* protects crtc enable/disable */
> + struct mutex vop_lock;
>
> unsigned int irq;
>
> @@ -577,6 +579,7 @@ static void vop_crtc_atomic_disable(struct drm_crtc *crtc,
>
> WARN_ON(vop->event);
>
> + mutex_lock(&vop->vop_lock);
> drm_crtc_vblank_off(crtc);
>
> /*
> @@ -612,6 +615,7 @@ static void vop_crtc_atomic_disable(struct drm_crtc *crtc,
> clk_disable(vop->aclk);
> clk_disable(vop->hclk);
> pm_runtime_put(vop->dev);
> + mutex_unlock(&vop->vop_lock);
>
> if (crtc->state->event && !crtc->state->active) {
> spin_lock_irq(&crtc->dev->event_lock);
> @@ -882,10 +886,13 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc,
> uint32_t pin_pol, val;
> int ret;
>
> + mutex_lock(&vop->vop_lock);
> +
> WARN_ON(vop->event);
>
> ret = vop_enable(crtc);
> if (ret) {
> + mutex_unlock(&vop->vop_lock);
> DRM_DEV_ERROR(vop->dev, "Failed to enable vop (%d)\n", ret);
> return;
> }
> @@ -949,6 +956,7 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc,
> clk_set_rate(vop->dclk, adjusted_mode->clock * 1000);
>
> VOP_REG_SET(vop, common, standby, 0);
> + mutex_unlock(&vop->vop_lock);
> }
>
> static bool vop_fs_irq_is_pending(struct vop *vop)
> @@ -1487,15 +1495,21 @@ int rockchip_drm_wait_vact_end(struct drm_crtc *crtc, unsigned int mstimeout)
> {
> struct vop *vop = to_vop(crtc);
> unsigned long jiffies_left;
> + int ret = 0;
>
> if (!crtc || !vop->is_enabled)
> return -ENODEV;
>
> - if (mstimeout <= 0)
> - return -EINVAL;
> + mutex_lock(&vop->vop_lock);
> + if (mstimeout <= 0) {
> + ret = -EINVAL;
> + goto out;
> + }
>
> - if (vop_line_flag_irq_is_enabled(vop))
> - return -EBUSY;
> + if (vop_line_flag_irq_is_enabled(vop)) {
> + ret = -EBUSY;
> + goto out;
> + }
>
> reinit_completion(&vop->line_flag_completion);
> vop_line_flag_irq_enable(vop);
> @@ -1506,10 +1520,13 @@ int rockchip_drm_wait_vact_end(struct drm_crtc *crtc, unsigned int mstimeout)
>
> if (jiffies_left == 0) {
> DRM_DEV_ERROR(vop->dev, "Timeout waiting for IRQ\n");
> - return -ETIMEDOUT;
> + ret = -ETIMEDOUT;
> + goto out;
> }
>
> - return 0;
> +out:
> + mutex_unlock(&vop->vop_lock);
> + return ret;
> }
> EXPORT_SYMBOL(rockchip_drm_wait_vact_end);
>
> @@ -1559,6 +1576,7 @@ static int vop_bind(struct device *dev, struct device *master, void *data)
>
> spin_lock_init(&vop->reg_lock);
> spin_lock_init(&vop->irq_lock);
> + mutex_init(&vop->vop_lock);
>
> ret = devm_request_irq(dev, vop->irq, vop_isr,
> IRQF_SHARED, dev_name(dev), vop);
>

Reviewed-by: Sandy huang <[email protected]>