From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH 01/35] drm/i915: Remove implicitly disabling primary plane for now Date: Tue, 21 Apr 2015 17:12:50 +0300 Message-ID: <1429625604-22252-2-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1429625604-22252-1-git-send-email-ander.conselvan.de.oliveira@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D0556E5C3 for ; Tue, 21 Apr 2015 07:13:25 -0700 (PDT) In-Reply-To: <1429625604-22252-1-git-send-email-ander.conselvan.de.oliveira@intel.com> 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 RnJvbTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNv bT4KClNvbWUgb2YgdGhlIGZsYWdzIHRoYXQgd2VyZSB1c2VkIGFyZSBzdGlsbCB1c2VmdWwgd2hl biB0cmFuc2l0aW9uaW5nCnRvIGF0b21pYywgc28ga2VlcCB0aG9zZSBhcm91bmQgZm9yIG5vdy4g VGhpcyByZW1vdmVzIHNvbWUgb2YgdGhlCmNvbXBsaWNhdGlvbnMgb2YgY3J0Yy0+cHJpbWFyeV9l bmFibGVkLCBtYWtpbmcgaXQgZWFzaWVyIHRvIHJlbW92ZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0 ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClJldmlld2Vk LWJ5OiBBbmRlciBDb25zZWx2YW4gZGUgT2xpdmVpcmEgPGFuZGVyLmNvbnNlbHZhbi5kZS5vbGl2 ZWlyYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAg fCAgNiAtLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgfCA0NSArLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDEgaW5z ZXJ0aW9uKCspLCA1MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4 IDIzYTQyYTQuLjlmYjJkMGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0yNTIsMTIg KzI1Miw2IEBAIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSB7CiAJYm9vbCB2aXNpYmxlOwogCiAJ LyoKLQkgKiB1c2VkIG9ubHkgZm9yIHNwcml0ZSBwbGFuZXMgdG8gZGV0ZXJtaW5lIHdoZW4gdG8g aW1wbGljaXRseQotCSAqIGVuYWJsZS9kaXNhYmxlIHRoZSBwcmltYXJ5IHBsYW5lCi0JICovCi0J Ym9vbCBoaWRlc19wcmltYXJ5OwotCi0JLyoKIAkgKiBzY2FsZXJfaWQKIAkgKiAgICA9IC0xIDog bm90IHVzaW5nIGEgc2NhbGVyCiAJICogICAgPj0gIDAgOiB1c2luZyBhIHNjYWxlcnMKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggZTNkNDFjMC4uNjEyZDhlMCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTE2NSwxNyArMTY1LDYgQEAgdm9pZCBpbnRlbF9w aXBlX3VwZGF0ZV9lbmQoc3RydWN0IGludGVsX2NydGMgKmNydGMsIHUzMiBzdGFydF92YmxfY291 bnQpCiAJCQkgIHBpcGVfbmFtZShwaXBlKSwgc3RhcnRfdmJsX2NvdW50LCBlbmRfdmJsX2NvdW50 KTsKIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGlu dGVsX2NydGMgKmNydGMpCi17Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g Y3J0Yy0+YmFzZS5kZXYtPmRldl9wcml2YXRlOwotCWludCByZWcgPSBEU1BDTlRSKGNydGMtPnBs YW5lKTsKLQotCWlmIChjcnRjLT5wcmltYXJ5X2VuYWJsZWQpCi0JCUk5MTVfV1JJVEUocmVnLCBJ OTE1X1JFQUQocmVnKSB8IERJU1BMQVlfUExBTkVfRU5BQkxFKTsKLQllbHNlCi0JCUk5MTVfV1JJ VEUocmVnLCBJOTE1X1JFQUQocmVnKSAmIH5ESVNQTEFZX1BMQU5FX0VOQUJMRSk7Ci19Ci0KIHN0 YXRpYyB2b2lkCiBza2xfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRybV9wbGFuZSwg c3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCkBA IC00NzksOCArNDY4LDYgQEAgdmx2X3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxh bmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJbGluZWFyX29mZnNldCArPSBzcmNfaCAqIGZi LT5waXRjaGVzWzBdICsgc3JjX3cgKiBwaXhlbF9zaXplOwogCX0KIAotCWludGVsX3VwZGF0ZV9w cmltYXJ5X3BsYW5lKGludGVsX2NydGMpOwotCiAJaWYgKGtleS0+ZmxhZ3MpIHsKIAkJSTkxNV9X UklURShTUEtFWU1JTlZBTChwaXBlLCBwbGFuZSksIGtleS0+bWluX3ZhbHVlKTsKIAkJSTkxNV9X UklURShTUEtFWU1BWFZBTChwaXBlLCBwbGFuZSksIGtleS0+bWF4X3ZhbHVlKTsKQEAgLTUyMSw4 ICs1MDgsNiBAQCB2bHZfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsIHN0 cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlpbnQgcGlwZSA9IGludGVsX3BsYW5lLT5waXBlOwogCWlu dCBwbGFuZSA9IGludGVsX3BsYW5lLT5wbGFuZTsKIAotCWludGVsX3VwZGF0ZV9wcmltYXJ5X3Bs YW5lKGludGVsX2NydGMpOwotCiAJSTkxNV9XUklURShTUENOVFIocGlwZSwgcGxhbmUpLCAwKTsK IAogCS8qIEFjdGl2YXRlIGRvdWJsZSBidWZmZXJlZCByZWdpc3RlciB1cGRhdGUgKi8KQEAgLTYy Niw4ICs2MTEsNiBAQCBpdmJfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBz dHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCX0KIAl9CiAKLQlpbnRlbF91cGRhdGVfcHJpbWFyeV9w bGFuZShpbnRlbF9jcnRjKTsKLQogCWlmIChrZXktPmZsYWdzKSB7CiAJCUk5MTVfV1JJVEUoU1BS S0VZVkFMKHBpcGUpLCBrZXktPm1pbl92YWx1ZSk7CiAJCUk5MTVfV1JJVEUoU1BSS0VZTUFYKHBp cGUpLCBrZXktPm1heF92YWx1ZSk7CkBAIC02NzAsOCArNjUzLDYgQEAgaXZiX2Rpc2FibGVfcGxh bmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlzdHJ1 Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJaW50IHBp cGUgPSBpbnRlbF9wbGFuZS0+cGlwZTsKIAotCWludGVsX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKGlu dGVsX2NydGMpOwotCiAJSTkxNV9XUklURShTUFJDVEwocGlwZSksIEk5MTVfUkVBRChTUFJDVEwo cGlwZSkpICYgflNQUklURV9FTkFCTEUpOwogCS8qIENhbid0IGxlYXZlIHRoZSBzY2FsZXIgZW5h YmxlZC4uLiAqLwogCWlmIChpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlKQpAQCAtNzY2LDggKzc0Nyw2 IEBAIGlsa191cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKIAkJbGluZWFyX29mZnNldCArPSBzcmNfaCAqIGZiLT5waXRjaGVzWzBdICsg c3JjX3cgKiBwaXhlbF9zaXplOwogCX0KIAotCWludGVsX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKGlu dGVsX2NydGMpOwotCiAJaWYgKGtleS0+ZmxhZ3MpIHsKIAkJSTkxNV9XUklURShEVlNLRVlWQUwo cGlwZSksIGtleS0+bWluX3ZhbHVlKTsKIAkJSTkxNV9XUklURShEVlNLRVlNQVgocGlwZSksIGtl eS0+bWF4X3ZhbHVlKTsKQEAgLTgwNSw4ICs3ODQsNiBAQCBpbGtfZGlzYWJsZV9wbGFuZShzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXN0cnVjdCBpbnRl bF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlpbnQgcGlwZSA9IGlu dGVsX3BsYW5lLT5waXBlOwogCi0JaW50ZWxfdXBkYXRlX3ByaW1hcnlfcGxhbmUoaW50ZWxfY3J0 Yyk7Ci0KIAlJOTE1X1dSSVRFKERWU0NOVFIocGlwZSksIDApOwogCS8qIERpc2FibGUgdGhlIHNj YWxlciAqLwogCUk5MTVfV1JJVEUoRFZTU0NBTEUocGlwZSksIDApOwpAQCAtODU5LDcgKzgzNiw3 IEBAIGludGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoc3RydWN0IGRybV9jcnRjICpjcnRjKQogICog QGNydGM6IHRoZSBDUlRDIHdob3NlIHByaW1hcnkgcGxhbmUgaXMgdG8gYmUgZGlzYWJsZWQKICAq CiAgKiBQZXJmb3JtcyBwb3RlbnRpYWxseSBzbGVlcGluZyBvcGVyYXRpb25zIHRoYXQgbXVzdCBi ZSBkb25lIGJlZm9yZSB0aGUKLSAqIHByaW1hcnkgcGxhbmUgaXMgZW5hYmxlZCwgc3VjaCBhcyB1 cGRhdGluZyBGQkMgYW5kIElQUy4gIE5vdGUgdGhhdCB0aGlzIG1heQorICogcHJpbWFyeSBwbGFu ZSBpcyBkaXNhYmxlZCwgc3VjaCBhcyB1cGRhdGluZyBGQkMgYW5kIElQUy4gIE5vdGUgdGhhdCB0 aGlzIG1heQogICogYmUgY2FsbGVkIGR1ZSB0byBhbiBleHBsaWNpdCBwcmltYXJ5IHBsYW5lIHVw ZGF0ZSwgb3IgZHVlIHRvIGFuIGltcGxpY2l0CiAgKiBkaXNhYmxlIHRoYXQgaXMgY2F1c2VkIHdo ZW4gYSBzcHJpdGUgcGxhbmUgY29tcGxldGVseSBoaWRlcyB0aGUgcHJpbWFyeQogICogcGxhbmUu CkBAIC04ODUsMTEgKzg2Miw2IEBAIGludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoc3RydWN0IGRy bV9jcnRjICpjcnRjKQogCWhzd19kaXNhYmxlX2lwcyhpbnRlbF9jcnRjKTsKIH0KIAotc3RhdGlj IGJvb2wgY29sb3JrZXlfZW5hYmxlZChzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lKQot ewotCXJldHVybiBpbnRlbF9wbGFuZS0+Y2tleS5mbGFncyAhPSBJOTE1X1NFVF9DT0xPUktFWV9O T05FOwotfQotCiBzdGF0aWMgaW50CiBpbnRlbF9jaGVja19zcHJpdGVfcGxhbmUoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUsCiAJCQkgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSkKQEAg LTEwNTMsMjMgKzEwMjUsMTAgQEAgZmluaXNoOgogCSAqIElmIHRoZSBzcHJpdGUgaXMgY29tcGxl dGVseSBjb3ZlcmluZyB0aGUgcHJpbWFyeSBwbGFuZSwKIAkgKiB3ZSBjYW4gZGlzYWJsZSB0aGUg cHJpbWFyeSBhbmQgc2F2ZSBwb3dlci4KIAkgKi8KLQlzdGF0ZS0+aGlkZXNfcHJpbWFyeSA9IGZi ICE9IE5VTEwgJiYgZHJtX3JlY3RfZXF1YWxzKGRzdCwgY2xpcCkgJiYKLQkJIWNvbG9ya2V5X2Vu YWJsZWQoaW50ZWxfcGxhbmUpOwotCVdBUk5fT04oc3RhdGUtPmhpZGVzX3ByaW1hcnkgJiYgIXN0 YXRlLT52aXNpYmxlICYmIGludGVsX2NydGMtPmFjdGl2ZSk7Ci0KIAlpZiAoaW50ZWxfY3J0Yy0+ YWN0aXZlKSB7Ci0JCWlmIChpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgPT0gc3RhdGUtPmhp ZGVzX3ByaW1hcnkpCi0JCQlpbnRlbF9jcnRjLT5hdG9taWMud2FpdF9mb3JfZmxpcHMgPSB0cnVl OwotCi0JCWlmIChpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgJiYgc3RhdGUtPmhpZGVzX3By aW1hcnkpCi0JCQlpbnRlbF9jcnRjLT5hdG9taWMucHJlX2Rpc2FibGVfcHJpbWFyeSA9IHRydWU7 Ci0KIAkJaW50ZWxfY3J0Yy0+YXRvbWljLmZiX2JpdHMgfD0KIAkJCUlOVEVMX0ZST05UQlVGRkVS X1NQUklURShpbnRlbF9jcnRjLT5waXBlKTsKIAotCQlpZiAoIWludGVsX2NydGMtPnByaW1hcnlf ZW5hYmxlZCAmJiAhc3RhdGUtPmhpZGVzX3ByaW1hcnkpCi0JCQlpbnRlbF9jcnRjLT5hdG9taWMu cG9zdF9lbmFibGVfcHJpbWFyeSA9IHRydWU7Ci0KIAkJaWYgKGludGVsX3dtX25lZWRfdXBkYXRl KHBsYW5lLCAmc3RhdGUtPmJhc2UpKQogCQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bSA9 IHRydWU7CiAKQEAgLTExMDUsOCArMTA2NCw2IEBAIGludGVsX2NvbW1pdF9zcHJpdGVfcGxhbmUo c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJcGxhbmUtPmZiID0gZmI7CiAKIAlpZiAoaW50ZWxf Y3J0Yy0+YWN0aXZlKSB7Ci0JCWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCA9ICFzdGF0ZS0+ aGlkZXNfcHJpbWFyeTsKLQogCQlpZiAoc3RhdGUtPnZpc2libGUpIHsKIAkJCWNydGNfeCA9IHN0 YXRlLT5kc3QueDE7CiAJCQljcnRjX3kgPSBzdGF0ZS0+ZHN0LnkxOwotLSAKMi4xLjAKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==