Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-16 16:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: Disarm vop->is_enabled

Browse Source 
With atomic helpers there's no need to track the enabled state of a pipe
any more, because atomic helpers track this accurately already.

Just disable the early returns, since the debug checks might be useful.

v2: Don't call drm_helper_disable_unused_functions, it blows up
without this check. At least explains why rockchip still needed this
old legacy-style state tracing - to work around issues from calling
other legacy style functions!

Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Cc: Mark yao <mark.yao@rock-chips.com>
Tested-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1465388359-8070-18-git-send-email-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2016-06-08 14:19:10 +02:00
parent 2bd6cc8c79
commit 05c960e79d
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
View File

@ -156,9 +156,6 @@ int rockchip_drm_fbdev_init(struct drm_device *dev)
goto err_drm_fb_helper_fini; goto err_drm_fb_helper_fini;
} }
/* disable all the possible outputs/crtcs before entering KMS mode */
drm_helper_disable_unused_functions(dev);
ret = drm_fb_helper_initial_config(helper, PREFERRED_BPP); ret = drm_fb_helper_initial_config(helper, PREFERRED_BPP);
if (ret < 0) { if (ret < 0) {
dev_err(dev->dev, "Failed to set initial hw config - %d.\n", dev_err(dev->dev, "Failed to set initial hw config - %d.\n",

6
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
View File

@ -431,9 +431,6 @@ static void vop_enable(struct drm_crtc *crtc)
struct vop *vop = to_vop(crtc); struct vop *vop = to_vop(crtc);
int ret; int ret;
if (vop->is_enabled)
return;
ret = pm_runtime_get_sync(vop->dev); ret = pm_runtime_get_sync(vop->dev);
if (ret < 0) { if (ret < 0) {
dev_err(vop->dev, "failed to get pm runtime: %d\n", ret); dev_err(vop->dev, "failed to get pm runtime: %d\n", ret);
@ -501,9 +498,6 @@ static void vop_crtc_disable(struct drm_crtc *crtc)
struct vop *vop = to_vop(crtc); struct vop *vop = to_vop(crtc);
int i; int i;
if (!vop->is_enabled)
return;
/* /*
* We need to make sure that all windows are disabled before we * We need to make sure that all windows are disabled before we
* disable that crtc. Otherwise we might try to scan from a destroyed * disable that crtc. Otherwise we might try to scan from a destroyed