From: Mark Yao <mark.yao@rock-chips.com> To: Mark Yao <mark.yao@rock-chips.com>, David Airlie <airlied@linux.ie>, Heiko Stuebner <heiko@sntech.de> Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/6] drm/rockchip: fix race with kms hotplug and fbdev Date: Mon, 31 Jul 2017 17:50:00 +0800 [thread overview] Message-ID: <1501494601-7140-1-git-send-email-mark.yao@rock-chips.com> (raw) In-Reply-To: <1501494569-6825-1-git-send-email-mark.yao@rock-chips.com> Since fb_helper is not a pointer on rockchip_drm_private, it's no need to check pointer. Kms hotplug event may race into fbdev helper initial, and fb_helper->dev may be NULL pointer, that would cause the bug: [ 0.735411] [00000200] *pgd=00000000f6ffe003, *pud=00000000f6ffe003, *pmd=0000000000000000 [ 0.736156] Internal error: Oops: 96000005 [#1] PREEMPT SMP [ 0.736648] Modules linked in: [ 0.736930] CPU: 2 PID: 20 Comm: kworker/2:0 Not tainted 4.4.41 #20 [ 0.737480] Hardware name: Rockchip RK3399 Board rev2 (BOX) (DT) [ 0.738020] Workqueue: events cdn_dp_pd_event_work [ 0.738447] task: ffffffc0f21f3100 ti: ffffffc0f2218000 task.ti: ffffffc0f2218000 [ 0.739109] PC is at mutex_lock+0x14/0x44 [ 0.739469] LR is at drm_fb_helper_hotplug_event+0x30/0x114 [ 0.756253] [<ffffff8008a344f4>] mutex_lock+0x14/0x44 [ 0.756260] [<ffffff8008445708>] drm_fb_helper_hotplug_event+0x30/0x114 [ 0.756271] [<ffffff8008473c84>] rockchip_drm_output_poll_changed+0x18/0x20 [ 0.756280] [<ffffff8008439fcc>] drm_kms_helper_hotplug_event+0x28/0x34 [ 0.756286] [<ffffff800846c444>] cdn_dp_pd_event_work+0x394/0x3c4 [ 0.756295] [<ffffff80080b2b38>] process_one_work+0x218/0x3e0 [ 0.756302] [<ffffff80080b3538>] worker_thread+0x2e8/0x404 [ 0.756308] [<ffffff80080b7e70>] kthread+0xe8/0xf0 [ 0.756316] [<ffffff8008082690>] ret_from_fork+0x10/0x40 Signed-off-by: Mark Yao <mark.yao@rock-chips.com> --- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c index 81f9548..e6bd0f4 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -170,7 +170,7 @@ static void rockchip_drm_output_poll_changed(struct drm_device *dev) struct rockchip_drm_private *private = dev->dev_private; struct drm_fb_helper *fb_helper = &private->fbdev_helper; - if (fb_helper) + if (fb_helper->dev) drm_fb_helper_hotplug_event(fb_helper); } -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: mark.yao@rock-chips.com (Mark Yao) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/6] drm/rockchip: fix race with kms hotplug and fbdev Date: Mon, 31 Jul 2017 17:50:00 +0800 [thread overview] Message-ID: <1501494601-7140-1-git-send-email-mark.yao@rock-chips.com> (raw) In-Reply-To: <1501494569-6825-1-git-send-email-mark.yao@rock-chips.com> Since fb_helper is not a pointer on rockchip_drm_private, it's no need to check pointer. Kms hotplug event may race into fbdev helper initial, and fb_helper->dev may be NULL pointer, that would cause the bug: [ 0.735411] [00000200] *pgd=00000000f6ffe003, *pud=00000000f6ffe003, *pmd=0000000000000000 [ 0.736156] Internal error: Oops: 96000005 [#1] PREEMPT SMP [ 0.736648] Modules linked in: [ 0.736930] CPU: 2 PID: 20 Comm: kworker/2:0 Not tainted 4.4.41 #20 [ 0.737480] Hardware name: Rockchip RK3399 Board rev2 (BOX) (DT) [ 0.738020] Workqueue: events cdn_dp_pd_event_work [ 0.738447] task: ffffffc0f21f3100 ti: ffffffc0f2218000 task.ti: ffffffc0f2218000 [ 0.739109] PC is at mutex_lock+0x14/0x44 [ 0.739469] LR is at drm_fb_helper_hotplug_event+0x30/0x114 [ 0.756253] [<ffffff8008a344f4>] mutex_lock+0x14/0x44 [ 0.756260] [<ffffff8008445708>] drm_fb_helper_hotplug_event+0x30/0x114 [ 0.756271] [<ffffff8008473c84>] rockchip_drm_output_poll_changed+0x18/0x20 [ 0.756280] [<ffffff8008439fcc>] drm_kms_helper_hotplug_event+0x28/0x34 [ 0.756286] [<ffffff800846c444>] cdn_dp_pd_event_work+0x394/0x3c4 [ 0.756295] [<ffffff80080b2b38>] process_one_work+0x218/0x3e0 [ 0.756302] [<ffffff80080b3538>] worker_thread+0x2e8/0x404 [ 0.756308] [<ffffff80080b7e70>] kthread+0xe8/0xf0 [ 0.756316] [<ffffff8008082690>] ret_from_fork+0x10/0x40 Signed-off-by: Mark Yao <mark.yao@rock-chips.com> --- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c index 81f9548..e6bd0f4 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -170,7 +170,7 @@ static void rockchip_drm_output_poll_changed(struct drm_device *dev) struct rockchip_drm_private *private = dev->dev_private; struct drm_fb_helper *fb_helper = &private->fbdev_helper; - if (fb_helper) + if (fb_helper->dev) drm_fb_helper_hotplug_event(fb_helper); } -- 1.9.1
next prev parent reply other threads:[~2017-07-31 9:50 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-07-31 9:49 [PATCH 0/6] drm/rockchip: Some fixes Mark Yao 2017-07-31 9:49 ` Mark Yao 2017-07-31 9:49 ` Mark Yao 2017-07-31 9:49 ` [PATCH 1/6] drm/rockchip: vop: no need wait vblank on crtc enable Mark Yao 2017-07-31 9:49 ` Mark Yao 2017-07-31 9:49 ` Mark Yao 2017-08-03 12:36 ` Sandy Huang 2017-08-03 12:36 ` Sandy Huang 2017-07-31 9:49 ` [PATCH 2/6] drm/rockchip: vop: fix iommu page fault when resume Mark Yao 2017-07-31 9:49 ` Mark Yao 2017-07-31 9:49 ` Mark Yao 2017-08-03 13:06 ` Sandy Huang 2017-08-03 13:06 ` Sandy Huang 2017-08-03 13:06 ` Sandy Huang 2017-07-31 9:49 ` [PATCH 3/6] drm/rockchip: vop: fix NV12 video display error Mark Yao 2017-07-31 9:49 ` Mark Yao 2017-08-04 0:56 ` Sandy Huang 2017-08-04 0:56 ` Sandy Huang 2017-08-04 0:56 ` Sandy Huang 2017-07-31 9:49 ` [PATCH 4/6] drm/rockchip: vop: round_up pitches to word align Mark Yao 2017-07-31 9:49 ` Mark Yao 2017-08-04 0:56 ` Sandy Huang 2017-08-04 0:56 ` Sandy Huang 2017-08-04 0:56 ` Sandy Huang 2017-07-31 9:49 ` [PATCH 5/6] drm/rockchip: vop: report error when check resource error Mark Yao 2017-07-31 9:49 ` Mark Yao 2017-07-31 9:49 ` Mark Yao 2017-08-04 0:57 ` Sandy Huang 2017-08-04 0:57 ` Sandy Huang 2017-08-04 0:57 ` Sandy Huang 2017-07-31 9:50 ` Mark Yao [this message] 2017-07-31 9:50 ` [PATCH 6/6] drm/rockchip: fix race with kms hotplug and fbdev Mark Yao 2017-07-31 11:57 ` Emil Velikov 2017-07-31 11:57 ` Emil Velikov 2017-07-31 12:28 ` Daniel Vetter 2017-07-31 12:28 ` Daniel Vetter 2017-07-31 12:28 ` Daniel Vetter 2017-08-01 2:00 ` Mark yao 2017-08-01 2:00 ` Mark yao 2017-08-01 8:11 ` [PATCH v1.1] " Mark Yao 2017-08-01 8:11 ` Mark Yao 2017-08-01 8:11 ` Mark Yao 2017-08-04 3:20 ` Sandy Huang 2017-08-04 3:20 ` Sandy Huang 2017-08-04 3:20 ` Sandy Huang 2017-08-09 13:38 ` [PATCH 0/6] drm/rockchip: Some fixes Sean Paul 2017-08-09 13:38 ` Sean Paul 2017-08-09 13:38 ` Sean Paul
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1501494601-7140-1-git-send-email-mark.yao@rock-chips.com \ --to=mark.yao@rock-chips.com \ --cc=airlied@linux.ie \ --cc=dri-devel@lists.freedesktop.org \ --cc=heiko@sntech.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.