39b138ea86
The first time after we call rockchip_drm_do_flush() after rockchip_drm_psr_register(), we go from PSR_DISABLE to PSR_FLUSH. The difference between PSR_DISABLE and PSR_FLUSH is whether or not we have a delayed work pending - PSR is off in either state. However psr_set_state() only catches the transition from PSR_FLUSH to PSR_DISABLE (which never happens), while going from PSR_DISABLE to PSR_FLUSH triggers a call to psr->set() to disable PSR while it's already disabled. This triggers the eDP PHY power-on sequence without being shut down first and this seems to occasionally leave the encoder unable to later enable PSR. Let's just simplify the state machine and simply consider PSR_DISABLE and PSR_FLUSH the same state. Signed-off-by: Tomasz Figa <tfiga@chromium.org> Signed-off-by: Kristian H. Kristensen <hoegsberg@chromium.org> Signed-off-by: Thierry Escande <thierry.escande@collabora.com> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180423105003.9004-25-enric.balletbo@collabora.com
258 lines
6.1 KiB
C
258 lines
6.1 KiB
C
/*
|
|
* Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
|
|
* Author: Yakir Yang <ykk@rock-chips.com>
|
|
*
|
|
* This software is licensed under the terms of the GNU General Public
|
|
* License version 2, as published by the Free Software Foundation, and
|
|
* may be copied, distributed, and modified under those terms.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include <drm/drmP.h>
|
|
#include <drm/drm_crtc_helper.h>
|
|
|
|
#include "rockchip_drm_drv.h"
|
|
#include "rockchip_drm_psr.h"
|
|
|
|
#define PSR_FLUSH_TIMEOUT_MS 100
|
|
|
|
struct psr_drv {
|
|
struct list_head list;
|
|
struct drm_encoder *encoder;
|
|
|
|
struct mutex lock;
|
|
bool active;
|
|
bool enabled;
|
|
|
|
struct delayed_work flush_work;
|
|
|
|
int (*set)(struct drm_encoder *encoder, bool enable);
|
|
};
|
|
|
|
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;
|
|
|
|
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:
|
|
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;
|
|
|
|
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:
|
|
mutex_unlock(&drm_drv->psr_list_lock);
|
|
return psr;
|
|
}
|
|
|
|
static int psr_set_state_locked(struct psr_drv *psr, bool enable)
|
|
{
|
|
int ret;
|
|
|
|
if (!psr->active)
|
|
return -EINVAL;
|
|
|
|
if (enable == psr->enabled)
|
|
return 0;
|
|
|
|
ret = psr->set(psr->encoder, enable);
|
|
if (ret)
|
|
return ret;
|
|
|
|
psr->enabled = enable;
|
|
return 0;
|
|
}
|
|
|
|
static void psr_flush_handler(struct work_struct *work)
|
|
{
|
|
struct psr_drv *psr = container_of(to_delayed_work(work),
|
|
struct psr_drv, flush_work);
|
|
|
|
mutex_lock(&psr->lock);
|
|
psr_set_state_locked(psr, true);
|
|
mutex_unlock(&psr->lock);
|
|
}
|
|
|
|
/**
|
|
* rockchip_drm_psr_activate - activate PSR on the given pipe
|
|
* @encoder: encoder to obtain the PSR encoder
|
|
*
|
|
* Returns:
|
|
* Zero on success, negative errno on failure.
|
|
*/
|
|
int rockchip_drm_psr_activate(struct drm_encoder *encoder)
|
|
{
|
|
struct psr_drv *psr = find_psr_by_encoder(encoder);
|
|
|
|
if (IS_ERR(psr))
|
|
return PTR_ERR(psr);
|
|
|
|
mutex_lock(&psr->lock);
|
|
psr->active = true;
|
|
mutex_unlock(&psr->lock);
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(rockchip_drm_psr_activate);
|
|
|
|
/**
|
|
* rockchip_drm_psr_deactivate - deactivate PSR on the given pipe
|
|
* @encoder: encoder to obtain the PSR encoder
|
|
*
|
|
* Returns:
|
|
* Zero on success, negative errno on failure.
|
|
*/
|
|
int rockchip_drm_psr_deactivate(struct drm_encoder *encoder)
|
|
{
|
|
struct psr_drv *psr = find_psr_by_encoder(encoder);
|
|
|
|
if (IS_ERR(psr))
|
|
return PTR_ERR(psr);
|
|
|
|
mutex_lock(&psr->lock);
|
|
psr->active = false;
|
|
psr->enabled = false;
|
|
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)
|
|
{
|
|
cancel_delayed_work_sync(&psr->flush_work);
|
|
|
|
mutex_lock(&psr->lock);
|
|
if (!psr_set_state_locked(psr, false))
|
|
mod_delayed_work(system_wq, &psr->flush_work,
|
|
PSR_FLUSH_TIMEOUT_MS);
|
|
mutex_unlock(&psr->lock);
|
|
}
|
|
|
|
/**
|
|
* rockchip_drm_psr_flush - flush a single pipe
|
|
* @crtc: CRTC of the pipe to flush
|
|
*
|
|
* Returns:
|
|
* 0 on success, -errno on fail
|
|
*/
|
|
int rockchip_drm_psr_flush(struct drm_crtc *crtc)
|
|
{
|
|
struct psr_drv *psr = find_psr_by_crtc(crtc);
|
|
if (IS_ERR(psr))
|
|
return PTR_ERR(psr);
|
|
|
|
rockchip_drm_do_flush(psr);
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(rockchip_drm_psr_flush);
|
|
|
|
/**
|
|
* rockchip_drm_psr_flush_all - force to flush all registered PSR encoders
|
|
* @dev: drm device
|
|
*
|
|
* Disable the PSR function for all registered encoders, and then enable the
|
|
* PSR function back after PSR_FLUSH_TIMEOUT. If encoder PSR state have been
|
|
* changed during flush time, then keep the state no change after flush
|
|
* timeout.
|
|
*
|
|
* Returns:
|
|
* Zero on success, negative errno on failure.
|
|
*/
|
|
void rockchip_drm_psr_flush_all(struct drm_device *dev)
|
|
{
|
|
struct rockchip_drm_private *drm_drv = dev->dev_private;
|
|
struct psr_drv *psr;
|
|
|
|
mutex_lock(&drm_drv->psr_list_lock);
|
|
list_for_each_entry(psr, &drm_drv->psr_list, list)
|
|
rockchip_drm_do_flush(psr);
|
|
mutex_unlock(&drm_drv->psr_list_lock);
|
|
}
|
|
EXPORT_SYMBOL(rockchip_drm_psr_flush_all);
|
|
|
|
/**
|
|
* rockchip_drm_psr_register - register encoder to psr driver
|
|
* @encoder: encoder that obtain the PSR function
|
|
* @psr_set: call back to set PSR state
|
|
*
|
|
* Returns:
|
|
* Zero on success, negative errno on failure.
|
|
*/
|
|
int rockchip_drm_psr_register(struct drm_encoder *encoder,
|
|
int (*psr_set)(struct drm_encoder *, bool enable))
|
|
{
|
|
struct rockchip_drm_private *drm_drv = encoder->dev->dev_private;
|
|
struct psr_drv *psr;
|
|
|
|
if (!encoder || !psr_set)
|
|
return -EINVAL;
|
|
|
|
psr = kzalloc(sizeof(struct psr_drv), GFP_KERNEL);
|
|
if (!psr)
|
|
return -ENOMEM;
|
|
|
|
INIT_DELAYED_WORK(&psr->flush_work, psr_flush_handler);
|
|
mutex_init(&psr->lock);
|
|
|
|
psr->active = false;
|
|
psr->enabled = false;
|
|
psr->encoder = encoder;
|
|
psr->set = psr_set;
|
|
|
|
mutex_lock(&drm_drv->psr_list_lock);
|
|
list_add_tail(&psr->list, &drm_drv->psr_list);
|
|
mutex_unlock(&drm_drv->psr_list_lock);
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(rockchip_drm_psr_register);
|
|
|
|
/**
|
|
* rockchip_drm_psr_unregister - unregister encoder to psr driver
|
|
* @encoder: encoder that obtain the PSR function
|
|
* @psr_set: call back to set PSR state
|
|
*
|
|
* Returns:
|
|
* Zero on success, negative errno on failure.
|
|
*/
|
|
void rockchip_drm_psr_unregister(struct drm_encoder *encoder)
|
|
{
|
|
struct rockchip_drm_private *drm_drv = encoder->dev->dev_private;
|
|
struct psr_drv *psr, *n;
|
|
|
|
mutex_lock(&drm_drv->psr_list_lock);
|
|
list_for_each_entry_safe(psr, n, &drm_drv->psr_list, list) {
|
|
if (psr->encoder == encoder) {
|
|
cancel_delayed_work_sync(&psr->flush_work);
|
|
list_del(&psr->list);
|
|
kfree(psr);
|
|
}
|
|
}
|
|
mutex_unlock(&drm_drv->psr_list_lock);
|
|
}
|
|
EXPORT_SYMBOL(rockchip_drm_psr_unregister);
|