From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Yao 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> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmMgICB8IDEz ICsrKysrKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2 LmggICB8ICA4ICsrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJt X2ZiLmMgICAgfCAgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9k cm1fZmJkZXYuYyB8IDI2ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5n ZWQsIDM2IGluc2VydGlvbnMoKyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0v cm9ja2NoaXAvcm9ja2NoaXBfZHJtX2Rydi5jCmluZGV4IGE4MjJkNDkuLjFhNGRhZDYgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9kcnYuYwpAQCAtMjYxLDcgKzI2 MSwxMCBAQCBzdGF0aWMgdm9pZCByb2NrY2hpcF9kcm1fbGFzdGNsb3NlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiB7CiAJc3RydWN0IHJvY2tjaGlwX2RybV9wcml2YXRlICpwcml2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKIAotCWRybV9mYl9oZWxwZXJfcmVzdG9yZV9mYmRldl9tb2RlX3VubG9ja2Vk KCZwcml2LT5mYmRldl9oZWxwZXIpOworCWlmICghcHJpdi0+ZmJkZXYpCisJCXJldHVybjsKKwor CWRybV9mYl9oZWxwZXJfcmVzdG9yZV9mYmRldl9tb2RlX3VubG9ja2VkKCZwcml2LT5mYmRldi0+ ZmJkZXZfaGVscGVyKTsKIH0KIAogc3RhdGljIGNvbnN0IHN0cnVjdCBmaWxlX29wZXJhdGlvbnMg cm9ja2NoaXBfZHJtX2RyaXZlcl9mb3BzID0gewpAQCAtMzEwLDggKzMxMywxMCBAQCB2b2lkIHJv Y2tjaGlwX2RybV9mYl9zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkcm0pCiB7CiAJc3RydWN0 IHJvY2tjaGlwX2RybV9wcml2YXRlICpwcml2ID0gZHJtLT5kZXZfcHJpdmF0ZTsKIAorCWlmICgh cHJpdi0+ZmJkZXYpCisJCXJldHVybjsKIAljb25zb2xlX2xvY2soKTsKLQlkcm1fZmJfaGVscGVy X3NldF9zdXNwZW5kKCZwcml2LT5mYmRldl9oZWxwZXIsIDEpOworCWRybV9mYl9oZWxwZXJfc2V0 X3N1c3BlbmQoJnByaXYtPmZiZGV2LT5mYmRldl9oZWxwZXIsIDEpOwogCWNvbnNvbGVfdW5sb2Nr KCk7CiB9CiAKQEAgLTMxOSw4ICszMjQsMTAgQEAgdm9pZCByb2NrY2hpcF9kcm1fZmJfcmVzdW1l KHN0cnVjdCBkcm1fZGV2aWNlICpkcm0pCiB7CiAJc3RydWN0IHJvY2tjaGlwX2RybV9wcml2YXRl ICpwcml2ID0gZHJtLT5kZXZfcHJpdmF0ZTsKIAorCWlmICghcHJpdi0+ZmJkZXYpCisJCXJldHVy bjsKIAljb25zb2xlX2xvY2soKTsKLQlkcm1fZmJfaGVscGVyX3NldF9zdXNwZW5kKCZwcml2LT5m YmRldl9oZWxwZXIsIDApOworCWRybV9mYl9oZWxwZXJfc2V0X3N1c3BlbmQoJnByaXYtPmZiZGV2 LT5mYmRldl9oZWxwZXIsIDApOwogCWNvbnNvbGVfdW5sb2NrKCk7CiB9CiAKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmggYi9kcml2ZXJzL2dw dS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2Rydi5oCmluZGV4IGVhMzkzMjkuLmMwNTRmYzIg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9kcnYuaApAQCAtNTAs NiArNTAsMTEgQEAgc3RydWN0IHJvY2tjaGlwX2NydGNfc3RhdGUgewogI2RlZmluZSB0b19yb2Nr Y2hpcF9jcnRjX3N0YXRlKHMpIFwKIAkJY29udGFpbmVyX29mKHMsIHN0cnVjdCByb2NrY2hpcF9j cnRjX3N0YXRlLCBiYXNlKQogCitzdHJ1Y3Qgcm9ja2NoaXBfZHJtX2ZiZGV2IHsKKwlzdHJ1Y3Qg ZHJtX2ZiX2hlbHBlciBmYmRldl9oZWxwZXI7CisJc3RydWN0IGRybV9nZW1fb2JqZWN0ICpmYmRl dl9ibzsKK307CisKIC8qCiAgKiBSb2NrY2hpcCBkcm0gcHJpdmF0ZSBzdHJ1Y3R1cmUuCiAgKgpA QCAtNTcsOCArNjIsNyBAQCBzdHJ1Y3Qgcm9ja2NoaXBfY3J0Y19zdGF0ZSB7CiAgKiBAbnVtX3Bp cGU6IG51bWJlciBvZiBwaXBlcyBmb3IgdGhpcyBkZXZpY2UuCiAgKi8KIHN0cnVjdCByb2NrY2hp cF9kcm1fcHJpdmF0ZSB7Ci0Jc3RydWN0IGRybV9mYl9oZWxwZXIgZmJkZXZfaGVscGVyOwotCXN0 cnVjdCBkcm1fZ2VtX29iamVjdCAqZmJkZXZfYm87CisJc3RydWN0IHJvY2tjaGlwX2RybV9mYmRl diAqZmJkZXY7CiAJY29uc3Qgc3RydWN0IHJvY2tjaGlwX2NydGNfZnVuY3MgKmNydGNfZnVuY3Nb Uk9DS0NISVBfTUFYX0NSVENdOwogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZTsKIH07 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2ZiLmMg Yi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2ZiLmMKaW5kZXggNTVjNTI3 My4uZmVmNmY4ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlw X2RybV9mYi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZmIu YwpAQCAtMTU2LDEwICsxNTYsMTAgQEAgZXJyX2dlbV9vYmplY3RfdW5yZWZlcmVuY2U6CiBzdGF0 aWMgdm9pZCByb2NrY2hpcF9kcm1fb3V0cHV0X3BvbGxfY2hhbmdlZChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogewogCXN0cnVjdCByb2NrY2hpcF9kcm1fcHJpdmF0ZSAqcHJpdmF0ZSA9IGRldi0+ ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGRybV9mYl9oZWxwZXIgKmZiX2hlbHBlciA9ICZwcml2YXRl LT5mYmRldl9oZWxwZXI7CisJc3RydWN0IHJvY2tjaGlwX2RybV9mYmRldiAqZmJkZXYgPSBwcml2 YXRlLT5mYmRldjsKIAotCWlmIChmYl9oZWxwZXIpCi0JCWRybV9mYl9oZWxwZXJfaG90cGx1Z19l dmVudChmYl9oZWxwZXIpOworCWlmIChmYmRldikKKwkJZHJtX2ZiX2hlbHBlcl9ob3RwbHVnX2V2 ZW50KCZmYmRldi0+ZmJkZXZfaGVscGVyKTsKIH0KIAogc3RhdGljIHZvaWQgcm9ja2NoaXBfY3J0 Y193YWl0X2Zvcl91cGRhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9mYmRldi5jIGIvZHJpdmVycy9ncHUv ZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9mYmRldi5jCmluZGV4IDIwN2UwMWQuLmNjNTc4MWEg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZmJkZXYu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2ZiZGV2LmMKQEAg LTIyLDE2ICsyMiwxNiBAQAogI2luY2x1ZGUgInJvY2tjaGlwX2RybV9mYi5oIgogCiAjZGVmaW5l IFBSRUZFUlJFRF9CUFAJCTMyCi0jZGVmaW5lIHRvX2RybV9wcml2YXRlKHgpIFwKLQkJY29udGFp bmVyX29mKHgsIHN0cnVjdCByb2NrY2hpcF9kcm1fcHJpdmF0ZSwgZmJkZXZfaGVscGVyKQorI2Rl ZmluZSB0b19yb2NrY2hpcF9mYmRldih4KSBcCisJCWNvbnRhaW5lcl9vZih4LCBzdHJ1Y3Qgcm9j a2NoaXBfZHJtX2ZiZGV2LCBmYmRldl9oZWxwZXIpCiAKIHN0YXRpYyBpbnQgcm9ja2NoaXBfZmJk ZXZfbW1hcChzdHJ1Y3QgZmJfaW5mbyAqaW5mbywKIAkJCSAgICAgICBzdHJ1Y3Qgdm1fYXJlYV9z dHJ1Y3QgKnZtYSkKIHsKIAlzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVscGVyID0gaW5mby0+cGFy OwotCXN0cnVjdCByb2NrY2hpcF9kcm1fcHJpdmF0ZSAqcHJpdmF0ZSA9IHRvX2RybV9wcml2YXRl KGhlbHBlcik7CisJc3RydWN0IHJvY2tjaGlwX2RybV9mYmRldiAqZmJkZXYgPSB0b19yb2NrY2hp cF9mYmRldihoZWxwZXIpOwogCi0JcmV0dXJuIHJvY2tjaGlwX2dlbV9tbWFwX2J1Zihwcml2YXRl LT5mYmRldl9ibywgdm1hKTsKKwlyZXR1cm4gcm9ja2NoaXBfZ2VtX21tYXBfYnVmKGZiZGV2LT5m YmRldl9ibywgdm1hKTsKIH0KIAogc3RhdGljIHN0cnVjdCBmYl9vcHMgcm9ja2NoaXBfZHJtX2Zi ZGV2X29wcyA9IHsKQEAgLTUwLDcgKzUwLDcgQEAgc3RhdGljIHN0cnVjdCBmYl9vcHMgcm9ja2No aXBfZHJtX2ZiZGV2X29wcyA9IHsKIHN0YXRpYyBpbnQgcm9ja2NoaXBfZHJtX2ZiZGV2X2NyZWF0 ZShzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVscGVyLAogCQkJCSAgICAgc3RydWN0IGRybV9mYl9o ZWxwZXJfc3VyZmFjZV9zaXplICpzaXplcykKIHsKLQlzdHJ1Y3Qgcm9ja2NoaXBfZHJtX3ByaXZh dGUgKnByaXZhdGUgPSB0b19kcm1fcHJpdmF0ZShoZWxwZXIpOworCXN0cnVjdCByb2NrY2hpcF9k cm1fZmJkZXYgKmZiZGV2ID0gdG9fcm9ja2NoaXBfZmJkZXYoaGVscGVyKTsKIAlzdHJ1Y3QgZHJt X21vZGVfZmJfY21kMiBtb2RlX2NtZCA9IHsgMCB9OwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBoZWxwZXItPmRldjsKIAlzdHJ1Y3Qgcm9ja2NoaXBfZ2VtX29iamVjdCAqcmtfb2JqOwpAQCAt NzUsNyArNzUsNyBAQCBzdGF0aWMgaW50IHJvY2tjaGlwX2RybV9mYmRldl9jcmVhdGUoc3RydWN0 IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIAlpZiAoSVNfRVJSKHJrX29iaikpCiAJCXJldHVybiAt RU5PTUVNOwogCi0JcHJpdmF0ZS0+ZmJkZXZfYm8gPSAmcmtfb2JqLT5iYXNlOworCWZiZGV2LT5m YmRldl9ibyA9ICZya19vYmotPmJhc2U7CiAKIAlmYmkgPSBkcm1fZmJfaGVscGVyX2FsbG9jX2Zi aShoZWxwZXIpOwogCWlmIChJU19FUlIoZmJpKSkgewpAQCAtODUsNyArODUsNyBAQCBzdGF0aWMg aW50IHJvY2tjaGlwX2RybV9mYmRldl9jcmVhdGUoc3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBl ciwKIAl9CiAKIAloZWxwZXItPmZiID0gcm9ja2NoaXBfZHJtX2ZyYW1lYnVmZmVyX2luaXQoZGV2 LCAmbW9kZV9jbWQsCi0JCQkJCQkgICBwcml2YXRlLT5mYmRldl9ibyk7CisJCQkJCQkgICBmYmRl di0+ZmJkZXZfYm8pOwogCWlmIChJU19FUlIoaGVscGVyLT5mYikpIHsKIAkJZGV2X2VycihkZXYt PmRldiwgIkZhaWxlZCB0byBhbGxvY2F0ZSBEUk0gZnJhbWVidWZmZXIuXG4iKTsKIAkJcmV0ID0g UFRSX0VSUihoZWxwZXItPmZiKTsKQEAgLTEzMCw2ICsxMzAsNyBAQCBzdGF0aWMgY29uc3Qgc3Ry dWN0IGRybV9mYl9oZWxwZXJfZnVuY3Mgcm9ja2NoaXBfZHJtX2ZiX2hlbHBlcl9mdW5jcyA9IHsK IGludCByb2NrY2hpcF9kcm1fZmJkZXZfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewog CXN0cnVjdCByb2NrY2hpcF9kcm1fcHJpdmF0ZSAqcHJpdmF0ZSA9IGRldi0+ZGV2X3ByaXZhdGU7 CisJc3RydWN0IHJvY2tjaGlwX2RybV9mYmRldiAqZmJkZXY7CiAJc3RydWN0IGRybV9mYl9oZWxw ZXIgKmhlbHBlcjsKIAl1bnNpZ25lZCBpbnQgbnVtX2NydGM7CiAJaW50IHJldDsKQEAgLTEzOSw3 ICsxNDAsMTIgQEAgaW50IHJvY2tjaGlwX2RybV9mYmRldl9pbml0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAKIAludW1fY3J0YyA9IGRldi0+bW9kZV9jb25maWcubnVtX2NydGM7CiAKLQloZWxw ZXIgPSAmcHJpdmF0ZS0+ZmJkZXZfaGVscGVyOworCWZiZGV2ID0gZGV2bV9remFsbG9jKGRldi0+ ZGV2LCBzaXplb2YoKmZiZGV2KSwgR0ZQX0tFUk5FTCk7CisJaWYgKCFmYmRldikKKwkJcmV0dXJu IC1FTk9NRU07CisKKwlwcml2YXRlLT5mYmRldiA9IGZiZGV2OworCWhlbHBlciA9ICZmYmRldi0+ ZmJkZXZfaGVscGVyOwogCiAJZHJtX2ZiX2hlbHBlcl9wcmVwYXJlKGRldiwgaGVscGVyLCAmcm9j a2NoaXBfZHJtX2ZiX2hlbHBlcl9mdW5jcyk7CiAKQEAgLTE3NSw3ICsxODEsOSBAQCB2b2lkIHJv Y2tjaGlwX2RybV9mYmRldl9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc3RydWN0IHJv Y2tjaGlwX2RybV9wcml2YXRlICpwcml2YXRlID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3Qg ZHJtX2ZiX2hlbHBlciAqaGVscGVyOwogCi0JaGVscGVyID0gJnByaXZhdGUtPmZiZGV2X2hlbHBl cjsKKwlpZiAoIXByaXZhdGUgfHwgcHJpdmF0ZS0+ZmJkZXYpCisJCXJldHVybjsKKwloZWxwZXIg PSAmcHJpdmF0ZS0+ZmJkZXYtPmZiZGV2X2hlbHBlcjsKIAogCWRybV9mYl9oZWxwZXJfdW5yZWdp c3Rlcl9mYmkoaGVscGVyKTsKIAlkcm1fZmJfaGVscGVyX3JlbGVhc2VfZmJpKGhlbHBlcik7Ci0t IAoxLjkuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark Yao) Date: Wed, 3 Aug 2016 16:13:45 +0800 Subject: [PATCH] drm/rockchip: fix fbdev crash when not use DRM_FBDEV_EMULATION Message-ID: <1470212025-30336-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 --- 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); -- 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 S1757387AbcHCIOv (ORCPT ); Wed, 3 Aug 2016 04:14:51 -0400 Received: from regular1.263xmail.com ([211.150.99.137]:47179 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756337AbcHCION (ORCPT ); Wed, 3 Aug 2016 04:14:13 -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: <9ed95504a4808b7b6f4f962fa57c08e3> 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] 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 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 --- 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); -- 1.9.1