From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: [PATCH] drm/fb-helper: don't call remove_conflicting_framebuffers for FB=m && DRM=y Date: Mon, 29 Aug 2016 14:34:07 +0200 Message-ID: <20160829123428.3260105-1-arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.187]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7D1F46E53D for ; Mon, 29 Aug 2016 12:34:55 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Chris Wilson , Daniel Vetter , David Airlie Cc: dri-devel@lists.freedesktop.org, Arnd Bergmann , linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org V2hlbiBDT05GSUdfRFJNX0tNU19GQl9IRUxQRVIgaXMgZGlzYWJsZWQsIHdlIGNhbiBoYXZlIGEg Y29uZmlndXJhdGlvbgppbiB3aGljaCBzb21lIERSTSBkcml2ZXJzIGFyZSBidWlsdC1pbiwgYnV0 IHRoZSBmcmFtZWJ1ZmZlciBjb3JlIGlzIGEKbG9hZGFibGUgbW9kdWxlLiBUaGlzIHJlc3VsdHMg aW4gYSBsaW5rIGVycm9yLCBzdWNoIGFzOgoKZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24u bzogSW4gZnVuY3Rpb24gYHJhZGVvbl9wY2lfcHJvYmUnOgpyYWRlb25fa2ZkLmM6KC50ZXh0LnJh ZGVvbl9wY2lfcHJvYmUrMHhiYyk6IHVuZGVmaW5lZCByZWZlcmVuY2UgdG8gYHJlbW92ZV9jb25m bGljdGluZ19mcmFtZWJ1ZmZlcnMnCmRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5v OiBJbiBmdW5jdGlvbiBgYW1kZ3B1X3BjaV9wcm9iZSc6CmFtZGdwdV9tbi5jOigudGV4dC5hbWRn cHVfcGNpX3Byb2JlKzB4YTgpOiB1bmRlZmluZWQgcmVmZXJlbmNlIHRvIGByZW1vdmVfY29uZmxp Y3RpbmdfZnJhbWVidWZmZXJzJwpkcml2ZXJzL2dwdS9kcm0vbWdhZzIwMC9tZ2FnMjAwLm86IElu IGZ1bmN0aW9uIGBtZ2FfdnJhbV9pbml0JzoKbWdhZzIwMF90dG0uYzooLnRleHQubWdhX3ZyYW1f aW5pdCsweGE4KTogdW5kZWZpbmVkIHJlZmVyZW5jZSB0byBgcmVtb3ZlX2NvbmZsaWN0aW5nX2Zy YW1lYnVmZmVycycKZHJpdmVycy9ncHUvZHJtL21nYWcyMDAvbWdhZzIwMC5vOiBJbiBmdW5jdGlv biBgbWdhX3BjaV9wcm9iZSc6Cm1nYWcyMDBfdHRtLmM6KC50ZXh0Lm1nYV9wY2lfcHJvYmUrMHg4 OCk6IHVuZGVmaW5lZCByZWZlcmVuY2UgdG8gYHJlbW92ZV9jb25mbGljdGluZ19mcmFtZWJ1ZmZl cnMnCk1ha2VmaWxlOjk2OTogcmVjaXBlIGZvciB0YXJnZXQgJ3ZtbGludXgnIGZhaWxlZAoKVGhp cyBjaGFuZ2VzIHRoZSBjb21waWxlLXRpbWUgY2hlY2sgdG8gSVNfUkVBQ0hBQkxFLCB3aGljaCBt ZWFucyB3ZSBlbmQgdXAKbm90IGNhbGxpbmcgcmVtb3ZlX2NvbmZsaWN0aW5nX2ZyYW1lYnVmZmVy cygpIGluIHRoZSBjb25maWd1cmF0aW9uLCB3aGljaApzZWVtcyBnb29kIGVub3VnaCwgYXMgd2Ug a25vdyB0aGF0IG5vIGZyYW1lYnVmZmVyIGRyaXZlciBpcyBsb2FkZWQgYnkgdGhlCnRpbWUgdGhh dCB0aGUgYnVpbHQtaW4gRFJNIGRyaXZlciBjYWxscyByZW1vdmVfY29uZmxpY3RpbmdfZnJhbWVi dWZmZXJzLgoKV2UgY291bGQgYWx0ZXJuYXRpdmVseSBhdm9pZCB0aGUgbGluayBlcnJvciBieSBm b3JjaW5nIENPTkZJR19GQiB0byBub3QKYmUgYSBtb2R1bGUgaW4gdGhpcyBjYXNlLCBidXQgdGhh dCB3b3VsZG4ndCBjaGFuZ2UgYW55dGhpbmcgYXQgcnVudGltZSwKYW5kIGp1c3QgbWFrZSB0aGUg YWxyZWFkeSBjb252b2x1dGVkIHNldCBvZiBkZXBlbmRlbmNpZXMgd29yc2UgaGVyZS4KCkkgY291 bGQgbm90IGZpbmQgb3V0IHdoYXQgaGFwcGVucyBpZiB0aGUgZmJkZXYgZHJpdmVyIGdldHMgbG9h ZGVkIGFzCmEgbW9kdWxlIGFmdGVyIHRoZSBEUk0gZHJpdmVyIGlzIGFscmVhZHkgaW5pdGlhbGl6 ZWQsIGJ1dCB0aGF0IGlzIGEgY2FzZQp0aGF0IGNhbiBoYXBwZW4gd2l0aCBvciB3aXRob3V0IHRo aXMgcGF0Y2guCgpTaWduZWQtb2ZmLWJ5OiBBcm5kIEJlcmdtYW5uIDxhcm5kQGFybmRiLmRlPgpG aXhlczogMGEzYmZlMjlmODE2ICgiZHJtL2ZiLWhlbHBlcjogRml4IHRoZSBkdW1teSByZW1vdmVf Y29uZmxpY3RpbmdfZnJhbWVidWZmZXJzIikKLS0tCiBpbmNsdWRlL2RybS9kcm1fZmJfaGVscGVy LmggfCAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkK CmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1fZmJfaGVscGVyLmggYi9pbmNsdWRlL2RybS9k cm1fZmJfaGVscGVyLmgKaW5kZXggZWRjNmNmZDNhYTM0Li43OTdmYjVmODBjNDUgMTAwNjQ0Ci0t LSBhL2luY2x1ZGUvZHJtL2RybV9mYl9oZWxwZXIuaAorKysgYi9pbmNsdWRlL2RybS9kcm1fZmJf aGVscGVyLmgKQEAgLTQ5MSw3ICs0OTEsNyBAQCBzdGF0aWMgaW5saW5lIGludAogZHJtX2ZiX2hl bHBlcl9yZW1vdmVfY29uZmxpY3RpbmdfZnJhbWVidWZmZXJzKHN0cnVjdCBhcGVydHVyZXNfc3Ry dWN0ICphLAogCQkJCQkgICAgICBjb25zdCBjaGFyICpuYW1lLCBib29sIHByaW1hcnkpCiB7Ci0j aWYgSVNfRU5BQkxFRChDT05GSUdfRkIpCisjaWYgSVNfUkVBQ0hBQkxFKENPTkZJR19GQikKIAly ZXR1cm4gcmVtb3ZlX2NvbmZsaWN0aW5nX2ZyYW1lYnVmZmVycyhhLCBuYW1lLCBwcmltYXJ5KTsK ICNlbHNlCiAJcmV0dXJuIDA7Ci0tIAoyLjkuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg==