From: Daniel Vetter Subject: [PATCH] drm: prevent double-(un)registration for connectors Date: Sun, 18 Dec 2016 14:35:45 +0100 Message-ID: <20161218133545.2106-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: DRI Development Cc: Daniel Vetter , Daniel Vetter , Intel Graphics Development List-Id: intel-gfx@lists.freedesktop.org SWYgd2UncmUgdW5sdWNreSB0aGVuIHRoZSByZWdpc3RyYXRpb24gZnJvbSBhIGhvdHBsdWdnZWQg Y29ubmVjdG9yCm1pZ2h0IHJhY2Ugd2l0aCB0aGUgZmluYWwgcmVnaXN0cmF0aW9uIHN0ZXAgb24g ZHJpdmVyIGxvYWQuIEFuZCBzaW5jZQpNU1QgdG9wb2xvZ3kgZGlzY292ZXIgaXMgYXN5bmNocm9u b3VzIHRoYXQncyBldmVuIHNvbWV3aGF0IGxpa2VseS4KCnYyOiBBbHNvIHVwZGF0ZSB0aGUga2Vy bmVsZG9jIGZvciBAcmVnaXN0ZXJlZCEKCnYzOiBSZXZpZXcgZnJvbSBDaHJpczoKLSBJbXByb3Zl IGtlcm5lbGRvYyBmb3IgbGF0ZV9yZWdpc3Rlci9lYXJseV91bnJlZ2lzdGVyIGNhbGxiYWNrcy4K LSBVc2UgbXV0ZXhfZGVzdHJveS4KClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNo cmlzLXdpbHNvbi5jby51az4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgpSZXBvcnRlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ ClNpZ25lZC1vZmYtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fY29ubmVjdG9yLmMgfCAyMCArKysrKysrKysrKysrKyst LS0tLQogaW5jbHVkZS9kcm0vZHJtX2Nvbm5lY3Rvci5oICAgICB8IDE2ICsrKysrKysrKysrKysr Ky0KIDIgZmlsZXMgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2Nvbm5lY3Rvci5jIGIvZHJpdmVycy9ncHUv ZHJtL2RybV9jb25uZWN0b3IuYwppbmRleCBiMzMzMzRlMDliMDAuLjU5MDY3NzViMWZhOCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9jb25uZWN0b3IuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vZHJtX2Nvbm5lY3Rvci5jCkBAIC0yMjMsNiArMjIzLDcgQEAgaW50IGRybV9jb25uZWN0 b3JfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJSU5JVF9MSVNUX0hFQUQoJmNvbm5l Y3Rvci0+cHJvYmVkX21vZGVzKTsKIAlJTklUX0xJU1RfSEVBRCgmY29ubmVjdG9yLT5tb2Rlcyk7 CisJbXV0ZXhfaW5pdCgmY29ubmVjdG9yLT5tdXRleCk7CiAJY29ubmVjdG9yLT5lZGlkX2Jsb2Jf cHRyID0gTlVMTDsKIAljb25uZWN0b3ItPnN0YXR1cyA9IGNvbm5lY3Rvcl9zdGF0dXNfdW5rbm93 bjsKIApAQCAtMzU4LDYgKzM1OSw4IEBAIHZvaWQgZHJtX2Nvbm5lY3Rvcl9jbGVhbnVwKHN0cnVj dCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiAJCWNvbm5lY3Rvci0+ZnVuY3MtPmF0b21pY19k ZXN0cm95X3N0YXRlKGNvbm5lY3RvciwKIAkJCQkJCSAgICAgICBjb25uZWN0b3ItPnN0YXRlKTsK IAorCW11dGV4X2Rlc3Ryb3koJmNvbm5lY3Rvci0+bXV0ZXgpOworCiAJbWVtc2V0KGNvbm5lY3Rv ciwgMCwgc2l6ZW9mKCpjb25uZWN0b3IpKTsKIH0KIEVYUE9SVF9TWU1CT0woZHJtX2Nvbm5lY3Rv cl9jbGVhbnVwKTsKQEAgLTM3MywxNCArMzc2LDE1IEBAIEVYUE9SVF9TWU1CT0woZHJtX2Nvbm5l Y3Rvcl9jbGVhbnVwKTsKICAqLwogaW50IGRybV9jb25uZWN0b3JfcmVnaXN0ZXIoc3RydWN0IGRy bV9jb25uZWN0b3IgKmNvbm5lY3RvcikKIHsKLQlpbnQgcmV0OworCWludCByZXQgPSAwOwogCisJ bXV0ZXhfbG9jaygmY29ubmVjdG9yLT5tdXRleCk7CiAJaWYgKGNvbm5lY3Rvci0+cmVnaXN0ZXJl ZCkKLQkJcmV0dXJuIDA7CisJCWdvdG8gdW5sb2NrOwogCiAJcmV0ID0gZHJtX3N5c2ZzX2Nvbm5l Y3Rvcl9hZGQoY29ubmVjdG9yKTsKIAlpZiAocmV0KQotCQlyZXR1cm4gcmV0OworCQlnb3RvIHVu bG9jazsKIAogCXJldCA9IGRybV9kZWJ1Z2ZzX2Nvbm5lY3Rvcl9hZGQoY29ubmVjdG9yKTsKIAlp ZiAocmV0KSB7CkBAIC0zOTYsMTIgKzQwMCwxNCBAQCBpbnQgZHJtX2Nvbm5lY3Rvcl9yZWdpc3Rl cihzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogCWRybV9tb2RlX29iamVjdF9yZWdp c3Rlcihjb25uZWN0b3ItPmRldiwgJmNvbm5lY3Rvci0+YmFzZSk7CiAKIAljb25uZWN0b3ItPnJl Z2lzdGVyZWQgPSB0cnVlOwotCXJldHVybiAwOworCWdvdG8gdW5sb2NrOwogCiBlcnJfZGVidWdm czoKIAlkcm1fZGVidWdmc19jb25uZWN0b3JfcmVtb3ZlKGNvbm5lY3Rvcik7CiBlcnJfc3lzZnM6 CiAJZHJtX3N5c2ZzX2Nvbm5lY3Rvcl9yZW1vdmUoY29ubmVjdG9yKTsKK3VubG9jazoKKwltdXRl eF91bmxvY2soJmNvbm5lY3Rvci0+bXV0ZXgpOwogCXJldHVybiByZXQ7CiB9CiBFWFBPUlRfU1lN Qk9MKGRybV9jb25uZWN0b3JfcmVnaXN0ZXIpOwpAQCAtNDE0LDggKzQyMCwxMSBAQCBFWFBPUlRf U1lNQk9MKGRybV9jb25uZWN0b3JfcmVnaXN0ZXIpOwogICovCiB2b2lkIGRybV9jb25uZWN0b3Jf dW5yZWdpc3RlcihzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogewotCWlmICghY29u bmVjdG9yLT5yZWdpc3RlcmVkKQorCW11dGV4X2xvY2soJmNvbm5lY3Rvci0+bXV0ZXgpOworCWlm ICghY29ubmVjdG9yLT5yZWdpc3RlcmVkKSB7CisJCW11dGV4X3VubG9jaygmY29ubmVjdG9yLT5t dXRleCk7CiAJCXJldHVybjsKKwl9CiAKIAlpZiAoY29ubmVjdG9yLT5mdW5jcy0+ZWFybHlfdW5y ZWdpc3RlcikKIAkJY29ubmVjdG9yLT5mdW5jcy0+ZWFybHlfdW5yZWdpc3Rlcihjb25uZWN0b3Ip OwpAQCAtNDI0LDYgKzQzMyw3IEBAIHZvaWQgZHJtX2Nvbm5lY3Rvcl91bnJlZ2lzdGVyKHN0cnVj dCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiAJZHJtX2RlYnVnZnNfY29ubmVjdG9yX3JlbW92 ZShjb25uZWN0b3IpOwogCiAJY29ubmVjdG9yLT5yZWdpc3RlcmVkID0gZmFsc2U7CisJbXV0ZXhf dW5sb2NrKCZjb25uZWN0b3ItPm11dGV4KTsKIH0KIEVYUE9SVF9TWU1CT0woZHJtX2Nvbm5lY3Rv cl91bnJlZ2lzdGVyKTsKIApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2Nvbm5lY3Rvci5o IGIvaW5jbHVkZS9kcm0vZHJtX2Nvbm5lY3Rvci5oCmluZGV4IDBlNDFhMmUxODRhOS4uZTRmMjNj YzJhYWFiIDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9kcm1fY29ubmVjdG9yLmgKKysrIGIvaW5j bHVkZS9kcm0vZHJtX2Nvbm5lY3Rvci5oCkBAIC0zODEsNiArMzgxLDggQEAgc3RydWN0IGRybV9j b25uZWN0b3JfZnVuY3MgewogCSAqIGNvcmUgZHJtIGNvbm5lY3RvciBpbnRlcmZhY2VzLiBFdmVy eXRoaW5nIGFkZGVkIGZyb20gdGhpcyBjYWxsYmFjawogCSAqIHNob3VsZCBiZSB1bnJlZ2lzdGVy ZWQgaW4gdGhlIGVhcmx5X3VucmVnaXN0ZXIgY2FsbGJhY2suCiAJICoKKwkgKiBUaGlzIGlzIGNh bGxlZCB3aGlsZSBob2xkaW5nIGRybV9jb25uZWN0b3ItPm11dGV4LgorCSAqCiAJICogUmV0dXJu czoKIAkgKgogCSAqIDAgb24gc3VjY2Vzcywgb3IgYSBuZWdhdGl2ZSBlcnJvciBjb2RlIG9uIGZh aWx1cmUuCkBAIC0zOTUsNiArMzk3LDggQEAgc3RydWN0IGRybV9jb25uZWN0b3JfZnVuY3Mgewog CSAqIGxhdGVfcmVnaXN0ZXIoKS4gSXQgaXMgY2FsbGVkIGZyb20gZHJtX2Nvbm5lY3Rvcl91bnJl Z2lzdGVyKCksCiAJICogZWFybHkgaW4gdGhlIGRyaXZlciB1bmxvYWQgc2VxdWVuY2UgdG8gZGlz YWJsZSB1c2Vyc3BhY2UgYWNjZXNzCiAJICogYmVmb3JlIGRhdGEgc3RydWN0dXJlcyBhcmUgdG9y bmRvd24uCisJICoKKwkgKiBUaGlzIGlzIGNhbGxlZCB3aGlsZSBob2xkaW5nIGRybV9jb25uZWN0 b3ItPm11dGV4LgogCSAqLwogCXZvaWQgKCplYXJseV91bnJlZ2lzdGVyKShzdHJ1Y3QgZHJtX2Nv bm5lY3RvciAqY29ubmVjdG9yKTsKIApAQCAtNTU5LDcgKzU2Myw2IEBAIHN0cnVjdCBkcm1fY21k bGluZV9tb2RlIHsKICAqIEBpbnRlcmxhY2VfYWxsb3dlZDogY2FuIHRoaXMgY29ubmVjdG9yIGhh bmRsZSBpbnRlcmxhY2VkIG1vZGVzPwogICogQGRvdWJsZXNjYW5fYWxsb3dlZDogY2FuIHRoaXMg Y29ubmVjdG9yIGhhbmRsZSBkb3VibGVzY2FuPwogICogQHN0ZXJlb19hbGxvd2VkOiBjYW4gdGhp cyBjb25uZWN0b3IgaGFuZGxlIHN0ZXJlbyBtb2Rlcz8KLSAqIEByZWdpc3RlcmVkOiBpcyB0aGlz IGNvbm5lY3RvciBleHBvc2VkIChyZWdpc3RlcmVkKSB3aXRoIHVzZXJzcGFjZT8KICAqIEBtb2Rl czogbW9kZXMgYXZhaWxhYmxlIG9uIHRoaXMgY29ubmVjdG9yIChmcm9tIGZpbGxfbW9kZXMoKSAr IHVzZXIpCiAgKiBAc3RhdHVzOiBvbmUgb2YgdGhlIGRybV9jb25uZWN0b3Jfc3RhdHVzIGVudW1z IChjb25uZWN0ZWQsIG5vdCwgb3IgdW5rbm93bikKICAqIEBwcm9iZWRfbW9kZXM6IGxpc3Qgb2Yg bW9kZXMgZGVyaXZlZCBkaXJlY3RseSBmcm9tIHRoZSBkaXNwbGF5CkBAIC02MDgsNiArNjExLDEz IEBAIHN0cnVjdCBkcm1fY29ubmVjdG9yIHsKIAljaGFyICpuYW1lOwogCiAJLyoqCisJICogQG11 dGV4OiBMb2NrIGZvciBnZW5lcmFsIGNvbm5lY3RvciBzdGF0ZSwgYnV0IGN1cnJlbnRseSBvbmx5 IHByb3RlY3RzCisJICogQHJlZ2lzdGVyZWQuIE1vc3Qgb2YgdGhlIGNvbm5lY3RvciBzdGF0ZSBp cyBzdGlsbCBwcm90ZWN0ZWQgYnkgdGhlCisJICogbXV0ZXggaW4gJmRybV9tb2RlX2NvbmZpZy4K KwkgKi8KKwlzdHJ1Y3QgbXV0ZXggbXV0ZXg7CisKKwkvKioKIAkgKiBAaW5kZXg6IENvbXBhY3Rl ZCBjb25uZWN0b3IgaW5kZXgsIHdoaWNoIG1hdGNoZXMgdGhlIHBvc2l0aW9uIGluc2lkZQogCSAq IHRoZSBtb2RlX2NvbmZpZy5saXN0IGZvciBkcml2ZXJzIG5vdCBzdXBwb3J0aW5nIGhvdC1hZGQv cmVtb3ZpbmcuIENhbgogCSAqIGJlIHVzZWQgYXMgYW4gYXJyYXkgaW5kZXguIEl0IGlzIGludmFy aWFudCBvdmVyIHRoZSBsaWZldGltZSBvZiB0aGUKQEAgLTYyMCw2ICs2MzAsMTAgQEAgc3RydWN0 IGRybV9jb25uZWN0b3IgewogCWJvb2wgaW50ZXJsYWNlX2FsbG93ZWQ7CiAJYm9vbCBkb3VibGVz Y2FuX2FsbG93ZWQ7CiAJYm9vbCBzdGVyZW9fYWxsb3dlZDsKKwkvKioKKwkgKiBAcmVnaXN0ZXJl ZDogSXMgdGhpcyBjb25uZWN0b3IgZXhwb3NlZCAocmVnaXN0ZXJlZCkgd2l0aCB1c2Vyc3BhY2U/ CisJICogUHJvdGVjdGVkIGJ5IEBtdXRleC4KKwkgKi8KIAlib29sIHJlZ2lzdGVyZWQ7CiAJc3Ry dWN0IGxpc3RfaGVhZCBtb2RlczsgLyogbGlzdCBvZiBtb2RlcyBvbiB0aGlzIGNvbm5lY3RvciAq LwogCi0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbAo=