Skip to content

Commit

Permalink
drm/rockchip: Don't use atomic constructs for psr
Browse files Browse the repository at this point in the history 
Instead of using timer and spinlocks, use delayed_work and
mutexes for rockchip psr. This allows us to make blocking
calls when enabling/disabling psr (which is sort of important
given we're talking over dpcd to the display).

Cc: Caesar Wang <wxt@rock-chips.com>
Cc: 征增 王 <wzz@rock-chips.com>
Cc: Stéphane Marchesin <marcheu@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20180305222324.5872-3-enric.balletbo@collabora.com
  • Loading branch information
Sean Paul authored and Heiko Stuebner committed Mar 8, 2018
1 parent 7f3c191 commit 60beecc
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 41 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/rockchip/rockchip_drm_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ static int rockchip_drm_bind(struct device *dev)
drm_dev->dev_private = private;

INIT_LIST_HEAD(&private->psr_list);
spin_lock_init(&private->psr_list_lock);
mutex_init(&private->psr_list_lock);

ret = rockchip_drm_init_iommu(drm_dev);
if (ret)
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/rockchip/rockchip_drm_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ struct rockchip_drm_private {
struct mutex mm_lock;
struct drm_mm mm;
struct list_head psr_list;
spinlock_t psr_list_lock;
struct mutex psr_list_lock;
};

int rockchip_drm_dma_attach_device(struct drm_device *drm_dev,
Expand Down
68 changes: 29 additions & 39 deletions drivers/gpu/drm/rockchip/rockchip_drm_psr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "rockchip_drm_drv.h"
#include "rockchip_drm_psr.h"

#define PSR_FLUSH_TIMEOUT msecs_to_jiffies(100)
#define PSR_FLUSH_TIMEOUT_MS 100

enum psr_state {
PSR_FLUSH,
Expand All @@ -30,11 +30,11 @@ struct psr_drv {
struct list_head list;
struct drm_encoder *encoder;

spinlock_t lock;
struct mutex lock;
bool active;
enum psr_state state;

struct timer_list flush_timer;
struct delayed_work flush_work;

void (*set)(struct drm_encoder *encoder, bool enable);
};
Expand All @@ -43,35 +43,33 @@ static struct psr_drv *find_psr_by_crtc(struct drm_crtc *crtc)
{
struct rockchip_drm_private *drm_drv = crtc->dev->dev_private;
struct psr_drv *psr;
unsigned long flags;

spin_lock_irqsave(&drm_drv->psr_list_lock, flags);
mutex_lock(&drm_drv->psr_list_lock);
list_for_each_entry(psr, &drm_drv->psr_list, list) {
if (psr->encoder->crtc == crtc)
goto out;
}
psr = ERR_PTR(-ENODEV);

out:
spin_unlock_irqrestore(&drm_drv->psr_list_lock, flags);
mutex_unlock(&drm_drv->psr_list_lock);
return psr;
}

static struct psr_drv *find_psr_by_encoder(struct drm_encoder *encoder)
{
struct rockchip_drm_private *drm_drv = encoder->dev->dev_private;
struct psr_drv *psr;
unsigned long flags;

spin_lock_irqsave(&drm_drv->psr_list_lock, flags);
mutex_lock(&drm_drv->psr_list_lock);
list_for_each_entry(psr, &drm_drv->psr_list, list) {
if (psr->encoder == encoder)
goto out;
}
psr = ERR_PTR(-ENODEV);

out:
spin_unlock_irqrestore(&drm_drv->psr_list_lock, flags);
mutex_unlock(&drm_drv->psr_list_lock);
return psr;
}

Expand Down Expand Up @@ -112,23 +110,21 @@ static void psr_set_state_locked(struct psr_drv *psr, enum psr_state state)

static void psr_set_state(struct psr_drv *psr, enum psr_state state)
{
unsigned long flags;

spin_lock_irqsave(&psr->lock, flags);
mutex_lock(&psr->lock);
psr_set_state_locked(psr, state);
spin_unlock_irqrestore(&psr->lock, flags);
mutex_unlock(&psr->lock);
}

static void psr_flush_handler(struct timer_list *t)
static void psr_flush_handler(struct work_struct *work)
{
struct psr_drv *psr = from_timer(psr, t, flush_timer);
unsigned long flags;
struct psr_drv *psr = container_of(to_delayed_work(work),
struct psr_drv, flush_work);

/* If the state has changed since we initiated the flush, do nothing */
spin_lock_irqsave(&psr->lock, flags);
mutex_lock(&psr->lock);
if (psr->state == PSR_FLUSH)
psr_set_state_locked(psr, PSR_ENABLE);
spin_unlock_irqrestore(&psr->lock, flags);
mutex_unlock(&psr->lock);
}

/**
Expand All @@ -141,14 +137,13 @@ static void psr_flush_handler(struct timer_list *t)
int rockchip_drm_psr_activate(struct drm_encoder *encoder)
{
struct psr_drv *psr = find_psr_by_encoder(encoder);
unsigned long flags;

if (IS_ERR(psr))
return PTR_ERR(psr);

spin_lock_irqsave(&psr->lock, flags);
mutex_lock(&psr->lock);
psr->active = true;
spin_unlock_irqrestore(&psr->lock, flags);
mutex_unlock(&psr->lock);

return 0;
}
Expand All @@ -164,25 +159,23 @@ EXPORT_SYMBOL(rockchip_drm_psr_activate);
int rockchip_drm_psr_deactivate(struct drm_encoder *encoder)
{
struct psr_drv *psr = find_psr_by_encoder(encoder);
unsigned long flags;

if (IS_ERR(psr))
return PTR_ERR(psr);

spin_lock_irqsave(&psr->lock, flags);
mutex_lock(&psr->lock);
psr->active = false;
spin_unlock_irqrestore(&psr->lock, flags);
del_timer_sync(&psr->flush_timer);
mutex_unlock(&psr->lock);
cancel_delayed_work_sync(&psr->flush_work);

return 0;
}
EXPORT_SYMBOL(rockchip_drm_psr_deactivate);

static void rockchip_drm_do_flush(struct psr_drv *psr)
{
mod_timer(&psr->flush_timer,
round_jiffies_up(jiffies + PSR_FLUSH_TIMEOUT));
psr_set_state(psr, PSR_FLUSH);
mod_delayed_work(system_wq, &psr->flush_work, PSR_FLUSH_TIMEOUT_MS);
}

/**
Expand Down Expand Up @@ -219,12 +212,11 @@ void rockchip_drm_psr_flush_all(struct drm_device *dev)
{
struct rockchip_drm_private *drm_drv = dev->dev_private;
struct psr_drv *psr;
unsigned long flags;

spin_lock_irqsave(&drm_drv->psr_list_lock, flags);
mutex_lock(&drm_drv->psr_list_lock);
list_for_each_entry(psr, &drm_drv->psr_list, list)
rockchip_drm_do_flush(psr);
spin_unlock_irqrestore(&drm_drv->psr_list_lock, flags);
mutex_unlock(&drm_drv->psr_list_lock);
}
EXPORT_SYMBOL(rockchip_drm_psr_flush_all);

Expand All @@ -241,7 +233,6 @@ int rockchip_drm_psr_register(struct drm_encoder *encoder,
{
struct rockchip_drm_private *drm_drv = encoder->dev->dev_private;
struct psr_drv *psr;
unsigned long flags;

if (!encoder || !psr_set)
return -EINVAL;
Expand All @@ -250,17 +241,17 @@ int rockchip_drm_psr_register(struct drm_encoder *encoder,
if (!psr)
return -ENOMEM;

timer_setup(&psr->flush_timer, psr_flush_handler, 0);
spin_lock_init(&psr->lock);
INIT_DELAYED_WORK(&psr->flush_work, psr_flush_handler);
mutex_init(&psr->lock);

psr->active = true;
psr->state = PSR_DISABLE;
psr->encoder = encoder;
psr->set = psr_set;

spin_lock_irqsave(&drm_drv->psr_list_lock, flags);
mutex_lock(&drm_drv->psr_list_lock);
list_add_tail(&psr->list, &drm_drv->psr_list);
spin_unlock_irqrestore(&drm_drv->psr_list_lock, flags);
mutex_unlock(&drm_drv->psr_list_lock);

return 0;
}
Expand All @@ -278,16 +269,15 @@ void rockchip_drm_psr_unregister(struct drm_encoder *encoder)
{
struct rockchip_drm_private *drm_drv = encoder->dev->dev_private;
struct psr_drv *psr, *n;
unsigned long flags;

spin_lock_irqsave(&drm_drv->psr_list_lock, flags);
mutex_lock(&drm_drv->psr_list_lock);
list_for_each_entry_safe(psr, n, &drm_drv->psr_list, list) {
if (psr->encoder == encoder) {
del_timer(&psr->flush_timer);
cancel_delayed_work_sync(&psr->flush_work);
list_del(&psr->list);
kfree(psr);
}
}
spin_unlock_irqrestore(&drm_drv->psr_list_lock, flags);
mutex_unlock(&drm_drv->psr_list_lock);
}
EXPORT_SYMBOL(rockchip_drm_psr_unregister);

0 comments on commit 60beecc

Please sign in to comment.