mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 18:41:58 +09:00
drm/rockchip: vop: remove no need locked check at load lut
Fix the following warning: [ 12.265470] ------------[ cut here ]------------ [ 12.265488] WARNING: CPU: 2 PID: 196 at drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:3454 vop2_crtc_load_lut+0x444/0x4c0 [ 12.265490] Modules linked in: [ 12.265498] CPU: 2 PID: 196 Comm: kworker/u16:4 Not tainted 5.10.198 [ 12.265500] Hardware name: Rockchip RK3588S RT-ICS WED 23588S V11 Board (DT) [ 12.265506] Workqueue: events_unbound commit_work [ 12.265511] pstate: 40c00009 (nZcv daif +PAN +UAO -TCO BTYPE=--) [ 12.265515] pc : vop2_crtc_load_lut+0x444/0x4c0 [ 12.265518] lr : vop2_crtc_load_lut+0x44/0x4c0 [ 12.265520] sp : ffffffc00adb3bd0 [ 12.265522] x29: ffffffc00adb3bd0 x28: ffffffc00961a1a0 [ 12.265526] x27: ffffff8107a52000 x26: ffffff81026f0080 [ 12.265531] x25: ffffff8107a51c00 x24: ffffff81026f54a8 [ 12.265536] x23: ffffff8107a51c00 x22: ffffff81026f0080 [ 12.265540] x21: ffffff81026f5080 x20: ffffff81026f0080 [ 12.265544] x19: ffffff81026f13b8 x18: 0000000000000030 [ 12.265548] x17: 0000000000000182 x16: 0000000000000018 [ 12.265552] x15: ffffffffffffffff x14: 0000000000000438 [ 12.265557] x13: 0000000000201834 x12: 0000000004000201 [ 12.265561] x11: 0000000000000011 x10: 0000000000000001 [ 12.265565] x9 : ffffffc00887e0e4 x8 : ffffff8144dcc058 [ 12.265569] x7 : 0000000080008001 x6 : 00000000000003ff [ 12.265573] x5 : ffffff81026ae080 x4 : 0000000000000400 [ 12.265577] x3 : 0000000000000400 x2 : 00000000000003ff [ 12.265581] x1 : 00000000000003ff x0 : 0000000000000000 [ 12.265586] Call trace: [ 12.265590] vop2_crtc_load_lut+0x444/0x4c0 [ 12.265594] vop2_crtc_atomic_flush+0x790/0x2200 [ 12.265598] drm_atomic_helper_commit_planes+0x158/0x214 [ 12.265601] rockchip_drm_atomic_helper_commit_tail_rpm+0xf0/0x1b0 [ 12.265604] commit_tail+0xa8/0x17c [ 12.265607] commit_work+0x1c/0x30 [ 12.265612] process_one_work+0x20c/0x49c [ 12.265614] worker_thread+0x1a0/0x534 [ 12.265617] kthread+0x130/0x134 [ 12.265621] ret_from_fork+0x10/0x34 Signed-off-by: Sandy Huang <hjc@rock-chips.com> Change-Id: I5d7d9b0a2eb7331441d4ef0f84b8333ba6c6d855
This commit is contained in:
@@ -1464,9 +1464,6 @@ static void vop_crtc_load_lut(struct drm_crtc *crtc)
|
||||
if (!vop->is_enabled || !vop->lut || !vop->lut_regs)
|
||||
return;
|
||||
|
||||
if (WARN_ON(!drm_modeset_is_locked(&crtc->mutex)))
|
||||
return;
|
||||
|
||||
if (!VOP_CTRL_SUPPORT(vop, update_gamma_lut)) {
|
||||
spin_lock(&vop->reg_lock);
|
||||
VOP_CTRL_SET(vop, dsp_lut_en, 0);
|
||||
|
||||
Reference in New Issue
Block a user