From: Gerd Hoffmann Subject: [PATCH 3/3] drm/i915: switch to drm_fb_helper_remove_conflicting_pci_framebuffers Date: Thu, 22 Aug 2019 11:06:45 +0200 Message-ID: <20190822090645.25410-4-kraxel@redhat.com> References: <20190822090645.25410-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190822090645.25410-1-kraxel@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: dri-devel@lists.freedesktop.org Cc: David Airlie , "open list:INTEL DRM DRIVERS excluding Poulsbo, Moorestow..., linux-kernel@vger.kernel.org open list" , Gerd Hoffmann List-Id: dri-devel@lists.freedesktop.org Tm8gbmVlZCBmb3IgYSBob21lLWdyb3duIHZlcnNpb24sIHRoZSBnZW5lcmljIGhlbHBlciBzaG91 bGQgd29yayBqdXN0CmZpbmUuICBJdCBhbHNvIGhhbmRsZXMgdmdhY29uIHJlbW92YWwgdGhlc2Ug ZGF5cywgc2VlIGNvbW1pdAoxYzc0Y2E3YTFhOWEgKCJkcm0vZmItaGVscGVyOiBjYWxsIHZnYV9y ZW1vdmVfdmdhY29uIGF1dG9tYXRpY2FsbHkuIiksCnNvIHRoYXQgY2FuIGJlIHJlbW92ZWQgdG9v LgoKU2lnbmVkLW9mZi1ieTogR2VyZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyB8IDQxICsrLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMzkgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggYjk5ZDczYzFjNGRiLi5kZGMzMTdj ZWI4ZGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtNzY2LDMxICs3NjYsNiBAQCBzdGF0 aWMgaW50IGk5MTVfbG9hZF9tb2Rlc2V0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAly ZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgaW50IGk5MTVfa2lja19vdXRfZmlybXdhcmVfZmIoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQotewotCXN0cnVjdCBhcGVydHVyZXNfc3Ry dWN0ICphcDsKLQlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5kcm0ucGRldjsKLQlz dHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0ID0gJmRldl9wcml2LT5nZ3R0OwotCWJvb2wgcHJpbWFyeTsK LQlpbnQgcmV0OwotCi0JYXAgPSBhbGxvY19hcGVydHVyZXMoMSk7Ci0JaWYgKCFhcCkKLQkJcmV0 dXJuIC1FTk9NRU07Ci0KLQlhcC0+cmFuZ2VzWzBdLmJhc2UgPSBnZ3R0LT5nbWFkci5zdGFydDsK LQlhcC0+cmFuZ2VzWzBdLnNpemUgPSBnZ3R0LT5tYXBwYWJsZV9lbmQ7Ci0KLQlwcmltYXJ5ID0K LQkJcGRldi0+cmVzb3VyY2VbUENJX1JPTV9SRVNPVVJDRV0uZmxhZ3MgJiBJT1JFU09VUkNFX1JP TV9TSEFET1c7Ci0KLQlyZXQgPSBkcm1fZmJfaGVscGVyX3JlbW92ZV9jb25mbGljdGluZ19mcmFt ZWJ1ZmZlcnMoYXAsICJpbnRlbGRybWZiIiwgcHJpbWFyeSk7Ci0KLQlrZnJlZShhcCk7Ci0KLQly ZXR1cm4gcmV0OwotfQotCiBzdGF0aWMgdm9pZCBpbnRlbF9pbml0X2RwaW8oc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCS8qCkBAIC0xNTcwLDIxICsxNTQ1LDkgQEAgc3Rh dGljIGludCBpOTE1X2RyaXZlcl9pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIAlpZiAocmV0KQogCQlnb3RvIGVycl9wZXJmOwogCi0JLyoKLQkgKiBXQVJOSU5HOiBB cHBhcmVudGx5IHdlIG11c3Qga2ljayBmYmRldiBkcml2ZXJzIGJlZm9yZSB2Z2Fjb24sCi0JICog b3RoZXJ3aXNlIHRoZSB2Z2EgZmJkZXYgZHJpdmVyIGZhbGxzIG92ZXIuCi0JICovCi0JcmV0ID0g aTkxNV9raWNrX291dF9maXJtd2FyZV9mYihkZXZfcHJpdik7Ci0JaWYgKHJldCkgewotCQlEUk1f RVJST1IoImZhaWxlZCB0byByZW1vdmUgY29uZmxpY3RpbmcgZnJhbWVidWZmZXIgZHJpdmVyc1xu Iik7CisJcmV0ID0gZHJtX2ZiX2hlbHBlcl9yZW1vdmVfY29uZmxpY3RpbmdfcGNpX2ZyYW1lYnVm ZmVycyhwZGV2LCAiaW50ZWxkcm1mYiIpOworCWlmIChyZXQpCiAJCWdvdG8gZXJyX2dndHQ7Ci0J fQotCi0JcmV0ID0gdmdhX3JlbW92ZV92Z2Fjb24ocGRldik7Ci0JaWYgKHJldCkgewotCQlEUk1f RVJST1IoImZhaWxlZCB0byByZW1vdmUgY29uZmxpY3RpbmcgVkdBIGNvbnNvbGVcbiIpOwotCQln b3RvIGVycl9nZ3R0OwotCX0KIAogCXJldCA9IGk5MTVfZ2d0dF9pbml0X2h3KGRldl9wcml2KTsK IAlpZiAocmV0KQotLSAKMi4xOC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZng=