From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 2/8] drm/i915: Move registration actions to connector->late_register Date: Tue, 21 Jun 2016 09:53:42 +0100 Message-ID: <1466499228-30290-3-git-send-email-chris@chris-wilson.co.uk> References: <1466499228-30290-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-lb0-x241.google.com (mail-lb0-x241.google.com [IPv6:2a00:1450:4010:c04::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 28BC96E656 for ; Tue, 21 Jun 2016 08:54:04 +0000 (UTC) Received: by mail-lb0-x241.google.com with SMTP id ur4so1031791lbc.3 for ; Tue, 21 Jun 2016 01:54:04 -0700 (PDT) In-Reply-To: <1466499228-30290-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org V2l0aCB0aGUgaW50cm9kdWN0aW9uIG9mIGEgY29ubmVjdG9yLT5mdW5jIGZvciBjYWxsYmFjayBm cm9tCmRybV9jb25uZWN0b3JfcmVnaXN0ZXIoKSB3ZSBjYW4gbW92ZSBhbGwgdGhlIHRhc2tzIHRo YXQgd2Ugd2FudCB0byBkbwp1cG9uIHJlZ2lzdHJhdGlvbiBpbnRvIHRoYXQgY2FsbGJhY2suIExh dGVyLCB0aGlzIHdpbGwgYWxsb3cgdXMgdG8KcmVvcmRlciB0aGUgcmVnaXN0cmF0aW9uIGFuZCBk ZWZlciBpdCB1bnRpbCBhZnRlciB0aGUgZGV2aWNlIGlzIHNldHVwCmFuZCByZWFkeSBmb3IgdXNl cnNwYWNlLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24u Y28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyAgICAgfCA0OCArKysr KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcF9tc3QuYyB8ICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMg ICB8IDE5ICsrKysrKysrLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAzNCBpbnNlcnRpb25zKCsp LCAzNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCBmZmE0M2VjYTE0 ZDMuLjQxNzFlMjE3MGU4ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAIC0xMTgwLDM1ICsx MTgwLDE4IEBAIGludGVsX2RwX2F1eF9maW5pKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJ a2ZyZWUoaW50ZWxfZHAtPmF1eC5uYW1lKTsKIH0KIAotc3RhdGljIGludAorc3RhdGljIHZvaWQK IGludGVsX2RwX2F1eF9pbml0KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsIHN0cnVjdCBpbnRl bF9jb25uZWN0b3IgKmNvbm5lY3RvcikKIHsKIAlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICpp bnRlbF9kaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKIAllbnVtIHBvcnQgcG9y dCA9IGludGVsX2RpZ19wb3J0LT5wb3J0OwotCWludCByZXQ7CiAKIAlpbnRlbF9hdXhfcmVnX2lu aXQoaW50ZWxfZHApOworCWRybV9kcF9hdXhfaW5pdCgmaW50ZWxfZHAtPmF1eCk7CiAKKwkvKiBG YWlsdXJlIHRvIGFsbG9jYXRlIG91ciBwcmVmZXJyZWQgbmFtZSBpcyBub3QgY3JpdGljYWwgKi8K IAlpbnRlbF9kcC0+YXV4Lm5hbWUgPSBrYXNwcmludGYoR0ZQX0tFUk5FTCwgIkRQRERDLSVjIiwg cG9ydF9uYW1lKHBvcnQpKTsKLQlpZiAoIWludGVsX2RwLT5hdXgubmFtZSkKLQkJcmV0dXJuIC1F Tk9NRU07Ci0KLQlpbnRlbF9kcC0+YXV4LmRldiA9IGNvbm5lY3Rvci0+YmFzZS5rZGV2OwogCWlu dGVsX2RwLT5hdXgudHJhbnNmZXIgPSBpbnRlbF9kcF9hdXhfdHJhbnNmZXI7Ci0KLQlEUk1fREVC VUdfS01TKCJyZWdpc3RlcmluZyAlcyBidXMgZm9yICVzXG4iLAotCQkgICAgICBpbnRlbF9kcC0+ YXV4Lm5hbWUsCi0JCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5rZGV2LT5rb2JqLm5hbWUpOwotCi0J cmV0ID0gZHJtX2RwX2F1eF9yZWdpc3RlcigmaW50ZWxfZHAtPmF1eCk7Ci0JaWYgKHJldCA8IDAp IHsKLQkJRFJNX0VSUk9SKCJkcm1fZHBfYXV4X3JlZ2lzdGVyKCkgZm9yICVzIGZhaWxlZCAoJWQp XG4iLAotCQkJICBpbnRlbF9kcC0+YXV4Lm5hbWUsIHJldCk7Ci0JCWtmcmVlKGludGVsX2RwLT5h dXgubmFtZSk7Ci0JCXJldHVybiByZXQ7Ci0JfQotCi0JcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBp bnQKQEAgLTQ0NDYsNiArNDQyOSwyMCBAQCBkb25lOgogCXJldHVybiAwOwogfQogCitzdGF0aWMg aW50CitpbnRlbF9kcF9jb25uZWN0b3JfcmVnaXN0ZXIoc3RydWN0IGRybV9jb25uZWN0b3IgKmNv bm5lY3RvcikKK3sKKwlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gaW50ZWxfYXR0YWNoZWRf ZHAoY29ubmVjdG9yKTsKKworCWk5MTVfZGVidWdmc19jb25uZWN0b3JfYWRkKGNvbm5lY3Rvcik7 CisKKwlEUk1fREVCVUdfS01TKCJyZWdpc3RlcmluZyAlcyBidXMgZm9yICVzXG4iLAorCQkgICAg ICBpbnRlbF9kcC0+YXV4Lm5hbWUsIGNvbm5lY3Rvci0+a2Rldi0+a29iai5uYW1lKTsKKworCWlu dGVsX2RwLT5hdXguZGV2ID0gY29ubmVjdG9yLT5rZGV2OworCXJldHVybiBkcm1fZHBfYXV4X3Jl Z2lzdGVyKCZpbnRlbF9kcC0+YXV4KTsKK30KKwogc3RhdGljIHZvaWQKIGludGVsX2RwX2Nvbm5l Y3Rvcl91bnJlZ2lzdGVyKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiB7CkBAIC00 NTcyLDYgKzQ1NjksNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3JfZnVuY3Mg aW50ZWxfZHBfY29ubmVjdG9yX2Z1bmNzID0gewogCS5maWxsX21vZGVzID0gZHJtX2hlbHBlcl9w cm9iZV9zaW5nbGVfY29ubmVjdG9yX21vZGVzLAogCS5zZXRfcHJvcGVydHkgPSBpbnRlbF9kcF9z ZXRfcHJvcGVydHksCiAJLmF0b21pY19nZXRfcHJvcGVydHkgPSBpbnRlbF9jb25uZWN0b3JfYXRv bWljX2dldF9wcm9wZXJ0eSwKKwkubGF0ZV9yZWdpc3RlciA9IGludGVsX2RwX2Nvbm5lY3Rvcl9y ZWdpc3RlciwKIAkuZWFybHlfdW5yZWdpc3RlciA9IGludGVsX2RwX2Nvbm5lY3Rvcl91bnJlZ2lz dGVyLAogCS5kZXN0cm95ID0gaW50ZWxfZHBfY29ubmVjdG9yX2Rlc3Ryb3ksCiAJLmF0b21pY19k ZXN0cm95X3N0YXRlID0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX2Rlc3Ryb3lfc3RhdGUs CkBAIC01NDE2LDcgKzU0MTQsNyBAQCBpbnRlbF9kcF9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50 ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gaW50ZWxfZW5jb2Rlci0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAllbnVtIHBvcnQgcG9ydCA9IGludGVsX2RpZ19w b3J0LT5wb3J0OwotCWludCB0eXBlLCByZXQ7CisJaW50IHR5cGU7CiAKIAlpZiAoV0FSTihpbnRl bF9kaWdfcG9ydC0+bWF4X2xhbmVzIDwgMSwKIAkJICJOb3QgZW5vdWdoIGxhbmVzICglZCkgZm9y IERQIG9uIHBvcnQgJWNcbiIsCkBAIC01NDc1LDYgKzU0NzMsOCBAQCBpbnRlbF9kcF9pbml0X2Nv bm5lY3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKIAljb25u ZWN0b3ItPmludGVybGFjZV9hbGxvd2VkID0gdHJ1ZTsKIAljb25uZWN0b3ItPmRvdWJsZXNjYW5f YWxsb3dlZCA9IDA7CiAKKwlpbnRlbF9kcF9hdXhfaW5pdChpbnRlbF9kcCwgaW50ZWxfY29ubmVj dG9yKTsKKwogCUlOSVRfREVMQVlFRF9XT1JLKCZpbnRlbF9kcC0+cGFuZWxfdmRkX3dvcmssCiAJ CQkgIGVkcF9wYW5lbF92ZGRfd29yayk7CiAKQEAgLTU1MTksMTAgKzU1MTksNiBAQCBpbnRlbF9k cF9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9y dCwKIAkJcHBzX3VubG9jayhpbnRlbF9kcCk7CiAJfQogCi0JcmV0ID0gaW50ZWxfZHBfYXV4X2lu aXQoaW50ZWxfZHAsIGludGVsX2Nvbm5lY3Rvcik7Ci0JaWYgKHJldCkKLQkJZ290byBmYWlsOwot CiAJLyogaW5pdCBNU1Qgb24gcG9ydHMgdGhhdCBjYW4gc3VwcG9ydCBpdCAqLwogCWlmIChIQVNf RFBfTVNUKGRldikgJiYKIAkgICAgKHBvcnQgPT0gUE9SVF9CIHx8IHBvcnQgPT0gUE9SVF9DIHx8 IHBvcnQgPT0gUE9SVF9EKSkKQEAgLTU1NDYsOCArNTU0Miw2IEBAIGludGVsX2RwX2luaXRfY29u bmVjdG9yKHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0LAogCQlJOTE1 X1dSSVRFKFBFR19CQU5EX0dBUF9EQVRBLCAodGVtcCAmIH4weGYpIHwgMHhkKTsKIAl9CiAKLQlp OTE1X2RlYnVnZnNfY29ubmVjdG9yX2FkZChjb25uZWN0b3IpOwotCiAJcmV0dXJuIHRydWU7CiAK IGZhaWw6CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jCmluZGV4IDk2NDY4MTY2MDRiZS4u ODllN2M5OGY1NjkzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9t c3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYwpAQCAtNDc3LDkg KzQ3NywxMSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kcF9yZWdpc3Rlcl9tc3RfY29ubmVjdG9yKHN0 cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiB7CiAJc3RydWN0IGludGVsX2Nvbm5lY3Rv ciAqaW50ZWxfY29ubmVjdG9yID0gdG9faW50ZWxfY29ubmVjdG9yKGNvbm5lY3Rvcik7CiAJc3Ry dWN0IGRybV9kZXZpY2UgKmRldiA9IGNvbm5lY3Rvci0+ZGV2OworCiAJZHJtX21vZGVzZXRfbG9j a19hbGwoZGV2KTsKIAlpbnRlbF9jb25uZWN0b3JfYWRkX3RvX2ZiZGV2KGludGVsX2Nvbm5lY3Rv cik7CiAJZHJtX21vZGVzZXRfdW5sb2NrX2FsbChkZXYpOworCiAJZHJtX2Nvbm5lY3Rvcl9yZWdp c3RlcigmaW50ZWxfY29ubmVjdG9yLT5iYXNlKTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2 by5jCmluZGV4IDAyYjRhNjY5NTUyOC4uNTgwY2M4NzZhOTBmIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfc2R2by5jCkBAIC0yMTc3LDYgKzIxNzcsMTYgQEAgZG9uZToKICN1bmRlZiBDSEVDS19QUk9Q RVJUWQogfQogCitzdGF0aWMgaW50CitpbnRlbF9zZHZvX2Nvbm5lY3Rvcl9yZWdpc3RlcihzdHJ1 Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQoreworCXN0cnVjdCBpbnRlbF9zZHZvICpzZHZv ID0gaW50ZWxfYXR0YWNoZWRfc2R2byhjb25uZWN0b3IpOworCisJcmV0dXJuIHN5c2ZzX2NyZWF0 ZV9saW5rKCZjb25uZWN0b3ItPmtkZXYtPmtvYmosCisJCQkJICZzZHZvLT5kZGMuZGV2LmtvYmos CisJCQkJIHNkdm8tPmRkYy5kZXYua29iai5uYW1lKTsKK30KKwogc3RhdGljIHZvaWQKIGludGVs X3Nkdm9fY29ubmVjdG9yX3VucmVnaXN0ZXIoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rv cikKIHsKQEAgLTIxOTMsNiArMjIwMyw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5l Y3Rvcl9mdW5jcyBpbnRlbF9zZHZvX2Nvbm5lY3Rvcl9mdW5jcyA9IHsKIAkuZmlsbF9tb2RlcyA9 IGRybV9oZWxwZXJfcHJvYmVfc2luZ2xlX2Nvbm5lY3Rvcl9tb2RlcywKIAkuc2V0X3Byb3BlcnR5 ID0gaW50ZWxfc2R2b19zZXRfcHJvcGVydHksCiAJLmF0b21pY19nZXRfcHJvcGVydHkgPSBpbnRl bF9jb25uZWN0b3JfYXRvbWljX2dldF9wcm9wZXJ0eSwKKwkubGF0ZV9yZWdpc3RlciA9IGludGVs X3Nkdm9fY29ubmVjdG9yX3JlZ2lzdGVyLAogCS5lYXJseV91bnJlZ2lzdGVyID0gaW50ZWxfc2R2 b19jb25uZWN0b3JfdW5yZWdpc3RlciwKIAkuZGVzdHJveSA9IGludGVsX3Nkdm9fZGVzdHJveSwK IAkuYXRvbWljX2Rlc3Ryb3lfc3RhdGUgPSBkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfZGVz dHJveV9zdGF0ZSwKQEAgLTIzODQsMTYgKzIzOTUsOCBAQCBpbnRlbF9zZHZvX2Nvbm5lY3Rvcl9p bml0KHN0cnVjdCBpbnRlbF9zZHZvX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCWlmIChyZXQgPCAw KQogCQlnb3RvIGVycjE7CiAKLQlyZXQgPSBzeXNmc19jcmVhdGVfbGluaygmZHJtX2Nvbm5lY3Rv ci0+a2Rldi0+a29iaiwKLQkJCQkmZW5jb2Rlci0+ZGRjLmRldi5rb2JqLAotCQkJCWVuY29kZXIt PmRkYy5kZXYua29iai5uYW1lKTsKLQlpZiAocmV0IDwgMCkKLQkJZ290byBlcnIyOwotCiAJcmV0 dXJuIDA7CiAKLWVycjI6Ci0JZHJtX2Nvbm5lY3Rvcl91bnJlZ2lzdGVyKGRybV9jb25uZWN0b3Ip OwogZXJyMToKIAlkcm1fY29ubmVjdG9yX2NsZWFudXAoZHJtX2Nvbm5lY3Rvcik7CiAKLS0gCjIu OC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK