github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "drm/rockchip: fixup display reference count"

Browse Source 
fix display abnormal when enable uboot logo display

This reverts commit 6db46c9e7e.

Change-Id: I85b60c1b90bef939427bcbb795f7dcca490cec46
Signed-off-by: xuhuicong <xhc@rock-chips.com>
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
This commit is contained in:
xuhuicong 2017-03-29 09:20:53 +08:00 committed by Huang, Tao
parent 5ec72176cc
commit eaef6c723f
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
View File

@ -604,19 +604,6 @@ static void show_loader_logo(struct drm_device *drm_dev)
list_for_each_entry_safe(set, tmp, &mode_set_list, head) {
struct drm_crtc *crtc = set->crtc;
struct drm_connector *conn = set->connector;
if (!set->mode_changed) {
/*
* restore connector and crtc's state, keep all the
* reference fine.
*/
WARN_ON(drm_atomic_set_crtc_for_connector(conn->state,
NULL));
WARN_ON(drm_atomic_set_mode_for_crtc(crtc->state,
NULL));
crtc->state->active = false;
}
list_del(&set->head);
kfree(set);

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

@ -1494,11 +1494,6 @@ static void vop_crtc_enable(struct drm_crtc *crtc)
u16 vact_end = vact_st + vdisplay;
uint32_t val;
if (vop->loader_protect) {
vop->loader_protect = false;
return;
}
vop_initial(crtc);
val = BIT(DCLK_INVERT);