From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Yao Subject: [PATCH v1] drm/rockchip: fix fbdev crash when not use DRM_FBDEV_EMULATION Date: Thu, 4 Aug 2016 10:21:58 +0800 Message-ID: <1470277318-9204-1-git-send-email-mark.yao@rock-chips.com> References: <1470212025-30336-1-git-send-email-mark.yao@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1470212025-30336-1-git-send-email-mark.yao@rock-chips.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 List-Id: linux-rockchip.vger.kernel.org WyAgICAxLjE2MjU3MV0gVW5hYmxlIHRvIGhhbmRsZSBrZXJuZWwgTlVMTCBwb2ludGVyIGRlcmVm ZXJlbmNlIGF0IHZpcnR1YWwgYWRkcmVzcyAwMDAwMDIwMApbICAgIDEuMTY1NjU2XSBNb2R1bGVz IGxpbmtlZCBpbjoKWyAgICAxLjE2NTk0MV0gQ1BVOiA1IFBJRDogMTQzIENvbW06IGt3b3JrZXIv NToyIE5vdCB0YWludGVkIDQuNC4xNSAjMjM3ClsgICAgMS4xNjY1MDZdIEhhcmR3YXJlIG5hbWU6 IFJvY2tjaGlwIFJLMzM5OSBFdmFsdWF0aW9uIEJvYXJkIHYxIChBbmRyb2lkKSAoRFQpClsgICAg MS4xNjcxNTNdIFdvcmtxdWV1ZTogZXZlbnRzIG91dHB1dF9wb2xsX2V4ZWN1dGUKWyAgICAxLjE2 ODIzMV0gUEMgaXMgYXQgbXV0ZXhfbG9jaysweDE0LzB4NDQKWyAgICAxLjE2ODU4Nl0gTFIgaXMg YXQgZHJtX2ZiX2hlbHBlcl9ob3RwbHVnX2V2ZW50KzB4MjgvMHhjYwpbICAgIDEuMTcyMTkyXSBb PGZmZmZmZjgwMDg5ODIxMTA+XSBtdXRleF9sb2NrKzB4MTQvMHg0NApbICAgIDEuMTcyMTk2XSBb PGZmZmZmZjgwMDg0MDI1YTQ+XSBkcm1fZmJfaGVscGVyX2hvdHBsdWdfZXZlbnQrMHgyOC8weGNj ClsgICAgMS4xNzIyMDFdIFs8ZmZmZmZmODAwODQyN2FlND5dIHJvY2tjaGlwX2RybV9vdXRwdXRf cG9sbF9jaGFuZ2VkKzB4MTQvMHgxYwpbICAgIDEuMTcyMjA0XSBbPGZmZmZmZjgwMDgzZjdjNGM+ XSBkcm1fa21zX2hlbHBlcl9ob3RwbHVnX2V2ZW50KzB4MjgvMHgzNApbICAgIDEuMTcyMjA3XSBb PGZmZmZmZjgwMDgzZjdkZGM+XSBvdXRwdXRfcG9sbF9leGVjdXRlKzB4MTUwLzB4MTk4ClsgICAg MS4xNzIyMTJdIFs8ZmZmZmZmODAwODBiMGVhOD5dIHByb2Nlc3Nfb25lX3dvcmsrMHgyMTgvMHgz ZGMKWyAgICAxLjE3MjIxNV0gWzxmZmZmZmY4MDA4MGIxNTc4Pl0gd29ya2VyX3RocmVhZCsweDI0 Yy8weDM3NApbICAgIDEuMTcyMjE3XSBbPGZmZmZmZjgwMDgwYjViY2M+XSBrdGhyZWFkKzB4ZGMv MHhlNApbICAgIDEuMTcyMjIyXSBbPGZmZmZmZjgwMDgwODRjZDA+XSByZXRfZnJvbV9mb3JrKzB4 MTAvMHg0MAoKU2lnbmVkLW9mZi1ieTogTWFyayBZYW8gPG1hcmsueWFvQHJvY2stY2hpcHMuY29t PgotLS0KQ2hhbmdlIGluIHYxOgpBZHZpc2VkIGJ5IERhbmllbCBWZXR0ZXIKICBvbmx5IGRvIHRo ZSBzdHJ1Y3QtPnBvaW50ZXIgY29udmVyc2lvbiBhbG9uZQoKIGRyaXZlcnMvZ3B1L2RybS9yb2Nr Y2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmMgICB8ICA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL3Jv Y2tjaGlwL3JvY2tjaGlwX2RybV9kcnYuaCAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9yb2Nr Y2hpcC9yb2NrY2hpcF9kcm1fZmIuYyAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vcm9ja2No aXAvcm9ja2NoaXBfZHJtX2ZiZGV2LmMgfCAxNyArKysrKysrKysrLS0tLS0tLQogNCBmaWxlcyBj aGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2Rydi5jIGIvZHJpdmVycy9ncHUv ZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9kcnYuYwppbmRleCBhODIyZDQ5Li5mZTIyZjc2IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2Rydi5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmMKQEAgLTI2MSw3 ICsyNjEsNyBAQCBzdGF0aWMgdm9pZCByb2NrY2hpcF9kcm1fbGFzdGNsb3NlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IHJvY2tjaGlwX2RybV9wcml2YXRlICpwcml2ID0gZGV2 LT5kZXZfcHJpdmF0ZTsKIAotCWRybV9mYl9oZWxwZXJfcmVzdG9yZV9mYmRldl9tb2RlX3VubG9j a2VkKCZwcml2LT5mYmRldl9oZWxwZXIpOworCWRybV9mYl9oZWxwZXJfcmVzdG9yZV9mYmRldl9t b2RlX3VubG9ja2VkKHByaXYtPmZiZGV2X2hlbHBlcik7CiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1 Y3QgZmlsZV9vcGVyYXRpb25zIHJvY2tjaGlwX2RybV9kcml2ZXJfZm9wcyA9IHsKQEAgLTMxMSw3 ICszMTEsNyBAQCB2b2lkIHJvY2tjaGlwX2RybV9mYl9zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNl ICpkcm0pCiAJc3RydWN0IHJvY2tjaGlwX2RybV9wcml2YXRlICpwcml2ID0gZHJtLT5kZXZfcHJp dmF0ZTsKIAogCWNvbnNvbGVfbG9jaygpOwotCWRybV9mYl9oZWxwZXJfc2V0X3N1c3BlbmQoJnBy aXYtPmZiZGV2X2hlbHBlciwgMSk7CisJZHJtX2ZiX2hlbHBlcl9zZXRfc3VzcGVuZChwcml2LT5m YmRldl9oZWxwZXIsIDEpOwogCWNvbnNvbGVfdW5sb2NrKCk7CiB9CiAKQEAgLTMyMCw3ICszMjAs NyBAQCB2b2lkIHJvY2tjaGlwX2RybV9mYl9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRybSkK IAlzdHJ1Y3Qgcm9ja2NoaXBfZHJtX3ByaXZhdGUgKnByaXYgPSBkcm0tPmRldl9wcml2YXRlOwog CiAJY29uc29sZV9sb2NrKCk7Ci0JZHJtX2ZiX2hlbHBlcl9zZXRfc3VzcGVuZCgmcHJpdi0+ZmJk ZXZfaGVscGVyLCAwKTsKKwlkcm1fZmJfaGVscGVyX3NldF9zdXNwZW5kKHByaXYtPmZiZGV2X2hl bHBlciwgMCk7CiAJY29uc29sZV91bmxvY2soKTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9yb2Nr Y2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmgKaW5kZXggZWEzOTMyOS4uZjAwNWYzZiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2Rydi5oCkBAIC01Nyw3ICs1Nyw3IEBA IHN0cnVjdCByb2NrY2hpcF9jcnRjX3N0YXRlIHsKICAqIEBudW1fcGlwZTogbnVtYmVyIG9mIHBp cGVzIGZvciB0aGlzIGRldmljZS4KICAqLwogc3RydWN0IHJvY2tjaGlwX2RybV9wcml2YXRlIHsK LQlzdHJ1Y3QgZHJtX2ZiX2hlbHBlciBmYmRldl9oZWxwZXI7CisJc3RydWN0IGRybV9mYl9oZWxw ZXIgKmZiZGV2X2hlbHBlcjsKIAlzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKmZiZGV2X2JvOwogCWNv bnN0IHN0cnVjdCByb2NrY2hpcF9jcnRjX2Z1bmNzICpjcnRjX2Z1bmNzW1JPQ0tDSElQX01BWF9D UlRDXTsKIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2ZiLmMgYi9kcml2ZXJzL2dwdS9kcm0v cm9ja2NoaXAvcm9ja2NoaXBfZHJtX2ZiLmMKaW5kZXggNTVjNTI3My4uZGMwMzRlYyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9mYi5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZmIuYwpAQCAtMTU2LDcgKzE1Niw3 IEBAIGVycl9nZW1fb2JqZWN0X3VucmVmZXJlbmNlOgogc3RhdGljIHZvaWQgcm9ja2NoaXBfZHJt X291dHB1dF9wb2xsX2NoYW5nZWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3Qg cm9ja2NoaXBfZHJtX3ByaXZhdGUgKnByaXZhdGUgPSBkZXYtPmRldl9wcml2YXRlOwotCXN0cnVj dCBkcm1fZmJfaGVscGVyICpmYl9oZWxwZXIgPSAmcHJpdmF0ZS0+ZmJkZXZfaGVscGVyOworCXN0 cnVjdCBkcm1fZmJfaGVscGVyICpmYl9oZWxwZXIgPSBwcml2YXRlLT5mYmRldl9oZWxwZXI7CiAK IAlpZiAoZmJfaGVscGVyKQogCQlkcm1fZmJfaGVscGVyX2hvdHBsdWdfZXZlbnQoZmJfaGVscGVy KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZmJk ZXYuYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZmJkZXYuYwppbmRl eCAyMDdlMDFkLi42YjUwZGZhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAv cm9ja2NoaXBfZHJtX2ZiZGV2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tj aGlwX2RybV9mYmRldi5jCkBAIC0yMiwxNCArMjIsMTIgQEAKICNpbmNsdWRlICJyb2NrY2hpcF9k cm1fZmIuaCIKIAogI2RlZmluZSBQUkVGRVJSRURfQlBQCQkzMgotI2RlZmluZSB0b19kcm1fcHJp dmF0ZSh4KSBcCi0JCWNvbnRhaW5lcl9vZih4LCBzdHJ1Y3Qgcm9ja2NoaXBfZHJtX3ByaXZhdGUs IGZiZGV2X2hlbHBlcikKIAogc3RhdGljIGludCByb2NrY2hpcF9mYmRldl9tbWFwKHN0cnVjdCBm Yl9pbmZvICppbmZvLAogCQkJICAgICAgIHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hKQogewog CXN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXIgPSBpbmZvLT5wYXI7Ci0Jc3RydWN0IHJvY2tj aGlwX2RybV9wcml2YXRlICpwcml2YXRlID0gdG9fZHJtX3ByaXZhdGUoaGVscGVyKTsKKwlzdHJ1 Y3Qgcm9ja2NoaXBfZHJtX3ByaXZhdGUgKnByaXZhdGUgPSBoZWxwZXItPmRldi0+ZGV2X3ByaXZh dGU7CiAKIAlyZXR1cm4gcm9ja2NoaXBfZ2VtX21tYXBfYnVmKHByaXZhdGUtPmZiZGV2X2JvLCB2 bWEpOwogfQpAQCAtNTAsNyArNDgsNyBAQCBzdGF0aWMgc3RydWN0IGZiX29wcyByb2NrY2hpcF9k cm1fZmJkZXZfb3BzID0gewogc3RhdGljIGludCByb2NrY2hpcF9kcm1fZmJkZXZfY3JlYXRlKHN0 cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXIsCiAJCQkJICAgICBzdHJ1Y3QgZHJtX2ZiX2hlbHBl cl9zdXJmYWNlX3NpemUgKnNpemVzKQogewotCXN0cnVjdCByb2NrY2hpcF9kcm1fcHJpdmF0ZSAq cHJpdmF0ZSA9IHRvX2RybV9wcml2YXRlKGhlbHBlcik7CisJc3RydWN0IHJvY2tjaGlwX2RybV9w cml2YXRlICpwcml2YXRlID0gaGVscGVyLT5kZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBkcm1f bW9kZV9mYl9jbWQyIG1vZGVfY21kID0geyAwIH07CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGhlbHBlci0+ZGV2OwogCXN0cnVjdCByb2NrY2hpcF9nZW1fb2JqZWN0ICpya19vYmo7CkBAIC0x MzksNyArMTM3LDExIEBAIGludCByb2NrY2hpcF9kcm1fZmJkZXZfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCiAJbnVtX2NydGMgPSBkZXYtPm1vZGVfY29uZmlnLm51bV9jcnRjOwogCi0J aGVscGVyID0gJnByaXZhdGUtPmZiZGV2X2hlbHBlcjsKKwloZWxwZXIgPSBkZXZtX2t6YWxsb2Mo ZGV2LT5kZXYsIHNpemVvZigqaGVscGVyKSwgR0ZQX0tFUk5FTCk7CisJaWYgKCFoZWxwZXIpCisJ CXJldHVybiAtRU5PTUVNOworCisJcHJpdmF0ZS0+ZmJkZXZfaGVscGVyID0gaGVscGVyOwogCiAJ ZHJtX2ZiX2hlbHBlcl9wcmVwYXJlKGRldiwgaGVscGVyLCAmcm9ja2NoaXBfZHJtX2ZiX2hlbHBl cl9mdW5jcyk7CiAKQEAgLTE3Myw5ICsxNzUsMTAgQEAgZXJyX2RybV9mYl9oZWxwZXJfZmluaToK IHZvaWQgcm9ja2NoaXBfZHJtX2ZiZGV2X2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsK IAlzdHJ1Y3Qgcm9ja2NoaXBfZHJtX3ByaXZhdGUgKnByaXZhdGUgPSBkZXYtPmRldl9wcml2YXRl OwotCXN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXI7CisJc3RydWN0IGRybV9mYl9oZWxwZXIg KmhlbHBlciA9IHByaXZhdGUtPmZiZGV2X2hlbHBlcjsKIAotCWhlbHBlciA9ICZwcml2YXRlLT5m YmRldl9oZWxwZXI7CisJaWYgKCFoZWxwZXIpCisJCXJldHVybjsKIAogCWRybV9mYl9oZWxwZXJf dW5yZWdpc3Rlcl9mYmkoaGVscGVyKTsKIAlkcm1fZmJfaGVscGVyX3JlbGVhc2VfZmJpKGhlbHBl cik7Ci0tIAoxLjkuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark Yao) Date: Thu, 4 Aug 2016 10:21:58 +0800 Subject: [PATCH v1] drm/rockchip: fix fbdev crash when not use DRM_FBDEV_EMULATION In-Reply-To: <1470212025-30336-1-git-send-email-mark.yao@rock-chips.com> References: <1470212025-30336-1-git-send-email-mark.yao@rock-chips.com> Message-ID: <1470277318-9204-1-git-send-email-mark.yao@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org [ 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 --- Change in v1: Advised by Daniel Vetter only do the struct->pointer conversion alone drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 6 +++--- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 17 ++++++++++------- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index a822d49..fe22f76 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -261,7 +261,7 @@ 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); + drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev_helper); } static const struct file_operations rockchip_drm_driver_fops = { @@ -311,7 +311,7 @@ void rockchip_drm_fb_suspend(struct drm_device *drm) struct rockchip_drm_private *priv = drm->dev_private; console_lock(); - drm_fb_helper_set_suspend(&priv->fbdev_helper, 1); + drm_fb_helper_set_suspend(priv->fbdev_helper, 1); console_unlock(); } @@ -320,7 +320,7 @@ void rockchip_drm_fb_resume(struct drm_device *drm) struct rockchip_drm_private *priv = drm->dev_private; console_lock(); - drm_fb_helper_set_suspend(&priv->fbdev_helper, 0); + drm_fb_helper_set_suspend(priv->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..f005f3f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -57,7 +57,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_fb_helper *fbdev_helper; struct drm_gem_object *fbdev_bo; 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..dc034ec 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -156,7 +156,7 @@ 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 drm_fb_helper *fb_helper = private->fbdev_helper; if (fb_helper) drm_fb_helper_hotplug_event(fb_helper); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c index 207e01d..6b50dfa 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c @@ -22,14 +22,12 @@ #include "rockchip_drm_fb.h" #define PREFERRED_BPP 32 -#define to_drm_private(x) \ - container_of(x, struct rockchip_drm_private, 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_private *private = helper->dev->dev_private; return rockchip_gem_mmap_buf(private->fbdev_bo, vma); } @@ -50,7 +48,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_private *private = helper->dev->dev_private; struct drm_mode_fb_cmd2 mode_cmd = { 0 }; struct drm_device *dev = helper->dev; struct rockchip_gem_object *rk_obj; @@ -139,7 +137,11 @@ int rockchip_drm_fbdev_init(struct drm_device *dev) num_crtc = dev->mode_config.num_crtc; - helper = &private->fbdev_helper; + helper = devm_kzalloc(dev->dev, sizeof(*helper), GFP_KERNEL); + if (!helper) + return -ENOMEM; + + private->fbdev_helper = helper; drm_fb_helper_prepare(dev, helper, &rockchip_drm_fb_helper_funcs); @@ -173,9 +175,10 @@ err_drm_fb_helper_fini: void rockchip_drm_fbdev_fini(struct drm_device *dev) { struct rockchip_drm_private *private = dev->dev_private; - struct drm_fb_helper *helper; + struct drm_fb_helper *helper = private->fbdev_helper; - helper = &private->fbdev_helper; + if (!helper) + return; drm_fb_helper_unregister_fbi(helper); drm_fb_helper_release_fbi(helper); -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755055AbcHDCWm (ORCPT ); Wed, 3 Aug 2016 22:22:42 -0400 Received: from regular1.263xmail.com ([211.150.99.138]:51923 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752980AbcHDCWk (ORCPT ); Wed, 3 Aug 2016 22:22:40 -0400 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 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: <4776c4276b28b87d116610267fcc2530> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 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 Cc: Mark Yao Subject: [PATCH v1] drm/rockchip: fix fbdev crash when not use DRM_FBDEV_EMULATION Date: Thu, 4 Aug 2016 10:21:58 +0800 Message-Id: <1470277318-9204-1-git-send-email-mark.yao@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1470212025-30336-1-git-send-email-mark.yao@rock-chips.com> References: <1470212025-30336-1-git-send-email-mark.yao@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ 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 --- Change in v1: Advised by Daniel Vetter only do the struct->pointer conversion alone drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 6 +++--- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 17 ++++++++++------- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index a822d49..fe22f76 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -261,7 +261,7 @@ 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); + drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev_helper); } static const struct file_operations rockchip_drm_driver_fops = { @@ -311,7 +311,7 @@ void rockchip_drm_fb_suspend(struct drm_device *drm) struct rockchip_drm_private *priv = drm->dev_private; console_lock(); - drm_fb_helper_set_suspend(&priv->fbdev_helper, 1); + drm_fb_helper_set_suspend(priv->fbdev_helper, 1); console_unlock(); } @@ -320,7 +320,7 @@ void rockchip_drm_fb_resume(struct drm_device *drm) struct rockchip_drm_private *priv = drm->dev_private; console_lock(); - drm_fb_helper_set_suspend(&priv->fbdev_helper, 0); + drm_fb_helper_set_suspend(priv->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..f005f3f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -57,7 +57,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_fb_helper *fbdev_helper; struct drm_gem_object *fbdev_bo; 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..dc034ec 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -156,7 +156,7 @@ 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 drm_fb_helper *fb_helper = private->fbdev_helper; if (fb_helper) drm_fb_helper_hotplug_event(fb_helper); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c index 207e01d..6b50dfa 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c @@ -22,14 +22,12 @@ #include "rockchip_drm_fb.h" #define PREFERRED_BPP 32 -#define to_drm_private(x) \ - container_of(x, struct rockchip_drm_private, 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_private *private = helper->dev->dev_private; return rockchip_gem_mmap_buf(private->fbdev_bo, vma); } @@ -50,7 +48,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_private *private = helper->dev->dev_private; struct drm_mode_fb_cmd2 mode_cmd = { 0 }; struct drm_device *dev = helper->dev; struct rockchip_gem_object *rk_obj; @@ -139,7 +137,11 @@ int rockchip_drm_fbdev_init(struct drm_device *dev) num_crtc = dev->mode_config.num_crtc; - helper = &private->fbdev_helper; + helper = devm_kzalloc(dev->dev, sizeof(*helper), GFP_KERNEL); + if (!helper) + return -ENOMEM; + + private->fbdev_helper = helper; drm_fb_helper_prepare(dev, helper, &rockchip_drm_fb_helper_funcs); @@ -173,9 +175,10 @@ err_drm_fb_helper_fini: void rockchip_drm_fbdev_fini(struct drm_device *dev) { struct rockchip_drm_private *private = dev->dev_private; - struct drm_fb_helper *helper; + struct drm_fb_helper *helper = private->fbdev_helper; - helper = &private->fbdev_helper; + if (!helper) + return; drm_fb_helper_unregister_fbi(helper); drm_fb_helper_release_fbi(helper); -- 1.9.1