From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/rockchip: fix fbdev crash when not use DRM_FBDEV_EMULATION Date: Wed, 3 Aug 2016 10:43:21 +0200 Message-ID: <20160803084321.GJ6232@phenom.ffwll.local> 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: Content-Disposition: inline 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: Mark Yao Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org T24gV2VkLCBBdWcgMDMsIDIwMTYgYXQgMDQ6MTM6NDVQTSArMDgwMCwgTWFyayBZYW8gd3JvdGU6 Cj4gWyAgICAxLjE2MjU3MV0gVW5hYmxlIHRvIGhhbmRsZSBrZXJuZWwgTlVMTCBwb2ludGVyIGRl cmVmZXJlbmNlIGF0IHZpcnR1YWwgYWRkcmVzcyAwMDAwMDIwMAo+IFsgICAgMS4xNjU2NTZdIE1v ZHVsZXMgbGlua2VkIGluOgo+IFsgICAgMS4xNjU5NDFdIENQVTogNSBQSUQ6IDE0MyBDb21tOiBr d29ya2VyLzU6MiBOb3QgdGFpbnRlZCA0LjQuMTUgIzIzNwo+IFsgICAgMS4xNjY1MDZdIEhhcmR3 YXJlIG5hbWU6IFJvY2tjaGlwIFJLMzM5OSBFdmFsdWF0aW9uIEJvYXJkIHYxIChBbmRyb2lkKSAo RFQpCj4gWyAgICAxLjE2NzE1M10gV29ya3F1ZXVlOiBldmVudHMgb3V0cHV0X3BvbGxfZXhlY3V0 ZQo+IFsgICAgMS4xNjgyMzFdIFBDIGlzIGF0IG11dGV4X2xvY2srMHgxNC8weDQ0Cj4gWyAgICAx LjE2ODU4Nl0gTFIgaXMgYXQgZHJtX2ZiX2hlbHBlcl9ob3RwbHVnX2V2ZW50KzB4MjgvMHhjYwo+ IFsgICAgMS4xNzIxOTJdIFs8ZmZmZmZmODAwODk4MjExMD5dIG11dGV4X2xvY2srMHgxNC8weDQ0 Cj4gWyAgICAxLjE3MjE5Nl0gWzxmZmZmZmY4MDA4NDAyNWE0Pl0gZHJtX2ZiX2hlbHBlcl9ob3Rw bHVnX2V2ZW50KzB4MjgvMHhjYwo+IFsgICAgMS4xNzIyMDFdIFs8ZmZmZmZmODAwODQyN2FlND5d IHJvY2tjaGlwX2RybV9vdXRwdXRfcG9sbF9jaGFuZ2VkKzB4MTQvMHgxYwo+IFsgICAgMS4xNzIy MDRdIFs8ZmZmZmZmODAwODNmN2M0Yz5dIGRybV9rbXNfaGVscGVyX2hvdHBsdWdfZXZlbnQrMHgy OC8weDM0Cj4gWyAgICAxLjE3MjIwN10gWzxmZmZmZmY4MDA4M2Y3ZGRjPl0gb3V0cHV0X3BvbGxf ZXhlY3V0ZSsweDE1MC8weDE5OAo+IFsgICAgMS4xNzIyMTJdIFs8ZmZmZmZmODAwODBiMGVhOD5d IHByb2Nlc3Nfb25lX3dvcmsrMHgyMTgvMHgzZGMKPiBbICAgIDEuMTcyMjE1XSBbPGZmZmZmZjgw MDgwYjE1Nzg+XSB3b3JrZXJfdGhyZWFkKzB4MjRjLzB4Mzc0Cj4gWyAgICAxLjE3MjIxN10gWzxm ZmZmZmY4MDA4MGI1YmNjPl0ga3RocmVhZCsweGRjLzB4ZTQKPiBbICAgIDEuMTcyMjIyXSBbPGZm ZmZmZjgwMDgwODRjZDA+XSByZXRfZnJvbV9mb3JrKzB4MTAvMHg0MAo+IAo+IFNpZ25lZC1vZmYt Ynk6IE1hcmsgWWFvIDxtYXJrLnlhb0Byb2NrLWNoaXBzLmNvbT4KCkVyaG0sIGhvdyBleGFjdGx5 IGRpZCB5b3UgbWFuYWdlIHRvIGJsb3cgdXAgaW4gdGhlcmU/IFdpdGhvdXQgZmJkZXYKc3VwcG9y dCBlbmFibGUgZHJtX2ZiX2hlbHBlcl9ob3RwbHVnX2V2ZW50KCkgZG9lcyBub3RoaW5nIGF0IGFs bC4KClRoZSBmYmRldiBoZWxwZXIgaXMgZGVzaWduZWQgc3VjaCB0aGF0IHlvdSBfZG9uJ3RfIGhh dmUgdG8gY2hlY2sgZm9yIE5VTEwKZXZlcnl3aGVyZSBpbiB0aGUgZHJpdmVyLCB0aGF0IHdvdWxk IGJlIHByZXR0eSBiYWQgY29kZS4KLURhbmllbAoKPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL3Jv Y2tjaGlwL3JvY2tjaGlwX2RybV9kcnYuYyAgIHwgMTMgKysrKysrKysrKy0tLQo+ICBkcml2ZXJz L2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2Rydi5oICAgfCAgOCArKysrKystLQo+ICBk cml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2ZiLmMgICAgfCAgNiArKystLS0K PiAgZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9mYmRldi5jIHwgMjYgKysr KysrKysrKysrKysrKystLS0tLS0tLS0KPiAgNCBmaWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25z KCspLCAxNyBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Jv Y2tjaGlwL3JvY2tjaGlwX2RybV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2Nr Y2hpcF9kcm1fZHJ2LmMKPiBpbmRleCBhODIyZDQ5Li4xYTRkYWQ2IDEwMDY0NAo+IC0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmMKPiArKysgYi9kcml2ZXJz L2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2Rydi5jCj4gQEAgLTI2MSw3ICsyNjEsMTAg QEAgc3RhdGljIHZvaWQgcm9ja2NoaXBfZHJtX2xhc3RjbG9zZShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQo+ICB7Cj4gIAlzdHJ1Y3Qgcm9ja2NoaXBfZHJtX3ByaXZhdGUgKnByaXYgPSBkZXYtPmRl dl9wcml2YXRlOwo+ICAKPiAtCWRybV9mYl9oZWxwZXJfcmVzdG9yZV9mYmRldl9tb2RlX3VubG9j a2VkKCZwcml2LT5mYmRldl9oZWxwZXIpOwo+ICsJaWYgKCFwcml2LT5mYmRldikKPiArCQlyZXR1 cm47Cj4gKwo+ICsJZHJtX2ZiX2hlbHBlcl9yZXN0b3JlX2ZiZGV2X21vZGVfdW5sb2NrZWQoJnBy aXYtPmZiZGV2LT5mYmRldl9oZWxwZXIpOwo+ICB9Cj4gIAo+ICBzdGF0aWMgY29uc3Qgc3RydWN0 IGZpbGVfb3BlcmF0aW9ucyByb2NrY2hpcF9kcm1fZHJpdmVyX2ZvcHMgPSB7Cj4gQEAgLTMxMCw4 ICszMTMsMTAgQEAgdm9pZCByb2NrY2hpcF9kcm1fZmJfc3VzcGVuZChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZHJtKQo+ICB7Cj4gIAlzdHJ1Y3Qgcm9ja2NoaXBfZHJtX3ByaXZhdGUgKnByaXYgPSBkcm0t PmRldl9wcml2YXRlOwo+ICAKPiArCWlmICghcHJpdi0+ZmJkZXYpCj4gKwkJcmV0dXJuOwo+ICAJ Y29uc29sZV9sb2NrKCk7Cj4gLQlkcm1fZmJfaGVscGVyX3NldF9zdXNwZW5kKCZwcml2LT5mYmRl dl9oZWxwZXIsIDEpOwo+ICsJZHJtX2ZiX2hlbHBlcl9zZXRfc3VzcGVuZCgmcHJpdi0+ZmJkZXYt PmZiZGV2X2hlbHBlciwgMSk7Cj4gIAljb25zb2xlX3VubG9jaygpOwo+ICB9Cj4gIAo+IEBAIC0z MTksOCArMzI0LDEwIEBAIHZvaWQgcm9ja2NoaXBfZHJtX2ZiX3Jlc3VtZShzdHJ1Y3QgZHJtX2Rl dmljZSAqZHJtKQo+ICB7Cj4gIAlzdHJ1Y3Qgcm9ja2NoaXBfZHJtX3ByaXZhdGUgKnByaXYgPSBk cm0tPmRldl9wcml2YXRlOwo+ICAKPiArCWlmICghcHJpdi0+ZmJkZXYpCj4gKwkJcmV0dXJuOwo+ ICAJY29uc29sZV9sb2NrKCk7Cj4gLQlkcm1fZmJfaGVscGVyX3NldF9zdXNwZW5kKCZwcml2LT5m YmRldl9oZWxwZXIsIDApOwo+ICsJZHJtX2ZiX2hlbHBlcl9zZXRfc3VzcGVuZCgmcHJpdi0+ZmJk ZXYtPmZiZGV2X2hlbHBlciwgMCk7Cj4gIAljb25zb2xlX3VubG9jaygpOwo+ICB9Cj4gIAo+IGRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2Rydi5oIGIv ZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9kcnYuaAo+IGluZGV4IGVhMzkz MjkuLmMwNTRmYzIgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tj aGlwX2RybV9kcnYuaAo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9k cm1fZHJ2LmgKPiBAQCAtNTAsNiArNTAsMTEgQEAgc3RydWN0IHJvY2tjaGlwX2NydGNfc3RhdGUg ewo+ICAjZGVmaW5lIHRvX3JvY2tjaGlwX2NydGNfc3RhdGUocykgXAo+ICAJCWNvbnRhaW5lcl9v ZihzLCBzdHJ1Y3Qgcm9ja2NoaXBfY3J0Y19zdGF0ZSwgYmFzZSkKPiAgCj4gK3N0cnVjdCByb2Nr Y2hpcF9kcm1fZmJkZXYgewo+ICsJc3RydWN0IGRybV9mYl9oZWxwZXIgZmJkZXZfaGVscGVyOwo+ ICsJc3RydWN0IGRybV9nZW1fb2JqZWN0ICpmYmRldl9ibzsKPiArfTsKPiArCj4gIC8qCj4gICAq IFJvY2tjaGlwIGRybSBwcml2YXRlIHN0cnVjdHVyZS4KPiAgICoKPiBAQCAtNTcsOCArNjIsNyBA QCBzdHJ1Y3Qgcm9ja2NoaXBfY3J0Y19zdGF0ZSB7Cj4gICAqIEBudW1fcGlwZTogbnVtYmVyIG9m IHBpcGVzIGZvciB0aGlzIGRldmljZS4KPiAgICovCj4gIHN0cnVjdCByb2NrY2hpcF9kcm1fcHJp dmF0ZSB7Cj4gLQlzdHJ1Y3QgZHJtX2ZiX2hlbHBlciBmYmRldl9oZWxwZXI7Cj4gLQlzdHJ1Y3Qg ZHJtX2dlbV9vYmplY3QgKmZiZGV2X2JvOwo+ICsJc3RydWN0IHJvY2tjaGlwX2RybV9mYmRldiAq ZmJkZXY7Cj4gIAljb25zdCBzdHJ1Y3Qgcm9ja2NoaXBfY3J0Y19mdW5jcyAqY3J0Y19mdW5jc1tS T0NLQ0hJUF9NQVhfQ1JUQ107Cj4gIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7Cj4g IH07Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1f ZmIuYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZmIuYwo+IGluZGV4 IDU1YzUyNzMuLmZlZjZmOGQgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlw L3JvY2tjaGlwX2RybV9mYi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tj aGlwX2RybV9mYi5jCj4gQEAgLTE1NiwxMCArMTU2LDEwIEBAIGVycl9nZW1fb2JqZWN0X3VucmVm ZXJlbmNlOgo+ICBzdGF0aWMgdm9pZCByb2NrY2hpcF9kcm1fb3V0cHV0X3BvbGxfY2hhbmdlZChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICB7Cj4gIAlzdHJ1Y3Qgcm9ja2NoaXBfZHJtX3ByaXZh dGUgKnByaXZhdGUgPSBkZXYtPmRldl9wcml2YXRlOwo+IC0Jc3RydWN0IGRybV9mYl9oZWxwZXIg KmZiX2hlbHBlciA9ICZwcml2YXRlLT5mYmRldl9oZWxwZXI7Cj4gKwlzdHJ1Y3Qgcm9ja2NoaXBf ZHJtX2ZiZGV2ICpmYmRldiA9IHByaXZhdGUtPmZiZGV2Owo+ICAKPiAtCWlmIChmYl9oZWxwZXIp Cj4gLQkJZHJtX2ZiX2hlbHBlcl9ob3RwbHVnX2V2ZW50KGZiX2hlbHBlcik7Cj4gKwlpZiAoZmJk ZXYpCj4gKwkJZHJtX2ZiX2hlbHBlcl9ob3RwbHVnX2V2ZW50KCZmYmRldi0+ZmJkZXZfaGVscGVy KTsKPiAgfQo+ICAKPiAgc3RhdGljIHZvaWQgcm9ja2NoaXBfY3J0Y193YWl0X2Zvcl91cGRhdGUo c3RydWN0IGRybV9jcnRjICpjcnRjKQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9j a2NoaXAvcm9ja2NoaXBfZHJtX2ZiZGV2LmMgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9j a2NoaXBfZHJtX2ZiZGV2LmMKPiBpbmRleCAyMDdlMDFkLi5jYzU3ODFhIDEwMDY0NAo+IC0tLSBh L2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZmJkZXYuYwo+ICsrKyBiL2Ry aXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZmJkZXYuYwo+IEBAIC0yMiwxNiAr MjIsMTYgQEAKPiAgI2luY2x1ZGUgInJvY2tjaGlwX2RybV9mYi5oIgo+ICAKPiAgI2RlZmluZSBQ UkVGRVJSRURfQlBQCQkzMgo+IC0jZGVmaW5lIHRvX2RybV9wcml2YXRlKHgpIFwKPiAtCQljb250 YWluZXJfb2YoeCwgc3RydWN0IHJvY2tjaGlwX2RybV9wcml2YXRlLCBmYmRldl9oZWxwZXIpCj4g KyNkZWZpbmUgdG9fcm9ja2NoaXBfZmJkZXYoeCkgXAo+ICsJCWNvbnRhaW5lcl9vZih4LCBzdHJ1 Y3Qgcm9ja2NoaXBfZHJtX2ZiZGV2LCBmYmRldl9oZWxwZXIpCj4gIAo+ICBzdGF0aWMgaW50IHJv Y2tjaGlwX2ZiZGV2X21tYXAoc3RydWN0IGZiX2luZm8gKmluZm8sCj4gIAkJCSAgICAgICBzdHJ1 Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSkKPiAgewo+ICAJc3RydWN0IGRybV9mYl9oZWxwZXIgKmhl bHBlciA9IGluZm8tPnBhcjsKPiAtCXN0cnVjdCByb2NrY2hpcF9kcm1fcHJpdmF0ZSAqcHJpdmF0 ZSA9IHRvX2RybV9wcml2YXRlKGhlbHBlcik7Cj4gKwlzdHJ1Y3Qgcm9ja2NoaXBfZHJtX2ZiZGV2 ICpmYmRldiA9IHRvX3JvY2tjaGlwX2ZiZGV2KGhlbHBlcik7Cj4gIAo+IC0JcmV0dXJuIHJvY2tj aGlwX2dlbV9tbWFwX2J1Zihwcml2YXRlLT5mYmRldl9ibywgdm1hKTsKPiArCXJldHVybiByb2Nr Y2hpcF9nZW1fbW1hcF9idWYoZmJkZXYtPmZiZGV2X2JvLCB2bWEpOwo+ICB9Cj4gIAo+ICBzdGF0 aWMgc3RydWN0IGZiX29wcyByb2NrY2hpcF9kcm1fZmJkZXZfb3BzID0gewo+IEBAIC01MCw3ICs1 MCw3IEBAIHN0YXRpYyBzdHJ1Y3QgZmJfb3BzIHJvY2tjaGlwX2RybV9mYmRldl9vcHMgPSB7Cj4g IHN0YXRpYyBpbnQgcm9ja2NoaXBfZHJtX2ZiZGV2X2NyZWF0ZShzdHJ1Y3QgZHJtX2ZiX2hlbHBl ciAqaGVscGVyLAo+ICAJCQkJICAgICBzdHJ1Y3QgZHJtX2ZiX2hlbHBlcl9zdXJmYWNlX3NpemUg KnNpemVzKQo+ICB7Cj4gLQlzdHJ1Y3Qgcm9ja2NoaXBfZHJtX3ByaXZhdGUgKnByaXZhdGUgPSB0 b19kcm1fcHJpdmF0ZShoZWxwZXIpOwo+ICsJc3RydWN0IHJvY2tjaGlwX2RybV9mYmRldiAqZmJk ZXYgPSB0b19yb2NrY2hpcF9mYmRldihoZWxwZXIpOwo+ICAJc3RydWN0IGRybV9tb2RlX2ZiX2Nt ZDIgbW9kZV9jbWQgPSB7IDAgfTsKPiAgCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBoZWxwZXIt PmRldjsKPiAgCXN0cnVjdCByb2NrY2hpcF9nZW1fb2JqZWN0ICpya19vYmo7Cj4gQEAgLTc1LDcg Kzc1LDcgQEAgc3RhdGljIGludCByb2NrY2hpcF9kcm1fZmJkZXZfY3JlYXRlKHN0cnVjdCBkcm1f ZmJfaGVscGVyICpoZWxwZXIsCj4gIAlpZiAoSVNfRVJSKHJrX29iaikpCj4gIAkJcmV0dXJuIC1F Tk9NRU07Cj4gIAo+IC0JcHJpdmF0ZS0+ZmJkZXZfYm8gPSAmcmtfb2JqLT5iYXNlOwo+ICsJZmJk ZXYtPmZiZGV2X2JvID0gJnJrX29iai0+YmFzZTsKPiAgCj4gIAlmYmkgPSBkcm1fZmJfaGVscGVy X2FsbG9jX2ZiaShoZWxwZXIpOwo+ICAJaWYgKElTX0VSUihmYmkpKSB7Cj4gQEAgLTg1LDcgKzg1 LDcgQEAgc3RhdGljIGludCByb2NrY2hpcF9kcm1fZmJkZXZfY3JlYXRlKHN0cnVjdCBkcm1fZmJf aGVscGVyICpoZWxwZXIsCj4gIAl9Cj4gIAo+ICAJaGVscGVyLT5mYiA9IHJvY2tjaGlwX2RybV9m cmFtZWJ1ZmZlcl9pbml0KGRldiwgJm1vZGVfY21kLAo+IC0JCQkJCQkgICBwcml2YXRlLT5mYmRl dl9ibyk7Cj4gKwkJCQkJCSAgIGZiZGV2LT5mYmRldl9ibyk7Cj4gIAlpZiAoSVNfRVJSKGhlbHBl ci0+ZmIpKSB7Cj4gIAkJZGV2X2VycihkZXYtPmRldiwgIkZhaWxlZCB0byBhbGxvY2F0ZSBEUk0g ZnJhbWVidWZmZXIuXG4iKTsKPiAgCQlyZXQgPSBQVFJfRVJSKGhlbHBlci0+ZmIpOwo+IEBAIC0x MzAsNiArMTMwLDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fZmJfaGVscGVyX2Z1bmNzIHJv Y2tjaGlwX2RybV9mYl9oZWxwZXJfZnVuY3MgPSB7Cj4gIGludCByb2NrY2hpcF9kcm1fZmJkZXZf aW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICB7Cj4gIAlzdHJ1Y3Qgcm9ja2NoaXBfZHJt X3ByaXZhdGUgKnByaXZhdGUgPSBkZXYtPmRldl9wcml2YXRlOwo+ICsJc3RydWN0IHJvY2tjaGlw X2RybV9mYmRldiAqZmJkZXY7Cj4gIAlzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVscGVyOwo+ICAJ dW5zaWduZWQgaW50IG51bV9jcnRjOwo+ICAJaW50IHJldDsKPiBAQCAtMTM5LDcgKzE0MCwxMiBA QCBpbnQgcm9ja2NoaXBfZHJtX2ZiZGV2X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAg Cj4gIAludW1fY3J0YyA9IGRldi0+bW9kZV9jb25maWcubnVtX2NydGM7Cj4gIAo+IC0JaGVscGVy ID0gJnByaXZhdGUtPmZiZGV2X2hlbHBlcjsKPiArCWZiZGV2ID0gZGV2bV9remFsbG9jKGRldi0+ ZGV2LCBzaXplb2YoKmZiZGV2KSwgR0ZQX0tFUk5FTCk7Cj4gKwlpZiAoIWZiZGV2KQo+ICsJCXJl dHVybiAtRU5PTUVNOwo+ICsKPiArCXByaXZhdGUtPmZiZGV2ID0gZmJkZXY7Cj4gKwloZWxwZXIg PSAmZmJkZXYtPmZiZGV2X2hlbHBlcjsKPiAgCj4gIAlkcm1fZmJfaGVscGVyX3ByZXBhcmUoZGV2 LCBoZWxwZXIsICZyb2NrY2hpcF9kcm1fZmJfaGVscGVyX2Z1bmNzKTsKPiAgCj4gQEAgLTE3NSw3 ICsxODEsOSBAQCB2b2lkIHJvY2tjaGlwX2RybV9mYmRldl9maW5pKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCj4gIAlzdHJ1Y3Qgcm9ja2NoaXBfZHJtX3ByaXZhdGUgKnByaXZhdGUgPSBkZXYtPmRl dl9wcml2YXRlOwo+ICAJc3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlcjsKPiAgCj4gLQloZWxw ZXIgPSAmcHJpdmF0ZS0+ZmJkZXZfaGVscGVyOwo+ICsJaWYgKCFwcml2YXRlIHx8IHByaXZhdGUt PmZiZGV2KQo+ICsJCXJldHVybjsKPiArCWhlbHBlciA9ICZwcml2YXRlLT5mYmRldi0+ZmJkZXZf aGVscGVyOwo+ICAKPiAgCWRybV9mYl9oZWxwZXJfdW5yZWdpc3Rlcl9mYmkoaGVscGVyKTsKPiAg CWRybV9mYl9oZWxwZXJfcmVsZWFzZV9mYmkoaGVscGVyKTsKPiAtLSAKPiAxLjkuMQo+IAo+IAo+ IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gZHJpLWRl dmVsIG1haWxpbmcgbGlzdAo+IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAoKLS0g CkRhbmllbCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCmh0dHA6 Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: daniel@ffwll.ch (Daniel Vetter) Date: Wed, 3 Aug 2016 10:43:21 +0200 Subject: [PATCH] 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: <20160803084321.GJ6232@phenom.ffwll.local> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, Aug 03, 2016 at 04:13:45PM +0800, Mark Yao wrote: > [ 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 Erhm, how exactly did you manage to blow up in there? Without fbdev support enable drm_fb_helper_hotplug_event() does nothing at all. The fbdev helper is designed such that you _don't_ have to check for NULL everywhere in the driver, that would be pretty bad code. -Daniel > --- > 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 > > > _______________________________________________ > dri-devel mailing list > dri-devel at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757297AbcHCIou (ORCPT ); Wed, 3 Aug 2016 04:44:50 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:32895 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756523AbcHCIom (ORCPT ); Wed, 3 Aug 2016 04:44:42 -0400 Date: Wed, 3 Aug 2016 10:43:21 +0200 From: Daniel Vetter To: Mark Yao Cc: 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: Re: [PATCH] drm/rockchip: fix fbdev crash when not use DRM_FBDEV_EMULATION Message-ID: <20160803084321.GJ6232@phenom.ffwll.local> Mail-Followup-To: Mark Yao , 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 References: <1470212025-30336-1-git-send-email-mark.yao@rock-chips.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1470212025-30336-1-git-send-email-mark.yao@rock-chips.com> X-Operating-System: Linux phenom 4.6.0-1-amd64 User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Aug 03, 2016 at 04:13:45PM +0800, Mark Yao wrote: > [ 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 Erhm, how exactly did you manage to blow up in there? Without fbdev support enable drm_fb_helper_hotplug_event() does nothing at all. The fbdev helper is designed such that you _don't_ have to check for NULL everywhere in the driver, that would be pretty bad code. -Daniel > --- > 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 > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch