From: Matt Roper Subject: [PATCH 3/3] drm/i915: Intel-specific primary plane handling (v5) Date: Wed, 23 Apr 2014 10:04:01 -0700 Message-ID: <1398272641-4368-3-git-send-email-matthew.d.roper@intel.com> References: <1398272641-4368-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id F0CF86EAE0 for ; Wed, 23 Apr 2014 10:01:44 -0700 (PDT) In-Reply-To: <1398272641-4368-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 SW50ZWwgaGFyZHdhcmUgYWxsb3dzIHRoZSBwcmltYXJ5IHBsYW5lIHRvIGJlIGRpc2FibGVkIGlu ZGVwZW5kZW50bHkgb2YKdGhlIENSVEMuICBQcm92aWRlIGN1c3RvbSBwcmltYXJ5IHBsYW5lIGhh bmRsaW5nIHRvIGFsbG93IHRoaXMuCgp2NToKIC0gVXNlIG5ldyBkcm1fcHJpbWFyeV9oZWxwZXJf Y2hlY2tfdXBkYXRlKCkgaGVscGVyIGZ1bmN0aW9uIHRvIGNoZWNrCiAgIHNldHBsYW5lIHBhcmFt ZXRlciB2YWxpZGl0eS4KIC0gU3dhcCBwcmltYXJ5IHBsYW5lJ3MgcGlwZSBmb3IgcHJlLWdlbjQg RkJDIChjYXVnaHQgYnkgVmlsbGUgU3lyasOkbMOkKQogLSBDbGVhbnVwIHByaW1hcnkgcGxhbmUg cHJvcGVybHkgb24gY3J0YyBpbml0IGZhaWx1cmUKdjQ6CiAtIERvbid0IGFkZCBhIHByaW1hcnlf cGxhbmUgZmllbGQgdG8gaW50ZWxfY3J0YzsgdGhhdCB3YXMgbGVmdCBvdmVyCiAgIGZyb20gYSBt dWNoIGVhcmxpZXIgaXRlcmF0aW9uIG9mIHRoaXMgcGF0Y2ggc2VyaWVzLCBidXQgaXMgbm8gbG9u Z2VyCiAgIG5lZWRlZC91c2VkIG5vdyB0aGF0IHRoZSBEUk0gY29yZSBwcmltYXJ5IHBsYW5lIHN1 cHBvcnQgaGFzIGJlZW4KICAgbWVyZ2VkLgp2MzoKIC0gUHJvdmlkZSBnZW4tc3BlY2lmaWMgcHJp bWFyeSBwbGFuZSBmb3JtYXQgbGlzdHMgKHN1Z2dlc3RlZCBieSBEYW5pZWwKICAgVmV0dGVyKS4K IC0gSWYgdGhlIHByaW1hcnkgcGxhbmUgaXMgYWxyZWFkeSBlbmFibGVkLCBnbyBhaGVhZCBhbmQg anVzdCBjYWxsIHRoZQogICBwcmltYXJ5IHBsYW5lIGhlbHBlciB0byBkbyB0aGUgdXBkYXRlIChz dWdnZXN0ZWQgYnkgRGFuaWVsIFZldHRlcikuCiAtIERvbid0IHRyeSB0byBkaXNhYmxlIHRoZSBw cmltYXJ5IHBsYW5lIG9uIGRlc3RydWN0aW9uOyB0aGUgRFJNIGxheWVyCiAgIHNob3VsZCBoYXZl IGFscmVhZHkgdGFrZW4gY2FyZSBvZiB0aGlzIGZvciB1cy4KdjI6CiAtIFVucGluIGZiIHByb3Bl cmx5IG9uIHByaW1hcnkgcGxhbmUgZGlzYWJsZQogLSBQcm92aWRlIGFuIEludGVsLXNwZWNpZmlj IHNldCBvZiBwcmltYXJ5IHBsYW5lIGZvcm1hdHMKIC0gQWRkaXRpb25hbCBzYW5pdHkgY2hlY2tz IG9uIHNldHBsYW5lIChpbiBsaW5lIHdpdGggdGhlIGNoZWNrcwogICBjdXJyZW50bHkgYmVpbmcg ZG9uZSBieSB0aGUgRFJNIGNvcmUgcHJpbWFyeSBwbGFuZSBoZWxwZXIpCgpTaWduZWQtb2ZmLWJ5 OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDE2MSArKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrLQogMSBmaWxlIGNoYW5nZWQsIDE1OSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBiNTcyMTBjLi5jYTgz OTcwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0zOSw4ICszOSwzNSBA QAogI2luY2x1ZGUgImk5MTVfdHJhY2UuaCIKICNpbmNsdWRlIDxkcm0vZHJtX2RwX2hlbHBlci5o PgogI2luY2x1ZGUgPGRybS9kcm1fY3J0Y19oZWxwZXIuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX3Bs YW5lX2hlbHBlci5oPgorI2luY2x1ZGUgPGRybS9kcm1fcmVjdC5oPgogI2luY2x1ZGUgPGxpbnV4 L2RtYV9yZW1hcHBpbmcuaD4KIAorLyogUHJpbWFyeSBwbGFuZSBmb3JtYXRzIHN1cHBvcnRlZCBi eSBhbGwgZ2VuICovCisjZGVmaW5lIENPTU1PTl9QUklNQVJZX0ZPUk1BVFMgXAorCURSTV9GT1JN QVRfQzgsIFwKKwlEUk1fRk9STUFUX1JHQjU2NSwgXAorCURSTV9GT1JNQVRfWFJHQjg4ODgsIFwK KwlEUk1fRk9STUFUX0FSR0I4ODg4CisKKy8qIFByaW1hcnkgcGxhbmUgZm9ybWF0cyBmb3IgZ2Vu IDw9IDMgKi8KK3N0YXRpYyBjb25zdCB1aW50MzJfdCBpbnRlbF9wcmltYXJ5X2Zvcm1hdHNfZ2Vu M1tdID0geworCUNPTU1PTl9QUklNQVJZX0ZPUk1BVFMsCisJRFJNX0ZPUk1BVF9YUkdCMTU1NSwK KwlEUk1fRk9STUFUX0FSR0IxNTU1LAorfTsKKworLyogUHJpbWFyeSBwbGFuZSBmb3JtYXRzIGZv ciBnZW4gPj0gNCAqLworc3RhdGljIGNvbnN0IHVpbnQzMl90IGludGVsX3ByaW1hcnlfZm9ybWF0 c19nZW40W10gPSB7CisJQ09NTU9OX1BSSU1BUllfRk9STUFUUywgXAorCURSTV9GT1JNQVRfWEJH Ujg4ODgsCisJRFJNX0ZPUk1BVF9BQkdSODg4OCwKKwlEUk1fRk9STUFUX1hSR0IyMTAxMDEwLAor CURSTV9GT1JNQVRfQVJHQjIxMDEwMTAsCisJRFJNX0ZPUk1BVF9YQkdSMjEwMTAxMCwKKwlEUk1f Rk9STUFUX0FCR1IyMTAxMDEwLAorfTsKKwogc3RhdGljIHZvaWQgaW50ZWxfaW5jcmVhc2VfcGxs Y2xvY2soc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIHN0YXRpYyB2b2lkIGludGVsX2NydGNfdXBk YXRlX2N1cnNvcihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGJvb2wgb24pOwogCkBAIC0xMDU0Mywx NyArMTA1NzAsMTQ3IEBAIHN0YXRpYyB2b2lkIGludGVsX3NoYXJlZF9kcGxsX2luaXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAlCVUdfT04oZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBsbCA+IEk5 MTVfTlVNX1BMTFMpOwogfQogCitzdGF0aWMgaW50CitpbnRlbF9wcmltYXJ5X3BsYW5lX2Rpc2Fi bGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCit7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IHBsYW5lLT5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxf cGxhbmUocGxhbmUpOworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjOworCisJaWYgKFdB Uk5fT04oIXBsYW5lLT5jcnRjKSkKKwkJcmV0dXJuIC1FSU5WQUw7CisKKwlpbnRlbF9jcnRjID0g dG9faW50ZWxfY3J0YyhwbGFuZS0+Y3J0Yyk7CisJaWYgKCFpbnRlbF9jcnRjLT5wcmltYXJ5X2Vu YWJsZWQpCisJCXJldHVybiAwOworCisJaW50ZWxfZGlzYWJsZV9wcmltYXJ5X2h3X3BsYW5lKGRl dl9wcml2LCBpbnRlbF9wbGFuZS0+cGxhbmUsCisJCQkJICAgICAgIGludGVsX3BsYW5lLT5waXBl KTsKKworCS8qCisJICogTi5CLiBUaGUgRFJNIHNldHBsYW5lIGNvZGUgd2lsbCB1cGRhdGUgdGhl IHBsYW5lLT5mYiBwb2ludGVyIGFmdGVyCisJICogd2UgZmluaXNoIGhlcmUuCisJICovCisJaW50 ZWxfdW5waW5fZmJfb2JqKHRvX2ludGVsX2ZyYW1lYnVmZmVyKHBsYW5lLT5mYiktPm9iaik7CisK KwlyZXR1cm4gMDsKK30KKworc3RhdGljIGludAoraW50ZWxfcHJpbWFyeV9wbGFuZV9zZXRwbGFu ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJICAg ICBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwgaW50IGNydGNfeCwgaW50IGNydGNfeSwKKwkJ CSAgICAgdW5zaWduZWQgaW50IGNydGNfdywgdW5zaWduZWQgaW50IGNydGNfaCwKKwkJCSAgICAg dWludDMyX3Qgc3JjX3gsIHVpbnQzMl90IHNyY195LAorCQkJICAgICB1aW50MzJfdCBzcmNfdywg dWludDMyX3Qgc3JjX2gpCit7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwor CXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKwlz dHJ1Y3QgZHJtX3JlY3QgZGVzdCA9IHsKKwkJLngxID0gY3J0Y194LAorCQkueTEgPSBjcnRjX3ks CisJCS54MiA9IGNydGNfeCArIGNydGNfdywKKwkJLnkyID0gY3J0Y195ICsgY3J0Y19oLAorCX07 CisJc3RydWN0IGRybV9yZWN0IHNyYyA9IHsKKwkJLngxID0gc3JjX3ggPj4gMTYsCisJCS55MSA9 IHNyY195ID4+IDE2LAorCQkueDIgPSAoc3JjX3ggKyBzcmNfdykgPj4gMTYsCisJCS55MiA9IChz cmNfeSArIHNyY19oKSA+PiAxNiwKKwl9OworCWNvbnN0IHN0cnVjdCBkcm1fcmVjdCBjbGlwID0g eworCQkueDIgPSBpbnRlbF9jcnRjLT5jb25maWcucGlwZV9zcmNfdywKKwkJLnkyID0gaW50ZWxf Y3J0Yy0+Y29uZmlnLnBpcGVfc3JjX2gsCisJfTsKKwlpbnQgdmlzaWJsZTsKKwlpbnQgcmV0Owor CisJcmV0ID0gZHJtX3ByaW1hcnlfaGVscGVyX2NoZWNrX3VwZGF0ZShwbGFuZSwgY3J0YywgZmIs CisJCQkJCSAgICAgIGNydGNfeCwgY3J0Y195LCBjcnRjX3csIGNydGNfaCwKKwkJCQkJICAgICAg c3JjX3gsIHNyY195LCBzcmNfdywgc3JjX2gsCisJCQkJCSAgICAgIGZhbHNlLCBmYWxzZSk7CisJ aWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKworCXZpc2libGUgPSBkcm1fcmVjdF9jbGlwX3NjYWxl ZCgmc3JjLCAmZGVzdCwgJmNsaXAsIDEsIDEpOworCWlmICghdmlzaWJsZSkKKwkJcmV0dXJuIGlu dGVsX3ByaW1hcnlfcGxhbmVfZGlzYWJsZShwbGFuZSk7CisKKwlyZXQgPSBpbnRlbF9waXBlX3Nl dF9iYXNlKGNydGMsIHNyYy54MSwgc3JjLnkxLCBmYik7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJl dDsKKworCWlmICghaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkKQorCQlpbnRlbF9lbmFibGVf cHJpbWFyeV9od19wbGFuZShkZXZfcHJpdiwgaW50ZWxfY3J0Yy0+cGxhbmUsCisJCQkJCSAgICAg IGludGVsX2NydGMtPnBpcGUpOworCisJcmV0dXJuIDA7Cit9CisKK3N0YXRpYyB2b2lkIGludGVs X3ByaW1hcnlfcGxhbmVfZGVzdHJveShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKK3sKKwlzdHJ1 Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOworCWRy bV9wbGFuZV9jbGVhbnVwKHBsYW5lKTsKKwlrZnJlZShpbnRlbF9wbGFuZSk7Cit9CisKK3N0YXRp YyBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGludGVsX3ByaW1hcnlfcGxhbmVfZnVuY3Mg PSB7CisJLnVwZGF0ZV9wbGFuZSA9IGludGVsX3ByaW1hcnlfcGxhbmVfc2V0cGxhbmUsCisJLmRp c2FibGVfcGxhbmUgPSBpbnRlbF9wcmltYXJ5X3BsYW5lX2Rpc2FibGUsCisJLmRlc3Ryb3kgPSBp bnRlbF9wcmltYXJ5X3BsYW5lX2Rlc3Ryb3ksCit9OworCitzdGF0aWMgc3RydWN0IGRybV9wbGFu ZSAqaW50ZWxfcHJpbWFyeV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJ CQkJCSAgICBpbnQgcGlwZSkKK3sKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnByaW1hcnk7CisJY29u c3QgdWludDMyX3QgKmludGVsX3ByaW1hcnlfZm9ybWF0czsKKwlpbnQgbnVtX2Zvcm1hdHM7CisK KwlwcmltYXJ5ID0ga3phbGxvYyhzaXplb2YoKnByaW1hcnkpLCBHRlBfS0VSTkVMKTsKKwlpZiAo cHJpbWFyeSA9PSBOVUxMKQorCQlyZXR1cm4gTlVMTDsKKworCXByaW1hcnktPmNhbl9zY2FsZSA9 IGZhbHNlOworCXByaW1hcnktPnBpcGUgPSBwaXBlOworCXByaW1hcnktPnBsYW5lID0gcGlwZTsK KwlpZiAoSEFTX0ZCQyhkZXYpICYmIElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgNCkKKwkJcHJpbWFy eS0+cGxhbmUgPSAhcGlwZTsKKworCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8PSAzKSB7CisJ CWludGVsX3ByaW1hcnlfZm9ybWF0cyA9IGludGVsX3ByaW1hcnlfZm9ybWF0c19nZW4zOworCQlu dW1fZm9ybWF0cyA9IEFSUkFZX1NJWkUoaW50ZWxfcHJpbWFyeV9mb3JtYXRzX2dlbjMpOworCX0g ZWxzZSB7CisJCWludGVsX3ByaW1hcnlfZm9ybWF0cyA9IGludGVsX3ByaW1hcnlfZm9ybWF0c19n ZW40OworCQludW1fZm9ybWF0cyA9IEFSUkFZX1NJWkUoaW50ZWxfcHJpbWFyeV9mb3JtYXRzX2dl bjQpOworCX0KKworCWRybV9wbGFuZV9pbml0KGRldiwgJnByaW1hcnktPmJhc2UsIDAsCisJCSAg ICAgICAmaW50ZWxfcHJpbWFyeV9wbGFuZV9mdW5jcywgaW50ZWxfcHJpbWFyeV9mb3JtYXRzLAor CQkgICAgICAgbnVtX2Zvcm1hdHMsIERSTV9QTEFORV9UWVBFX1BSSU1BUlkpOworCXJldHVybiAm cHJpbWFyeS0+YmFzZTsKK30KKwogc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19pbml0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIGludCBwaXBlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGM7Ci0JaW50IGk7CisJc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeTsKKwlpbnQgaSwgcmV0Owog CiAJaW50ZWxfY3J0YyA9IGt6YWxsb2Moc2l6ZW9mKCppbnRlbF9jcnRjKSwgR0ZQX0tFUk5FTCk7 CiAJaWYgKGludGVsX2NydGMgPT0gTlVMTCkKIAkJcmV0dXJuOwogCi0JZHJtX2NydGNfaW5pdChk ZXYsICZpbnRlbF9jcnRjLT5iYXNlLCAmaW50ZWxfY3J0Y19mdW5jcyk7CisJcHJpbWFyeSA9IGlu dGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRlKGRldiwgcGlwZSk7CisJcmV0ID0gZHJtX2NydGNfaW5p dF93aXRoX3BsYW5lcyhkZXYsICZpbnRlbF9jcnRjLT5iYXNlLCBwcmltYXJ5LAorCQkJCQlOVUxM LCAmaW50ZWxfY3J0Y19mdW5jcyk7CisJaWYgKHJldCkgeworCQlkcm1fcGxhbmVfY2xlYW51cChw cmltYXJ5KTsKKwkJa2ZyZWUoaW50ZWxfY3J0Yyk7CisJCXJldHVybjsKKwl9CiAKIAlkcm1fbW9k ZV9jcnRjX3NldF9nYW1tYV9zaXplKCZpbnRlbF9jcnRjLT5iYXNlLCAyNTYpOwogCWZvciAoaSA9 IDA7IGkgPCAyNTY7IGkrKykgewotLSAKMS44LjUuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK