From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH 1/3] fbdev: drop res_id parameter from remove_conflicting_pci_framebuffers Date: Thu, 22 Aug 2019 11:06:43 +0200 Message-ID: <20190822090645.25410-2-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: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 878A66EAC2 for ; Thu, 22 Aug 2019 09:06:58 +0000 (UTC) In-Reply-To: <20190822090645.25410-1-kraxel@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: "open list:FRAMEBUFFER LAYER" , Bartlomiej Zolnierkiewicz , Maxime Ripard , open list , David Airlie , Gerd Hoffmann , Sean Paul List-Id: dri-devel@lists.freedesktop.org U2luY2UgY29tbWl0IGIwZTk5OWM5NTU4MSAoImZiZGV2OiBsaXN0IGFsbCBwY2kgbWVtb3J5IGJh cnMgYXMKY29uZmxpY3RpbmcgYXBlcnR1cmVzIikgdGhlIHBhcmFtZXRlciB3YXMgdXNlZCBmb3Ig c29tZSBzYW5pdHkgY2hlY2tzCm9ubHksIHRvIG1ha2Ugc3VyZSB3ZSBkZXRlY3QgYW55IGlzc3Vl cyB3aXRoIHRoZSBuZXcgYXBwcm9hY2ggdG8ganVzdApsaXN0IGFsbCBtZW1vcnkgYmFycyBhcyBh cGVydHVyZXMuCgpObyBpc3N1ZXMgdHVybmVkIHVwIHNvIGZhciwgc28gY29udGludWUgdG8gY2xl YW51cDogIERyb3AgdGhlIHJlc19pZApwYXJhbWV0ZXIsIGRyb3AgdGhlIHNhbml0eSBjaGVja3Mu ICBBbHNvIGRvd25ncmFkZSB0aGUgbG9nZ2luZyBmcm9tCiJpbmZvIiBsZXZlbCB0byAiZGVidWci IGxldmVsIGFuZCB1cGRhdGUgZG9jdW1lbnRhdGlvbi4KClNpZ25lZC1vZmYtYnk6IEdlcmQgSG9m Zm1hbm4gPGtyYXhlbEByZWRoYXQuY29tPgotLS0KIGluY2x1ZGUvZHJtL2RybV9mYl9oZWxwZXIu aCAgICAgIHwgIDIgKy0KIGluY2x1ZGUvbGludXgvZmIuaCAgICAgICAgICAgICAgIHwgIDIgKy0K IGRyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYm1lbS5jIHwgMTcgKysrKystLS0tLS0tLS0tLS0K IDMgZmlsZXMgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9pbmNsdWRlL2RybS9kcm1fZmJfaGVscGVyLmggYi9pbmNsdWRlL2RybS9kcm1fZmJf aGVscGVyLmgKaW5kZXggYzhhOGFlMmE2NzhhLi41YTVmNGIxZDgyNDEgMTAwNjQ0Ci0tLSBhL2lu Y2x1ZGUvZHJtL2RybV9mYl9oZWxwZXIuaAorKysgYi9pbmNsdWRlL2RybS9kcm1fZmJfaGVscGVy LmgKQEAgLTU2MCw3ICs1NjAsNyBAQCBkcm1fZmJfaGVscGVyX3JlbW92ZV9jb25mbGljdGluZ19w Y2lfZnJhbWVidWZmZXJzKHN0cnVjdCBwY2lfZGV2ICpwZGV2LAogCSAqIG90aGVyd2lzZSB0aGUg dmdhIGZiZGV2IGRyaXZlciBmYWxscyBvdmVyLgogCSAqLwogI2lmIElTX1JFQUNIQUJMRShDT05G SUdfRkIpCi0JcmV0ID0gcmVtb3ZlX2NvbmZsaWN0aW5nX3BjaV9mcmFtZWJ1ZmZlcnMocGRldiwg cmVzb3VyY2VfaWQsIG5hbWUpOworCXJldCA9IHJlbW92ZV9jb25mbGljdGluZ19wY2lfZnJhbWVi dWZmZXJzKHBkZXYsIG5hbWUpOwogI2VuZGlmCiAJaWYgKHJldCA9PSAwKQogCQlyZXQgPSB2Z2Ff cmVtb3ZlX3ZnYWNvbihwZGV2KTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvZmIuaCBiL2lu Y2x1ZGUvbGludXgvZmIuaAppbmRleCA3NTY3MDZiNjY2YTEuLjQxZTAwNjllY2EwYSAxMDA2NDQK LS0tIGEvaW5jbHVkZS9saW51eC9mYi5oCisrKyBiL2luY2x1ZGUvbGludXgvZmIuaApAQCAtNjA3 LDcgKzYwNyw3IEBAIGV4dGVybiBzc2l6ZV90IGZiX3N5c193cml0ZShzdHJ1Y3QgZmJfaW5mbyAq aW5mbywgY29uc3QgY2hhciBfX3VzZXIgKmJ1ZiwKIGV4dGVybiBpbnQgcmVnaXN0ZXJfZnJhbWVi dWZmZXIoc3RydWN0IGZiX2luZm8gKmZiX2luZm8pOwogZXh0ZXJuIHZvaWQgdW5yZWdpc3Rlcl9m cmFtZWJ1ZmZlcihzdHJ1Y3QgZmJfaW5mbyAqZmJfaW5mbyk7CiBleHRlcm4gdm9pZCB1bmxpbmtf ZnJhbWVidWZmZXIoc3RydWN0IGZiX2luZm8gKmZiX2luZm8pOwotZXh0ZXJuIGludCByZW1vdmVf Y29uZmxpY3RpbmdfcGNpX2ZyYW1lYnVmZmVycyhzdHJ1Y3QgcGNpX2RldiAqcGRldiwgaW50IHJl c19pZCwKK2V4dGVybiBpbnQgcmVtb3ZlX2NvbmZsaWN0aW5nX3BjaV9mcmFtZWJ1ZmZlcnMoc3Ry dWN0IHBjaV9kZXYgKnBkZXYsCiAJCQkJCSAgICAgICBjb25zdCBjaGFyICpuYW1lKTsKIGV4dGVy biBpbnQgcmVtb3ZlX2NvbmZsaWN0aW5nX2ZyYW1lYnVmZmVycyhzdHJ1Y3QgYXBlcnR1cmVzX3N0 cnVjdCAqYSwKIAkJCQkJICAgY29uc3QgY2hhciAqbmFtZSwgYm9vbCBwcmltYXJ5KTsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYm1lbS5jIGIvZHJpdmVycy92aWRlby9m YmRldi9jb3JlL2ZibWVtLmMKaW5kZXggZTZhMWM4MDUwNjRmLi45NWMzMjk1MmZhOGEgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYm1lbS5jCisrKyBiL2RyaXZlcnMvdmlk ZW8vZmJkZXYvY29yZS9mYm1lbS5jCkBAIC0xNzU4LDIxICsxNzU4LDE5IEBAIEVYUE9SVF9TWU1C T0wocmVtb3ZlX2NvbmZsaWN0aW5nX2ZyYW1lYnVmZmVycyk7CiAvKioKICAqIHJlbW92ZV9jb25m bGljdGluZ19wY2lfZnJhbWVidWZmZXJzIC0gcmVtb3ZlIGZpcm13YXJlLWNvbmZpZ3VyZWQgZnJh bWVidWZmZXJzIGZvciBQQ0kgZGV2aWNlcwogICogQHBkZXY6IFBDSSBkZXZpY2UKLSAqIEByZXNf aWQ6IGluZGV4IG9mIFBDSSBCQVIgY29uZmlndXJpbmcgZnJhbWVidWZmZXIgbWVtb3J5CiAgKiBA bmFtZTogcmVxdWVzdGluZyBkcml2ZXIgbmFtZQogICoKICAqIFRoaXMgZnVuY3Rpb24gcmVtb3Zl cyBmcmFtZWJ1ZmZlciBkZXZpY2VzIChlZy4gaW5pdGlhbGl6ZWQgYnkgZmlybXdhcmUpCi0gKiB1 c2luZyBtZW1vcnkgcmFuZ2UgY29uZmlndXJlZCBmb3IgQHBkZXYncyBCQVIgQHJlc19pZC4KKyAq IHVzaW5nIG1lbW9yeSByYW5nZSBjb25maWd1cmVkIGZvciBhbnkgb2YgQHBkZXYncyBtZW1vcnkg YmFycy4KICAqCiAgKiBUaGUgZnVuY3Rpb24gYXNzdW1lcyB0aGF0IFBDSSBkZXZpY2Ugd2l0aCBz aGFkb3dlZCBST00gZHJpdmVzIGEgcHJpbWFyeQogICogZGlzcGxheSBhbmQgc28ga2lja3Mgb3V0 IHZnYTE2ZmIuCiAgKi8KLWludCByZW1vdmVfY29uZmxpY3RpbmdfcGNpX2ZyYW1lYnVmZmVycyhz dHJ1Y3QgcGNpX2RldiAqcGRldiwgaW50IHJlc19pZCwgY29uc3QgY2hhciAqbmFtZSkKK2ludCBy ZW1vdmVfY29uZmxpY3RpbmdfcGNpX2ZyYW1lYnVmZmVycyhzdHJ1Y3QgcGNpX2RldiAqcGRldiwg Y29uc3QgY2hhciAqbmFtZSkKIHsKIAlzdHJ1Y3QgYXBlcnR1cmVzX3N0cnVjdCAqYXA7CiAJYm9v bCBwcmltYXJ5ID0gZmFsc2U7CiAJaW50IGVyciwgaWR4LCBiYXI7Ci0JYm9vbCByZXNfaWRfZm91 bmQgPSBmYWxzZTsKIAogCWZvciAoaWR4ID0gMCwgYmFyID0gMDsgYmFyIDwgUENJX1JPTV9SRVNP VVJDRTsgYmFyKyspIHsKIAkJaWYgKCEocGNpX3Jlc291cmNlX2ZsYWdzKHBkZXYsIGJhcikgJiBJ T1JFU09VUkNFX01FTSkpCkBAIC0xNzg5LDE2ICsxNzg3LDExIEBAIGludCByZW1vdmVfY29uZmxp Y3RpbmdfcGNpX2ZyYW1lYnVmZmVycyhzdHJ1Y3QgcGNpX2RldiAqcGRldiwgaW50IHJlc19pZCwg Y29uc3QKIAkJCWNvbnRpbnVlOwogCQlhcC0+cmFuZ2VzW2lkeF0uYmFzZSA9IHBjaV9yZXNvdXJj ZV9zdGFydChwZGV2LCBiYXIpOwogCQlhcC0+cmFuZ2VzW2lkeF0uc2l6ZSA9IHBjaV9yZXNvdXJj ZV9sZW4ocGRldiwgYmFyKTsKLQkJcGNpX2luZm8ocGRldiwgIiVzOiBiYXIgJWQ6IDB4JWx4IC0+ IDB4JWx4XG4iLCBfX2Z1bmNfXywgYmFyLAotCQkJICh1bnNpZ25lZCBsb25nKXBjaV9yZXNvdXJj ZV9zdGFydChwZGV2LCBiYXIpLAotCQkJICh1bnNpZ25lZCBsb25nKXBjaV9yZXNvdXJjZV9lbmQo cGRldiwgYmFyKSk7CisJCXBjaV9kYmcocGRldiwgIiVzOiBiYXIgJWQ6IDB4JWx4IC0+IDB4JWx4 XG4iLCBfX2Z1bmNfXywgYmFyLAorCQkJKHVuc2lnbmVkIGxvbmcpcGNpX3Jlc291cmNlX3N0YXJ0 KHBkZXYsIGJhciksCisJCQkodW5zaWduZWQgbG9uZylwY2lfcmVzb3VyY2VfZW5kKHBkZXYsIGJh cikpOwogCQlpZHgrKzsKLQkJaWYgKHJlc19pZCA9PSBiYXIpCi0JCQlyZXNfaWRfZm91bmQgPSB0 cnVlOwogCX0KLQlpZiAoIXJlc19pZF9mb3VuZCkKLQkJcGNpX3dhcm4ocGRldiwgIiVzOiBwYXNz ZWQgcmVzX2lkICglZCkgaXMgbm90IGEgbWVtb3J5IGJhclxuIiwKLQkJCSBfX2Z1bmNfXywgcmVz X2lkKTsKIAogI2lmZGVmIENPTkZJR19YODYKIAlwcmltYXJ5ID0gcGRldi0+cmVzb3VyY2VbUENJ X1JPTV9SRVNPVVJDRV0uZmxhZ3MgJgotLSAKMi4xOC4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9kcmktZGV2ZWw=