From patchwork Wed Aug 3 08:13:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: yao mark X-Patchwork-Id: 9260897 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B802A60754 for ; Wed, 3 Aug 2016 08:14:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A898D28402 for ; Wed, 3 Aug 2016 08:14:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C10928562; Wed, 3 Aug 2016 08:14:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 14FE128402 for ; Wed, 3 Aug 2016 08:14:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bUrK3-0005Eu-EJ; Wed, 03 Aug 2016 08:14:39 +0000 Received: from regular1.263xmail.com ([211.150.99.137]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bUrJo-00051l-4C; Wed, 03 Aug 2016 08:14:26 +0000 Received: from mark.yao?rock-chips.com (unknown [192.168.167.129]) by regular1.263xmail.com (Postfix) with SMTP id 87451CF0B; Wed, 3 Aug 2016 16:13:58 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id 5EC473A5; Wed, 3 Aug 2016 16:13:56 +0800 (CST) X-RL-SENDER: mark.yao@rock-chips.com X-FST-TO: airlied@linux.ie X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: <9ed95504a4808b7b6f4f962fa57c08e3> X-ATTACHMENT-NUM: 0 X-SENDER: yzq@rock-chips.com X-DNS-TYPE: 0 Received: from localhost.localdomain (unknown [58.22.7.114]) by smtp.263.net (Postfix) whith ESMTP id 617286JVP4; Wed, 03 Aug 2016 16:13:59 +0800 (CST) From: Mark Yao To: David Airlie , Heiko Stuebner , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/rockchip: fix fbdev crash when not use DRM_FBDEV_EMULATION Date: Wed, 3 Aug 2016 16:13:45 +0800 Message-Id: <1470212025-30336-1-git-send-email-mark.yao@rock-chips.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160803_011424_767173_BD93B745 X-CRM114-Status: GOOD ( 12.24 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Yao MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP [ 1.162571] Unable to handle kernel NULL pointer dereference at virtual address 00000200 [ 1.165656] Modules linked in: [ 1.165941] CPU: 5 PID: 143 Comm: kworker/5:2 Not tainted 4.4.15 #237 [ 1.166506] Hardware name: Rockchip RK3399 Evaluation Board v1 (Android) (DT) [ 1.167153] Workqueue: events output_poll_execute [ 1.168231] PC is at mutex_lock+0x14/0x44 [ 1.168586] LR is at drm_fb_helper_hotplug_event+0x28/0xcc [ 1.172192] [] mutex_lock+0x14/0x44 [ 1.172196] [] drm_fb_helper_hotplug_event+0x28/0xcc [ 1.172201] [] rockchip_drm_output_poll_changed+0x14/0x1c [ 1.172204] [] drm_kms_helper_hotplug_event+0x28/0x34 [ 1.172207] [] output_poll_execute+0x150/0x198 [ 1.172212] [] process_one_work+0x218/0x3dc [ 1.172215] [] worker_thread+0x24c/0x374 [ 1.172217] [] kthread+0xdc/0xe4 [ 1.172222] [] ret_from_fork+0x10/0x40 Signed-off-by: Mark Yao --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 13 ++++++++++--- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 8 ++++++-- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 6 +++--- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 26 +++++++++++++++++--------- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index a822d49..1a4dad6 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -261,7 +261,10 @@ static void rockchip_drm_lastclose(struct drm_device *dev) { struct rockchip_drm_private *priv = dev->dev_private; - drm_fb_helper_restore_fbdev_mode_unlocked(&priv->fbdev_helper); + if (!priv->fbdev) + return; + + drm_fb_helper_restore_fbdev_mode_unlocked(&priv->fbdev->fbdev_helper); } static const struct file_operations rockchip_drm_driver_fops = { @@ -310,8 +313,10 @@ void rockchip_drm_fb_suspend(struct drm_device *drm) { struct rockchip_drm_private *priv = drm->dev_private; + if (!priv->fbdev) + return; console_lock(); - drm_fb_helper_set_suspend(&priv->fbdev_helper, 1); + drm_fb_helper_set_suspend(&priv->fbdev->fbdev_helper, 1); console_unlock(); } @@ -319,8 +324,10 @@ void rockchip_drm_fb_resume(struct drm_device *drm) { struct rockchip_drm_private *priv = drm->dev_private; + if (!priv->fbdev) + return; console_lock(); - drm_fb_helper_set_suspend(&priv->fbdev_helper, 0); + drm_fb_helper_set_suspend(&priv->fbdev->fbdev_helper, 0); console_unlock(); } diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h index ea39329..c054fc2 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -50,6 +50,11 @@ struct rockchip_crtc_state { #define to_rockchip_crtc_state(s) \ container_of(s, struct rockchip_crtc_state, base) +struct rockchip_drm_fbdev { + struct drm_fb_helper fbdev_helper; + struct drm_gem_object *fbdev_bo; +}; + /* * Rockchip drm private structure. * @@ -57,8 +62,7 @@ struct rockchip_crtc_state { * @num_pipe: number of pipes for this device. */ struct rockchip_drm_private { - struct drm_fb_helper fbdev_helper; - struct drm_gem_object *fbdev_bo; + struct rockchip_drm_fbdev *fbdev; const struct rockchip_crtc_funcs *crtc_funcs[ROCKCHIP_MAX_CRTC]; struct drm_atomic_state *state; }; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c index 55c5273..fef6f8d 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -156,10 +156,10 @@ err_gem_object_unreference: 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; + struct rockchip_drm_fbdev *fbdev = private->fbdev; - if (fb_helper) - drm_fb_helper_hotplug_event(fb_helper); + if (fbdev) + drm_fb_helper_hotplug_event(&fbdev->fbdev_helper); } static void rockchip_crtc_wait_for_update(struct drm_crtc *crtc) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c index 207e01d..cc5781a 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c @@ -22,16 +22,16 @@ #include "rockchip_drm_fb.h" #define PREFERRED_BPP 32 -#define to_drm_private(x) \ - container_of(x, struct rockchip_drm_private, fbdev_helper) +#define to_rockchip_fbdev(x) \ + container_of(x, struct rockchip_drm_fbdev, fbdev_helper) static int rockchip_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma) { struct drm_fb_helper *helper = info->par; - struct rockchip_drm_private *private = to_drm_private(helper); + struct rockchip_drm_fbdev *fbdev = to_rockchip_fbdev(helper); - return rockchip_gem_mmap_buf(private->fbdev_bo, vma); + return rockchip_gem_mmap_buf(fbdev->fbdev_bo, vma); } static struct fb_ops rockchip_drm_fbdev_ops = { @@ -50,7 +50,7 @@ static struct fb_ops rockchip_drm_fbdev_ops = { static int rockchip_drm_fbdev_create(struct drm_fb_helper *helper, struct drm_fb_helper_surface_size *sizes) { - struct rockchip_drm_private *private = to_drm_private(helper); + struct rockchip_drm_fbdev *fbdev = to_rockchip_fbdev(helper); struct drm_mode_fb_cmd2 mode_cmd = { 0 }; struct drm_device *dev = helper->dev; struct rockchip_gem_object *rk_obj; @@ -75,7 +75,7 @@ static int rockchip_drm_fbdev_create(struct drm_fb_helper *helper, if (IS_ERR(rk_obj)) return -ENOMEM; - private->fbdev_bo = &rk_obj->base; + fbdev->fbdev_bo = &rk_obj->base; fbi = drm_fb_helper_alloc_fbi(helper); if (IS_ERR(fbi)) { @@ -85,7 +85,7 @@ static int rockchip_drm_fbdev_create(struct drm_fb_helper *helper, } helper->fb = rockchip_drm_framebuffer_init(dev, &mode_cmd, - private->fbdev_bo); + fbdev->fbdev_bo); if (IS_ERR(helper->fb)) { dev_err(dev->dev, "Failed to allocate DRM framebuffer.\n"); ret = PTR_ERR(helper->fb); @@ -130,6 +130,7 @@ static const struct drm_fb_helper_funcs rockchip_drm_fb_helper_funcs = { int rockchip_drm_fbdev_init(struct drm_device *dev) { struct rockchip_drm_private *private = dev->dev_private; + struct rockchip_drm_fbdev *fbdev; struct drm_fb_helper *helper; unsigned int num_crtc; int ret; @@ -139,7 +140,12 @@ int rockchip_drm_fbdev_init(struct drm_device *dev) num_crtc = dev->mode_config.num_crtc; - helper = &private->fbdev_helper; + fbdev = devm_kzalloc(dev->dev, sizeof(*fbdev), GFP_KERNEL); + if (!fbdev) + return -ENOMEM; + + private->fbdev = fbdev; + helper = &fbdev->fbdev_helper; drm_fb_helper_prepare(dev, helper, &rockchip_drm_fb_helper_funcs); @@ -175,7 +181,9 @@ void rockchip_drm_fbdev_fini(struct drm_device *dev) struct rockchip_drm_private *private = dev->dev_private; struct drm_fb_helper *helper; - helper = &private->fbdev_helper; + if (!private || private->fbdev) + return; + helper = &private->fbdev->fbdev_helper; drm_fb_helper_unregister_fbi(helper); drm_fb_helper_release_fbi(helper);