From: Matt Roper Subject: [PATCH 4/4] drm/i915: Update modeset programming to use intermediate state (v2) Date: Wed, 9 Sep 2015 18:57:55 -0700 Message-ID: <1441850275-20353-5-git-send-email-matthew.d.roper@intel.com> References: <1441850275-20353-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 71FE8721A3 for ; Wed, 9 Sep 2015 18:58:40 -0700 (PDT) In-Reply-To: <1441850275-20353-1-git-send-email-matthew.d.roper@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 QXMgc3VnZ2VzdGVkIGJ5IFZpbGxlLCB0aGUgZ2VuZXJhbCBmbG93IHNob3VsZCBub3cgcm91Z2hs eSBmb2xsb3c6CgogICAgICAgIC8vIHdoYXRldmVyIHRoZSB1c2VyIHdhbnRlZAogICAgICAgIGNv bXB1dGVfZmluYWxfYXRvbWljX3N0YXRlKCkKCiAgICAgICAgLy8gaW5jbHVkZSBhbGwgY3J0Y3Mg aW4gdGhlIGludGVybWVkaWF0ZSBzdGF0ZSB3aGljaCBhcmUKICAgICAgICAvLyBnZXR0aW5nIGRp c2FibGVkIChldmVuIHRlbXBvcmFyaWx5IHRvIHBlcmZvcm0gYSBtb2Rlc2V0KQogICAgICAgIGNv bXB1dGVfaW50ZXJtZWRpYXRlX2F0b21pY19zdGF0ZSgpCgogICAgICAgIHJldCA9IGNoZWNrX3N0 YXRlX2NoYW5nZShvbGQsIGludGVybWVkaWF0ZSkKICAgICAgICByZXQgPSBjaGVja19zdGF0ZV9j aGFuZ2UoaW50ZXJtZWRpYXRlLCBuZXcpCgogICAgICAgIC8vIGNvbW1pdCBhbGwgcGxhbmVzIGlu IG9uZSBnbyB0byBtYWtlIHRoZW0gcG9wIG91dCBhcwogICAgICAgIC8vIGF0b21pY2FsbHkgYXMg cG9zc2libGUKICAgICAgICBmb3JfZWFjaF9jcnRjX2luKGludGVybWVkaWF0ZSkgewogICAgICAg ICAgICAgICAgY29tbWl0X3BsYW5lcygpCiAgICAgICAgfQoKICAgICAgICBmb3JfZWFjaF9jcnRj X2luKGludGVybWVkaWF0ZSkgewogICAgICAgICAgICAgICAgZGlzYWJsZV9jcnRjKCkKICAgICAg ICB9CgogICAgICAgIGZvcl9lYWNoX2NydGNfaW4obmV3KSB7CiAgICAgICAgICAgICAgICBpZiAo IWN1cnJlbnRseV9hY3RpdmUpCiAgICAgICAgICAgICAgICAgICAgICAgIGNydGNfZW5hYmxlKCkK ICAgICAgICB9CgogICAgICAgIC8vIGNvbW1pdCBhbGwgcGxhbmVzIGluIG9uZSBnbyB0byBtYWtl IHRoZW0gcG9wIGluIGFzIGF0b21pY2FsbHkKICAgICAgICAvLyBhcyBwb3NzaWJsZQogICAgICAg IGZvcl9lYWNoX2NydGNfaW4obmV3KSB7CiAgICAgICAgICAgICAgICBjb21taXRfcGxhbmVzKCkK ICAgICAgICB9Cgp2MjogQmVjYXVzZSB3ZSdyZSBwb3RlbnRpYWxseSBwZXJmb3JtaW5nIHR3byBz dGF0ZSBzd2FwcyBoZXJlLCB0aGUKICAgIGFjdHVhbCBzZXQgb2YgRkIncyB0aGF0IG5lZWQgdG8g YmUgY2xlYW5lZCB1cCBhdCB0aGUgZW5kIG9mIHRoZQogICAgcHJvY2VzcyBtYXkgbmVlZCB0byBi ZSBmZXRjaGVkIGZyb20gdGhlIGludGVybWVkaWF0ZSBzdGF0ZSByYXRoZXIKICAgIHRoYW4gdGhl IGZpbmFsIHN0YXRlLCBzbyB1c2Ugb3VyIG93biBpbnRlbF9jbGVhbnVwX3BsYW5lcygpIHJhdGhl cgogICAgdGhhbiB0aGUgaGVscGVyIHZlcnNpb24uCgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxs ZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVu Lmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1h dHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0tLQpJIGtub3cgTWFhcnRlbiBoYWQgc29tZSByZXNl cnZhdGlvbnMgYWJvdXQgdGhpcyBhcHByb2FjaCwgc28gaG9wZWZ1bGx5CnByb3ZpZGluZyBhbiBp bXBsZW1lbnRhdGlvbiB3aWxsIGFsbG93IHVzIHRvIGNvbnRpbnVlIHRoZSBkaXNjdXNzaW9uIGFu ZCBjb21lCnRvIGFuIGFncmVlbWVudCBvbiB3aGV0aGVyIG9yIG5vdCBpbnRlcm1lZGlhdGUgc3Rh dGVzIGFyZSB0aGUgd2F5IHRvIGdvLgoKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyB8IDEwNCArKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDgwIGluc2VydGlvbnMoKyksIDI0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwppbmRleCA1MDgxYTllLi5kNjNhZDFkIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMzAyNyw2ICsxMzAyNywzNiBAQCBzdGF0aWMgaW50IGlu dGVsX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXJldHVybiBpbnRlbF9h dG9taWNfY2hlY2tfcGxhbmVzKHN0YXRlLT5kZXYsIHN0YXRlKTsKIH0KIAorLyoKKyAqIEFuIElu dGVsLXNwZWNpZmljIHZlcnNpb24gb2YgZHJtX2F0b21pY19oZWxwZXJfY2xlYW51cF9wbGFuZXMo KS4KKyAqIFNpbmNlIHdlJ3ZlIHBvdGVudGlhbGx5IHN3YXBwZWQgdG8gYW4gaW50ZXJtZWRpYXRl IHN0YXRlIGJlZm9yZQorICogc3dhcHBpbmcgYWdhaW4gdG8gdGhlIGZpbmFsIHN0YXRlLCB0aGUg YWN0dWFsIGZyYW1lYnVmZmVycyB0aGF0CisgKiBuZWVkIHRvIGJlIGNsZWFuZWQgdXAgd2lsbCBo YXZlIGJlZW4gc3dhcHBlZCBpbnRvIHRoZSBpbnRlcm1lZGlhdGUKKyAqIHN0YXRlIG9iamVjdCBm b3IgYW55IENSVEMncyB0aGF0IGFyZSB1bmRlcmdvaW5nIGEgbW9kZXNldCwgc28gd2UKKyAqIG5l ZWQgdG8gZ3JhYiB0aGVtIGZyb20gdGhlcmUgaW5zdGVhZCBvZiB0aGUgb2xkX3N0YXRlIG9iamVj dC4KKyAqLworc3RhdGljIHZvaWQKK2ludGVsX2NsZWFudXBfcGxhbmVzKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCisJCSAgICAgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSkKK3sK KwlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqaW50ZXIgPQorCQl0b19pbnRlbF9hdG9taWNfc3Rh dGUob2xkX3N0YXRlKS0+aW50ZXJtZWRpYXRlOworCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwor CXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOworCWludCBpOworCisJZm9yX2Vh Y2hfcGxhbmVfaW5fc3RhdGUob2xkX3N0YXRlLCBwbGFuZSwgcGxhbmVfc3RhdGUsIGkpIHsKKwkJ Y29uc3Qgc3RydWN0IGRybV9wbGFuZV9oZWxwZXJfZnVuY3MgKmZ1bmNzOworCisJCWZ1bmNzID0g cGxhbmUtPmhlbHBlcl9wcml2YXRlOworCisJCXBsYW5lX3N0YXRlID0gaW50ZXItPnBsYW5lX3N0 YXRlc1tpXSA/OiBwbGFuZV9zdGF0ZTsKKworCQlpZiAoZnVuY3MtPmNsZWFudXBfZmIpCisJCQlm dW5jcy0+Y2xlYW51cF9mYihwbGFuZSwgcGxhbmVfc3RhdGUpOworCX0KK30KKwogLyoqCiAgKiBp bnRlbF9hdG9taWNfY29tbWl0IC0gY29tbWl0IHZhbGlkYXRlZCBzdGF0ZSBvYmplY3QKICAqIEBk ZXY6IERSTSBkZXZpY2UKQEAgLTEzMDQ4LDExICsxMzA3OCwxMiBAQCBzdGF0aWMgaW50IGludGVs X2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCSAgICAgICBib29sIGFz eW5jKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3By aXZhdGU7CisJc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqaXN0YXRlID0gdG9faW50ZWxfYXRv bWljX3N0YXRlKHN0YXRlKTsKKwlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqaW50ZXIgPSBpc3Rh dGUtPmludGVybWVkaWF0ZTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Ci0Jc3RydWN0IGRybV9j cnRjX3N0YXRlICpjcnRjX3N0YXRlOworCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNf c3RhdGU7CiAJaW50IHJldCA9IDA7CiAJaW50IGk7Ci0JYm9vbCBhbnlfbXMgPSBmYWxzZTsKIAog CWlmIChhc3luYykgewogCQlEUk1fREVCVUdfS01TKCJpOTE1IGRvZXMgbm90IHlldCBzdXBwb3J0 IGFzeW5jIGNvbW1pdFxuIik7CkBAIC0xMzA2Myw1OSArMTMwOTQsODQgQEAgc3RhdGljIGludCBp bnRlbF9hdG9taWNfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaWYgKHJldCkKIAkJ cmV0dXJuIHJldDsKIAotCWRybV9hdG9taWNfaGVscGVyX3N3YXBfc3RhdGUoZGV2LCBzdGF0ZSk7 CisJaWYgKCFpc3RhdGUtPmFueV9tcykgeworCQkvKgorCQkgKiBJZiB0aGVyZSdzIG5vIG1vZGVz ZXQgaW52b2x2ZWQsIGp1c3QgbW92ZSB0byB0aGUgZmluYWwgc3RhdGUKKwkJICogYW5kIGp1bXAg ZGlyZWN0bHkgdG8gdGhlIGZpbmFsIHBsYW5lIHVwZGF0ZXMuCisJCSAqLworCQlkcm1fYXRvbWlj X2hlbHBlcl9zd2FwX3N0YXRlKGRldiwgc3RhdGUpOworCQlpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9j cnRjX3N0YXRlKHN0YXRlKTsKKwkJZ290byBub21vZGVzZXQ7CisJfQogCi0JZm9yX2VhY2hfY3J0 Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewotCQlzdHJ1Y3QgaW50ZWxf Y3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJLyogU3dhcCBpbiBpbnRl cm1lZGlhdGUgc3RhdGUgKi8KKwlkcm1fYXRvbWljX2hlbHBlcl9zd2FwX3N0YXRlKGRldiwgaW50 ZXIpOwogCi0JCWlmICghbmVlZHNfbW9kZXNldChjcnRjLT5zdGF0ZSkpCi0JCQljb250aW51ZTsK KwkvKgorCSAqIENvbW1pdCBhbGwgcGxhbmVzIGluIG9uZSBnbyB0byBtYWtlIHRoZW0gcG9wIG91 dCBhcyBhdG9taWNhbGx5CisJICogYXMgcG9zc2libGUuCisJICovCisJZm9yX2VhY2hfY3J0Y19p bl9zdGF0ZShpbnRlciwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIGkpIHsKKwkJc3RydWN0IGludGVs X2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCi0JCWFueV9tcyA9IHRy dWU7CiAJCWludGVsX3ByZV9wbGFuZV91cGRhdGUoaW50ZWxfY3J0Yyk7CisJCWRybV9hdG9taWNf aGVscGVyX2NvbW1pdF9wbGFuZXNfb25fY3J0YyhvbGRfY3J0Y19zdGF0ZSk7CisJCWludGVsX3Bv c3RfcGxhbmVfdXBkYXRlKGludGVsX2NydGMpOworCX0KKworCWZvcl9lYWNoX2NydGNfaW5fc3Rh dGUoaW50ZXIsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBpKSB7CisJCXN0cnVjdCBpbnRlbF9jcnRj ICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAotCQlpZiAoY3J0Y19zdGF0ZS0+ YWN0aXZlKSB7Ci0JCQlpbnRlbF9jcnRjX2Rpc2FibGVfcGxhbmVzKGNydGMsIGNydGNfc3RhdGUt PnBsYW5lX21hc2spOworCQlpZiAob2xkX2NydGNfc3RhdGUtPmFjdGl2ZSkgeworCQkJaW50ZWxf Y3J0Y19kaXNhYmxlX3BsYW5lcyhjcnRjLAorCQkJCQkJICBvbGRfY3J0Y19zdGF0ZS0+cGxhbmVf bWFzayk7CiAJCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUoY3J0Yyk7CiAJCQlpbnRl bF9jcnRjLT5hY3RpdmUgPSBmYWxzZTsKIAkJCWludGVsX2Rpc2FibGVfc2hhcmVkX2RwbGwoaW50 ZWxfY3J0Yyk7CiAJCX0KIAl9CiAKKwkvKiBDb21taXQgZmluYWwgc3RhdGUgdG8gdGhlIHVuZGVy bHlpbmcgY3J0Yy9wbGFuZSBvYmplY3RzICovCisJZHJtX2F0b21pY19oZWxwZXJfc3dhcF9zdGF0 ZShkZXYsIHN0YXRlKTsKKwogCS8qIE9ubHkgYWZ0ZXIgZGlzYWJsaW5nIGFsbCBvdXRwdXQgcGlw ZWxpbmVzIHRoYXQgd2lsbCBiZSBjaGFuZ2VkIGNhbiB3ZQogCSAqIHVwZGF0ZSB0aGUgdGhlIG91 dHB1dCBjb25maWd1cmF0aW9uLiAqLwogCWludGVsX21vZGVzZXRfdXBkYXRlX2NydGNfc3RhdGUo c3RhdGUpOworCWludGVsX3NoYXJlZF9kcGxsX2NvbW1pdChzdGF0ZSk7CiAKLQlpZiAoYW55X21z KSB7Ci0JCWludGVsX3NoYXJlZF9kcGxsX2NvbW1pdChzdGF0ZSk7Ci0KLQkJZHJtX2F0b21pY19o ZWxwZXJfdXBkYXRlX2xlZ2FjeV9tb2Rlc2V0X3N0YXRlKHN0YXRlLT5kZXYsIHN0YXRlKTsKLQkJ bW9kZXNldF91cGRhdGVfY3J0Y19wb3dlcl9kb21haW5zKHN0YXRlKTsKLQl9CisJZHJtX2F0b21p Y19oZWxwZXJfdXBkYXRlX2xlZ2FjeV9tb2Rlc2V0X3N0YXRlKHN0YXRlLT5kZXYsIHN0YXRlKTsK Kwltb2Rlc2V0X3VwZGF0ZV9jcnRjX3Bvd2VyX2RvbWFpbnMoc3RhdGUpOwogCi0JLyogTm93IGVu YWJsZSB0aGUgY2xvY2tzLCBwbGFuZSwgcGlwZSwgYW5kIGNvbm5lY3RvcnMgdGhhdCB3ZSBzZXQg dXAuICovCi0JZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwg aSkgewotCQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0 Yyk7CisJLyogTm93IGVuYWJsZSB0aGUgY2xvY2tzLCBwaXBlLCBhbmQgY29ubmVjdG9ycyB0aGF0 IHdlIHNldCB1cC4gKi8KKwlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRf Y3J0Y19zdGF0ZSwgaSkgewogCQlib29sIG1vZGVzZXQgPSBuZWVkc19tb2Rlc2V0KGNydGMtPnN0 YXRlKTsKIAogCQlpZiAobW9kZXNldCAmJiBjcnRjLT5zdGF0ZS0+YWN0aXZlKSB7CiAJCQl1cGRh dGVfc2NhbmxpbmVfb2Zmc2V0KHRvX2ludGVsX2NydGMoY3J0YykpOwogCQkJZGV2X3ByaXYtPmRp c3BsYXkuY3J0Y19lbmFibGUoY3J0Yyk7CiAJCX0KKwl9CiAKLQkJaWYgKCFtb2Rlc2V0KQotCQkJ aW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShpbnRlbF9jcnRjKTsKK25vbW9kZXNldDoKIAotCQlkcm1f YXRvbWljX2hlbHBlcl9jb21taXRfcGxhbmVzX29uX2NydGMoY3J0Y19zdGF0ZSk7CisJLyoKKwkg KiBDb21taXQgYWxsIHBsYW5lcyBpbiBvbmUgZ28gdG8gbWFrZSB0aGVtIHBvcCBpbiBhcyBhdG9t aWNhbGx5IGFzCisJICogcG9zc2libGUuCisJICovCisJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShz dGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIGkpIHsKKwkJc3RydWN0IGludGVsX2NydGMgKmlu dGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOworCisJCWludGVsX3ByZV9wbGFuZV91cGRh dGUoaW50ZWxfY3J0Yyk7CisJCWRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9wbGFuZXNfb25fY3J0 YyhvbGRfY3J0Y19zdGF0ZSk7CiAJCWludGVsX3Bvc3RfcGxhbmVfdXBkYXRlKGludGVsX2NydGMp OwogCX0KIAogCS8qIEZJWE1FOiBhZGQgc3VicGl4ZWwgb3JkZXIgKi8KIAogCWRybV9hdG9taWNf aGVscGVyX3dhaXRfZm9yX3ZibGFua3MoZGV2LCBzdGF0ZSk7Ci0JZHJtX2F0b21pY19oZWxwZXJf Y2xlYW51cF9wbGFuZXMoZGV2LCBzdGF0ZSk7CisJaW50ZWxfY2xlYW51cF9wbGFuZXMoZGV2LCBz dGF0ZSk7CiAKLQlpZiAoYW55X21zKQorCWlmIChpc3RhdGUtPmFueV9tcykKIAkJaW50ZWxfbW9k ZXNldF9jaGVja19zdGF0ZShkZXYsIHN0YXRlKTsKIAogCWRybV9hdG9taWNfc3RhdGVfZnJlZShz dGF0ZSk7Ci0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK