From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pierre Moreau Subject: [PATCH v3 1/2] nouveau/bl: Assign different names to interfaces Date: Sun, 13 Nov 2016 20:57:06 +0100 Message-ID: <20161113195707.4113-1-dev@pmoreau.org> References: <1460732242-4161-1-git-send-email-pierre.morrow@free.fr> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1460732242-4161-1-git-send-email-pierre.morrow@free.fr> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: nouveau@lists.freedesktop.org, Ben Skeggs Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogUGllcnJlIE1vcmVhdSA8cGllcnJlLm1vcnJvd0BmcmVlLmZyPgoKQ3VycmVudGx5LCBl dmVyeSBiYWNrbGlnaHQgaW50ZXJmYWNlIGNyZWF0ZWQgYnkgTm91dmVhdSB1c2VzIHRoZSBzYW1l IG5hbWUsCm52X2JhY2tsaWdodC4gVGhpcyBsZWFkcyB0byBhIHN5c2ZzIHdhcm5pbmcgYXMgaXQg dHJpZXMgdG8gY3JlYXRlIGFuIGFscmVhZHkKZXhpc3RpbmcgZm9sZGVyLiBUaGlzIHBhdGNoIGFk ZHMgYSBpbmNyZW1lbnRlZCBudW1iZXIgdG8gdGhlIG5hbWUsIGJ1dCBrZWVwcwp0aGUgaW5pdGlh bCBuYW1lIGFzIG52X2JhY2tsaWdodCwgdG8gYXZvaWQgcG9zc2libHkgYnJlYWtpbmcgdXNlcnNw YWNlOyB0aGUKc2Vjb25kIGludGVyZmFjZSB3aWxsIGJlIG5hbWVkIG52X2JhY2tsaWdodDEsIGFu ZCBzbyBvbi4KCkJ1Z3ppbGxhOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVn LmNnaT9pZD04NjUzOQoKdjI6CiogU3dpdGNoIHRvIHVzaW5nIGlkYSBmb3IgZ2VuZXJhdGluZyB1 bmlxdWUgSURzLCBhcyBzdWdnZXN0ZWQgYnkgSWxpYSBNaXJraW47CiogQWxsb2NhdGUgYmFja2xp Z2h0IG5hbWUgb24gdGhlIHN0YWNrLCBhcyBzdWdnZXN0ZWQgYnkgSWxpYSBNaXJraW47CiogTW92 ZSBgbm91dmVhdV9nZXRfYmFja2xpZ2h0X25hbWUoKWAgdG8gYXZvaWQgZm9yd2FyZCBkZWNsYXJh dGlvbiwgYXMKICBzdWdnZXN0ZWQgYnkgSWxpYSBNaXJraW47CiogRml4IHJlZmVyZW5jZSB0byBi dWcgcmVwb3J0IGZvcm1hdHRpbmcsIGFzIHJlcG9ydGVkIGJ5IE5pY2sgVGVubmV5LgoKdjM6Ciog RGVmaW5lIGEgbWFjcm8gZm9yIHRoZSBzaXplIG9mIHRoZSBiYWNrbGlnaHQgbmFtZSwgdG8gYXZv aWQgZGVmaW5pbmcKICBpdCBtdWx0aXBsZSB0aW1lczsKKiBVc2Ugc25wcmludGYgaW4gcGxhY2Ug b2Ygc3ByaW50Zi4KClNpZ25lZC1vZmYtYnk6IFBpZXJyZSBNb3JlYXUgPHBpZXJyZS5tb3Jyb3dA ZnJlZS5mcj4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2JhY2tsaWdodC5j IHwgNjUgKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2 ZWF1L25vdXZlYXVfZGlzcGxheS5oICAgfCAxMCArKysrKwogZHJpdmVycy9ncHUvZHJtL25vdXZl YXUvbm91dmVhdV9kcm0uYyAgICAgICB8ICAyICsKIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25v dXZlYXVfZHJ2LmggICAgICAgfCAgMSArCiA0IGZpbGVzIGNoYW5nZWQsIDc0IGluc2VydGlvbnMo KyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUv bm91dmVhdV9iYWNrbGlnaHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfYmFj a2xpZ2h0LmMKaW5kZXggNWUyYzU2OC4uMGU2OTYxMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL25vdXZlYXUvbm91dmVhdV9iYWNrbGlnaHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbm91 dmVhdS9ub3V2ZWF1X2JhY2tsaWdodC5jCkBAIC0zMSwxMSArMzEsMzIgQEAKICAqLwogCiAjaW5j bHVkZSA8bGludXgvYmFja2xpZ2h0Lmg+CisjaW5jbHVkZSA8bGludXgvaWRyLmg+CiAKICNpbmNs dWRlICJub3V2ZWF1X2Rydi5oIgogI2luY2x1ZGUgIm5vdXZlYXVfcmVnLmgiCiAjaW5jbHVkZSAi bm91dmVhdV9lbmNvZGVyLmgiCiAKK3N0YXRpYyBzdHJ1Y3QgaWRhIGJsX2lkYTsKKyNkZWZpbmUg QkxfTkFNRV9TSVpFIDE1IC8vIDEyIGZvciBuYW1lICsgMiBmb3IgZGlnaXRzICsgMSBmb3IgJ1ww JworCitzdHJ1Y3QgYmFja2xpZ2h0X2Nvbm5lY3RvciB7CisJc3RydWN0IGxpc3RfaGVhZCBoZWFk OworCWludCBpZDsKK307CisKK3N0YXRpYyB2b2lkCitub3V2ZWF1X2dldF9iYWNrbGlnaHRfbmFt ZShjaGFyIGJhY2tsaWdodF9uYW1lW0JMX05BTUVfU0laRV0sIHN0cnVjdAorCQliYWNrbGlnaHRf Y29ubmVjdG9yICpjb25uZWN0b3IpCit7CisJY29uc3QgaW50IG5iID0gaWRhX3NpbXBsZV9nZXQo JmJsX2lkYSwgMCwgMCwgR0ZQX0tFUk5FTCk7CisJaWYgKG5iID4gMCAmJiBuYiA8IDEwMCkKKwkJ c25wcmludGYoYmFja2xpZ2h0X25hbWUsIEJMX05BTUVfU0laRSwgIm52X2JhY2tsaWdodCVkIiwg bmIpOworCWVsc2UKKwkJc25wcmludGYoYmFja2xpZ2h0X25hbWUsIEJMX05BTUVfU0laRSwgIm52 X2JhY2tsaWdodCIpOworCWNvbm5lY3Rvci0+aWQgPSBuYjsKK30KKwogc3RhdGljIGludAogbnY0 MF9nZXRfaW50ZW5zaXR5KHN0cnVjdCBiYWNrbGlnaHRfZGV2aWNlICpiZCkKIHsKQEAgLTc0LDYg Kzk1LDggQEAgbnY0MF9iYWNrbGlnaHRfaW5pdChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVj dG9yKQogCXN0cnVjdCBudmlmX29iamVjdCAqZGV2aWNlID0gJmRybS0+ZGV2aWNlLm9iamVjdDsK IAlzdHJ1Y3QgYmFja2xpZ2h0X3Byb3BlcnRpZXMgcHJvcHM7CiAJc3RydWN0IGJhY2tsaWdodF9k ZXZpY2UgKmJkOworCXN0cnVjdCBiYWNrbGlnaHRfY29ubmVjdG9yIGJsX2Nvbm5lY3RvcjsKKwlj aGFyIGJhY2tsaWdodF9uYW1lW0JMX05BTUVfU0laRV07CiAKIAlpZiAoIShudmlmX3JkMzIoZGV2 aWNlLCBOVjQwX1BNQ19CQUNLTElHSFQpICYgTlY0MF9QTUNfQkFDS0xJR0hUX01BU0spKQogCQly ZXR1cm4gMDsKQEAgLTgxLDEwICsxMDQsMTYgQEAgbnY0MF9iYWNrbGlnaHRfaW5pdChzdHJ1Y3Qg ZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogCW1lbXNldCgmcHJvcHMsIDAsIHNpemVvZihzdHJ1 Y3QgYmFja2xpZ2h0X3Byb3BlcnRpZXMpKTsKIAlwcm9wcy50eXBlID0gQkFDS0xJR0hUX1JBVzsK IAlwcm9wcy5tYXhfYnJpZ2h0bmVzcyA9IDMxOwotCWJkID0gYmFja2xpZ2h0X2RldmljZV9yZWdp c3RlcigibnZfYmFja2xpZ2h0IiwgY29ubmVjdG9yLT5rZGV2LCBkcm0sCisJbm91dmVhdV9nZXRf YmFja2xpZ2h0X25hbWUoYmFja2xpZ2h0X25hbWUsICZibF9jb25uZWN0b3IpOworCWJkID0gYmFj a2xpZ2h0X2RldmljZV9yZWdpc3RlcihiYWNrbGlnaHRfbmFtZSAsIGNvbm5lY3Rvci0+a2Rldiwg ZHJtLAogCQkJCSAgICAgICAmbnY0MF9ibF9vcHMsICZwcm9wcyk7Ci0JaWYgKElTX0VSUihiZCkp CisKKwlpZiAoSVNfRVJSKGJkKSkgeworCQlpZiAoYmxfY29ubmVjdG9yLmlkID4gMCkKKwkJCWlk YV9zaW1wbGVfcmVtb3ZlKCZibF9pZGEsIGJsX2Nvbm5lY3Rvci5pZCk7CiAJCXJldHVybiBQVFJf RVJSKGJkKTsKKwl9CisJbGlzdF9hZGQoJmJsX2Nvbm5lY3Rvci5oZWFkLCAmZHJtLT5ibF9jb25u ZWN0b3JzKTsKIAlkcm0tPmJhY2tsaWdodCA9IGJkOwogCWJkLT5wcm9wcy5icmlnaHRuZXNzID0g bnY0MF9nZXRfaW50ZW5zaXR5KGJkKTsKIAliYWNrbGlnaHRfdXBkYXRlX3N0YXR1cyhiZCk7CkBA IC0xODIsNiArMjExLDggQEAgbnY1MF9iYWNrbGlnaHRfaW5pdChzdHJ1Y3QgZHJtX2Nvbm5lY3Rv ciAqY29ubmVjdG9yKQogCXN0cnVjdCBiYWNrbGlnaHRfcHJvcGVydGllcyBwcm9wczsKIAlzdHJ1 Y3QgYmFja2xpZ2h0X2RldmljZSAqYmQ7CiAJY29uc3Qgc3RydWN0IGJhY2tsaWdodF9vcHMgKm9w czsKKwlzdHJ1Y3QgYmFja2xpZ2h0X2Nvbm5lY3RvciBibF9jb25uZWN0b3I7CisJY2hhciBiYWNr bGlnaHRfbmFtZVtCTF9OQU1FX1NJWkVdOwogCiAJbnZfZW5jb2RlciA9IGZpbmRfZW5jb2Rlcihj b25uZWN0b3IsIERDQl9PVVRQVVRfTFZEUyk7CiAJaWYgKCFudl9lbmNvZGVyKSB7CkBAIC0yMDMs MTEgKzIzNCwxNyBAQCBudjUwX2JhY2tsaWdodF9pbml0KHN0cnVjdCBkcm1fY29ubmVjdG9yICpj b25uZWN0b3IpCiAJbWVtc2V0KCZwcm9wcywgMCwgc2l6ZW9mKHN0cnVjdCBiYWNrbGlnaHRfcHJv cGVydGllcykpOwogCXByb3BzLnR5cGUgPSBCQUNLTElHSFRfUkFXOwogCXByb3BzLm1heF9icmln aHRuZXNzID0gMTAwOwotCWJkID0gYmFja2xpZ2h0X2RldmljZV9yZWdpc3RlcigibnZfYmFja2xp Z2h0IiwgY29ubmVjdG9yLT5rZGV2LAorCW5vdXZlYXVfZ2V0X2JhY2tsaWdodF9uYW1lKGJhY2ts aWdodF9uYW1lLCAmYmxfY29ubmVjdG9yKTsKKwliZCA9IGJhY2tsaWdodF9kZXZpY2VfcmVnaXN0 ZXIoYmFja2xpZ2h0X25hbWUgLCBjb25uZWN0b3ItPmtkZXYsCiAJCQkJICAgICAgIG52X2VuY29k ZXIsIG9wcywgJnByb3BzKTsKLQlpZiAoSVNfRVJSKGJkKSkKKworCWlmIChJU19FUlIoYmQpKSB7 CisJCWlmIChibF9jb25uZWN0b3IuaWQgPiAwKQorCQkJaWRhX3NpbXBsZV9yZW1vdmUoJmJsX2lk YSwgYmxfY29ubmVjdG9yLmlkKTsKIAkJcmV0dXJuIFBUUl9FUlIoYmQpOworCX0KIAorCWxpc3Rf YWRkKCZibF9jb25uZWN0b3IuaGVhZCwgJmRybS0+YmxfY29ubmVjdG9ycyk7CiAJZHJtLT5iYWNr bGlnaHQgPSBiZDsKIAliZC0+cHJvcHMuYnJpZ2h0bmVzcyA9IGJkLT5vcHMtPmdldF9icmlnaHRu ZXNzKGJkKTsKIAliYWNrbGlnaHRfdXBkYXRlX3N0YXR1cyhiZCk7CkBAIC0yMjEsNiArMjU4LDgg QEAgbm91dmVhdV9iYWNrbGlnaHRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXN0cnVj dCBudmlmX2RldmljZSAqZGV2aWNlID0gJmRybS0+ZGV2aWNlOwogCXN0cnVjdCBkcm1fY29ubmVj dG9yICpjb25uZWN0b3I7CiAKKwlJTklUX0xJU1RfSEVBRCgmZHJtLT5ibF9jb25uZWN0b3JzKTsK KwogCWxpc3RfZm9yX2VhY2hfZW50cnkoY29ubmVjdG9yLCAmZGV2LT5tb2RlX2NvbmZpZy5jb25u ZWN0b3JfbGlzdCwgaGVhZCkgewogCQlpZiAoY29ubmVjdG9yLT5jb25uZWN0b3JfdHlwZSAhPSBE Uk1fTU9ERV9DT05ORUNUT1JfTFZEUyAmJgogCQkgICAgY29ubmVjdG9yLT5jb25uZWN0b3JfdHlw ZSAhPSBEUk1fTU9ERV9DT05ORUNUT1JfZURQKQpAQCAtMjQ3LDkgKzI4NiwyNyBAQCB2b2lkCiBu b3V2ZWF1X2JhY2tsaWdodF9leGl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0 IG5vdXZlYXVfZHJtICpkcm0gPSBub3V2ZWF1X2RybShkZXYpOworCXN0cnVjdCBiYWNrbGlnaHRf Y29ubmVjdG9yICpjb25uZWN0b3I7CisKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNvbm5lY3Rvciwg JmRybS0+YmxfY29ubmVjdG9ycywgaGVhZCkgeworCQlpZiAoY29ubmVjdG9yLT5pZCA+PSAwKQor CQkJaWRhX3NpbXBsZV9yZW1vdmUoJmJsX2lkYSwgY29ubmVjdG9yLT5pZCk7CisJfQogCiAJaWYg KGRybS0+YmFja2xpZ2h0KSB7CiAJCWJhY2tsaWdodF9kZXZpY2VfdW5yZWdpc3Rlcihkcm0tPmJh Y2tsaWdodCk7CiAJCWRybS0+YmFja2xpZ2h0ID0gTlVMTDsKIAl9CiB9CisKK3ZvaWQKK25vdXZl YXVfYmFja2xpZ2h0X2N0b3Iodm9pZCkKK3sKKwlpZGFfaW5pdCgmYmxfaWRhKTsKK30KKwordm9p ZAorbm91dmVhdV9iYWNrbGlnaHRfZHRvcih2b2lkKQoreworCWlkYV9kZXN0cm95KCZibF9pZGEp OworfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9kaXNwbGF5 LmggYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2Rpc3BsYXkuaAppbmRleCAzMzBm ZTBmLi40YTc1ZGYwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1 X2Rpc3BsYXkuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2Rpc3BsYXku aApAQCAtOTEsNiArOTEsOCBAQCBpbnQgbm91dmVhdV9jcnRjX3NldF9jb25maWcoc3RydWN0IGRy bV9tb2RlX3NldCAqc2V0KTsKICNpZmRlZiBDT05GSUdfRFJNX05PVVZFQVVfQkFDS0xJR0hUCiBl eHRlcm4gaW50IG5vdXZlYXVfYmFja2xpZ2h0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKik7CiBl eHRlcm4gdm9pZCBub3V2ZWF1X2JhY2tsaWdodF9leGl0KHN0cnVjdCBkcm1fZGV2aWNlICopOwor ZXh0ZXJuIHZvaWQgbm91dmVhdV9iYWNrbGlnaHRfY3Rvcih2b2lkKTsKK2V4dGVybiB2b2lkIG5v dXZlYXVfYmFja2xpZ2h0X2R0b3Iodm9pZCk7CiAjZWxzZQogc3RhdGljIGlubGluZSBpbnQKIG5v dXZlYXVfYmFja2xpZ2h0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKQEAgLTEwMSw2ICsx MDMsMTQgQEAgbm91dmVhdV9iYWNrbGlnaHRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog c3RhdGljIGlubGluZSB2b2lkCiBub3V2ZWF1X2JhY2tsaWdodF9leGl0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpIHsKIH0KKworc3RhdGljIGlubGluZSB2b2lkCitub3V2ZWF1X2JhY2tsaWdodF9j dG9yKHZvaWQpIHsKK30KKworc3RhdGljIGlubGluZSB2b2lkCitub3V2ZWF1X2JhY2tsaWdodF9k dG9yKHZvaWQpIHsKK30KICNlbmRpZgogCiBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZHJtLmMgYi9kcml2ZXJzL2dw dS9kcm0vbm91dmVhdS9ub3V2ZWF1X2RybS5jCmluZGV4IDk4NzZlNmYuLjJiOTNiNTUgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZHJtLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9kcm0uYwpAQCAtMTExMyw2ICsxMTEzLDcgQEAgbm91 dmVhdV9kcm1faW5pdCh2b2lkKQogI2VuZGlmCiAKIAlub3V2ZWF1X3JlZ2lzdGVyX2RzbV9oYW5k bGVyKCk7CisJbm91dmVhdV9iYWNrbGlnaHRfY3RvcigpOwogCXJldHVybiBkcm1fcGNpX2luaXQo JmRyaXZlcl9wY2ksICZub3V2ZWF1X2RybV9wY2lfZHJpdmVyKTsKIH0KIApAQCAtMTEyMyw2ICsx MTI0LDcgQEAgbm91dmVhdV9kcm1fZXhpdCh2b2lkKQogCQlyZXR1cm47CiAKIAlkcm1fcGNpX2V4 aXQoJmRyaXZlcl9wY2ksICZub3V2ZWF1X2RybV9wY2lfZHJpdmVyKTsKKwlub3V2ZWF1X2JhY2ts aWdodF9kdG9yKCk7CiAJbm91dmVhdV91bnJlZ2lzdGVyX2RzbV9oYW5kbGVyKCk7CiAKICNpZmRl ZiBDT05GSUdfTk9VVkVBVV9QTEFURk9STV9EUklWRVIKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9ub3V2ZWF1L25vdXZlYXVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2 ZWF1X2Rydi5oCmluZGV4IDRjZDQ3YmEuLjkyM2RiY2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9ub3V2ZWF1L25vdXZlYXVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUv bm91dmVhdV9kcnYuaApAQCAtMTYxLDYgKzE2MSw3IEBAIHN0cnVjdCBub3V2ZWF1X2RybSB7CiAJ c3RydWN0IG52YmlvcyB2YmlvczsKIAlzdHJ1Y3Qgbm91dmVhdV9kaXNwbGF5ICpkaXNwbGF5Owog CXN0cnVjdCBiYWNrbGlnaHRfZGV2aWNlICpiYWNrbGlnaHQ7CisJc3RydWN0IGxpc3RfaGVhZCBi bF9jb25uZWN0b3JzOwogCiAJLyogcG93ZXIgbWFuYWdlbWVudCAqLwogCXN0cnVjdCBub3V2ZWF1 X2h3bW9uICpod21vbjsKLS0gCjIuMTAuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vZHJpLWRldmVsCg==