From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: [PATCH 2/2] drm/i915/skl: Add support for pipe background color Date: Thu, 22 Oct 2015 17:25:35 -0700 Message-ID: <1445559935-17217-3-git-send-email-matthew.d.roper@intel.com> References: <1445559935-17217-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: In-Reply-To: <1445559935-17217-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 Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org U0tMIGFuZCBCWFQgYWxsb3cgQ1JUQydzIHRvIGJlIHByb2dyYW1tZWQgd2l0aCBhIGJhY2tncm91 bmQvY2FudmFzIGNvbG9yCmJlbG93IHRoZSBwcm9ncmFtbWFibGUgcGxhbmVzLiAgTGV0J3MgZXhw b3NlIHRoaXMgYXMgYSBwcm9wZXJ0eSB0byBhbGxvdwp1c2Vyc3BhY2UgdG8gcHJvZ3JhbSBhIGRl c2lyZWQgdmFsdWUuCgpUaGlzIHBhdGNoIGlzIGJhc2VkIG9uIGVhcmxpZXIgd29yayBieSBDaGFu ZHJhIEtvbmR1cnU7IHVuZm9ydHVuYXRlbHkKdGhlIGRyaXZlciBoYXMgZXZvbHZlZCBzbyBtdWNo IHNpbmNlIGhpcyBwYXRjaGVzIHdlcmUgd3JpdHRlbgoocHJlLWF0b21pYykgdGhhdCB0aGUgZnVu Y3Rpb25hbGl0eSBoYWQgdG8gYmUgcHJldHR5IG11Y2ggY29tcGxldGVseQpyZXdyaXR0ZW4gZm9y IHRoZSBuZXcgaTkxNSBhdG9taWMgaW50ZXJuYWxzLgoKQ2M6IENoYW5kcmEgS29uZHVydSA8Y2hh bmRyYS5rb25kdXJ1QGludGVsLmNvbT4KQ2M6IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4K LS0tCiBEb2N1bWVudGF0aW9uL0RvY0Jvb2svZ3B1LnRtcGwgICAgICAgfCAxMCArKysrKysrKy0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICB8ICA5ICsrKysrKysrCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oICAgICAgfCAxMCArKysrKysrKysKIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDQzICsrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCA3MSBpbnNlcnRpb25zKCspLCAxIGRlbGV0 aW9uKC0pCgpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9Eb2NCb29rL2dwdS50bXBsIGIvRG9j dW1lbnRhdGlvbi9Eb2NCb29rL2dwdS50bXBsCmluZGV4IGMwNWQ3ZGYuLjQwYzBkNDkgMTAwNjQ0 Ci0tLSBhL0RvY3VtZW50YXRpb24vRG9jQm9vay9ncHUudG1wbAorKysgYi9Eb2N1bWVudGF0aW9u L0RvY0Jvb2svZ3B1LnRtcGwKQEAgLTI4MTksNyArMjgxOSw3IEBAIHZvaWQgaW50ZWxfY3J0X2lu aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAk8dGQgdmFsaWduPSJ0b3AiID5UQkQ8L3RkPgog CTwvdHI+CiAJPHRyPgotCTx0ZCByb3dzcGFuPSIyMCIgdmFsaWduPSJ0b3AiID5pOTE1PC90ZD4K Kwk8dGQgcm93c3Bhbj0iMjEiIHZhbGlnbj0idG9wIiA+aTkxNTwvdGQ+CiAJPHRkIHJvd3NwYW49 IjIiIHZhbGlnbj0idG9wIiA+R2VuZXJpYzwvdGQ+CiAJPHRkIHZhbGlnbj0idG9wIiA+IkJyb2Fk Y2FzdCBSR0IiPC90ZD4KIAk8dGQgdmFsaWduPSJ0b3AiID5FTlVNPC90ZD4KQEAgLTI4MzUsNiAr MjgzNSwxNCBAQCB2b2lkIGludGVsX2NydF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ PHRkIHZhbGlnbj0idG9wIiA+VEJEPC90ZD4KIAk8L3RyPgogCTx0cj4KKwk8dGQgcm93c3Bhbj0i MSIgdmFsaWduPSJ0b3AiID5DUlRDPC90ZD4KKwk8dGQgdmFsaWduPSJ0b3AiID7igJxiYWNrZ3Jv dW5kX2NvbG9y4oCdPC90ZD4KKwk8dGQgdmFsaWduPSJ0b3AiID5SR0JBPC90ZD4KKwk8dGQgdmFs aWduPSJ0b3AiID4mbmJzcDs8L3RkPgorCTx0ZCB2YWxpZ249InRvcCIgPkNSVEM8L3RkPgorCTx0 ZCB2YWxpZ249InRvcCIgPkJhY2tncm91bmQgY29sb3Igb2YgcmVnaW9ucyBub3QgY292ZXJlZCBi eSBhIHBsYW5lPC90ZD4KKwk8L3RyPgorCTx0cj4KIAk8dGQgcm93c3Bhbj0iMTciIHZhbGlnbj0i dG9wIiA+U0RWTy1UVjwvdGQ+CiAJPHRkIHZhbGlnbj0idG9wIiA+4oCcbW9kZeKAnTwvdGQ+CiAJ PHRkIHZhbGlnbj0idG9wIiA+RU5VTTwvdGQ+CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5j CmluZGV4IGEzYjIyYmQuLmFjYjA1ZTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5j CkBAIC0yOTc3LDYgKzI5NzcsMTUgQEAgc3RhdGljIGludCBpOTE1X2Rpc3BsYXlfaW5mbyhzdHJ1 Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKIAkJCQkgICBjcnRjLT5iYXNlLmN1cnNvci0+ c3RhdGUtPmNydGNfaCwKIAkJCQkgICBjcnRjLT5jdXJzb3JfYWRkciwgeWVzbm8oYWN0aXZlKSk7 CiAJCX0KKwkJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDkgJiYgcGlwZV9jb25maWctPmJh c2UuYWN0aXZlKSB7CisJCQlkcm1fcmdiYV90IGJhY2tncm91bmQgPSBwaXBlX2NvbmZpZy0+YmFz ZS5iYWNrZ3JvdW5kX2NvbG9yOworCisJCQlzZXFfcHJpbnRmKG0sICJcdGJhY2tncm91bmQgY29s b3IgKDEwYnBjKTogcj0leCBnPSV4IGI9JXhcbiIsCisJCQkJICAgYmFja2dyb3VuZC52LAorCQkJ CSAgIERSTV9SR0JBX1JFREJJVFMoYmFja2dyb3VuZCwgMTApLAorCQkJCSAgIERSTV9SR0JBX0dS RUVOQklUUyhiYWNrZ3JvdW5kLCAxMCksCisJCQkJICAgRFJNX1JHQkFfQkxVRUJJVFMoYmFja2dy b3VuZCwgMTApKTsKKwkJfQogCiAJCXNlcV9wcmludGYobSwgIlx0dW5kZXJydW4gcmVwb3J0aW5n OiBjcHU9JXMgcGNoPSVzIFxuIiwKIAkJCSAgIHllc25vKCFjcnRjLT5jcHVfZmlmb191bmRlcnJ1 bl9kaXNhYmxlZCksCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAppbmRleCA5ZWJmMDMyLi45NWVhMzk0 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKQEAgLTc1NjIsNiArNzU2MiwxNiBAQCBlbnVtIHNr bF9kaXNwX3Bvd2VyX3dlbGxzIHsKICNkZWZpbmUgUElQRV9DU0NfUE9TVE9GRl9NRShwaXBlKSBf UElQRShwaXBlLCBfUElQRV9BX0NTQ19QT1NUT0ZGX01FLCBfUElQRV9CX0NTQ19QT1NUT0ZGX01F KQogI2RlZmluZSBQSVBFX0NTQ19QT1NUT0ZGX0xPKHBpcGUpIF9QSVBFKHBpcGUsIF9QSVBFX0Ff Q1NDX1BPU1RPRkZfTE8sIF9QSVBFX0JfQ1NDX1BPU1RPRkZfTE8pCiAKKy8qIFNreWxha2UgcGlw ZSBib3R0b20gY29sb3IgKi8KKyNkZWZpbmUgX1BJUEVfQk9UVE9NX0NPTE9SX0EgICAgICAgIDB4 NzAwMzQKKyNkZWZpbmUgX1BJUEVfQk9UVE9NX0NPTE9SX0IgICAgICAgIDB4NzEwMzQKKyNkZWZp bmUgX1BJUEVfQk9UVE9NX0NPTE9SX0MgICAgICAgIDB4NzIwMzQKKyNkZWZpbmUgUElQRV9CT1RU T01fR0FNTUFfRU5BQkxFICAgKDEgPDwgMzEpCisjZGVmaW5lIFBJUEVfQk9UVE9NX0NTQ19FTkFC TEUgICAgICgxIDw8IDMwKQorI2RlZmluZSBQSVBFX0JPVFRPTV9DT0xPUl9NQVNLICAgICAweDNG RkZGRkZGCisjZGVmaW5lIFBJUEVfQk9UVE9NX0NPTE9SKHBpcGUpIF9QSVBFMyhwaXBlLCBfUElQ RV9CT1RUT01fQ09MT1JfQSwgXAorCV9QSVBFX0JPVFRPTV9DT0xPUl9CLCBfUElQRV9CT1RUT01f Q09MT1JfQykKKwogLyogTUlQSSBEU0kgcmVnaXN0ZXJzICovCiAKICNkZWZpbmUgX01JUElfUE9S VChwb3J0LCBhLCBjKQlfUE9SVDMocG9ydCwgYSwgMCwgYykJLyogcG9ydHMgQSBhbmQgQyBvbmx5 ICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMWZjMWQyNC4uYjAwZmNh OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzMzMiw2ICszMzMyLDgg QEAgc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX3BpcGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjLAogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3By aXZhdGU7CiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0KIAkJdG9faW50 ZWxfY3J0Y19zdGF0ZShjcnRjLT5iYXNlLnN0YXRlKTsKKwlkcm1fcmdiYV90IGJhY2tncm91bmQg PSBwaXBlX2NvbmZpZy0+YmFzZS5iYWNrZ3JvdW5kX2NvbG9yOworCXVpbnQzMl90IHZhbDsKIAog CS8qIGRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9sZWdhY3lfbW9kZXNldF9zdGF0ZSBtaWdodCBu b3QgYmUgY2FsbGVkLiAqLwogCWNydGMtPmJhc2UubW9kZSA9IGNydGMtPmJhc2Uuc3RhdGUtPm1v ZGU7CkBAIC0zMzY4LDYgKzMzNzAsMjYgQEAgc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX3BpcGVf Y29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQllbHNlIGlmIChvbGRfY3J0Y19zdGF0 ZS0+cGNoX3BmaXQuZW5hYmxlZCkKIAkJCWlyb25sYWtlX3BmaXRfZGlzYWJsZShjcnRjLCB0cnVl KTsKIAl9CisKKwlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkgeworCQkvKiBCR1IgMTZi cGMgPT0+IFJHQiAxMGJwYyAqLworCQl2YWwgPSBEUk1fUkdCQV9SRURCSVRTKGJhY2tncm91bmQs IDEwKSA8PCAyMAorCQkgICAgfCBEUk1fUkdCQV9HUkVFTkJJVFMoYmFja2dyb3VuZCwgMTApIDw8 IDEwCisJCSAgICB8IERSTV9SR0JBX0JMVUVCSVRTKGJhY2tncm91bmQsIDEwKTsKKworCQkvKgor CQkgKiBTZXQgQ1NDIGFuZCBnYW1tYSBmb3IgYm90dG9tIGNvbG9yLgorCQkgKgorCQkgKiBGSVhN RTogIFdlIHR1cm4gdGhlc2Ugb24gdW5jb25kaXRpb25hbGx5IGZvciBub3cgdG8gbWF0Y2gKKwkJ ICogaG93IHdlJ3ZlIHNldHVwIHRoZSB2YXJpb3VzIHBsYW5lcy4gIE9uY2UgdGhlIGNvbG9yCisJ CSAqIG1hbmFnZW1lbnQgZnJhbWV3b3JrIGxhbmRzLCBpdCBtYXkgb3IgbWF5IG5vdCBjaG9vc2Ug dG8KKwkJICogc2V0IHRoZXNlIGJpdHMuCisJCSAqLworCQl2YWwgfD0gUElQRV9CT1RUT01fQ1ND X0VOQUJMRTsKKwkJdmFsIHw9IFBJUEVfQk9UVE9NX0dBTU1BX0VOQUJMRTsKKworCQlJOTE1X1dS SVRFKFBJUEVfQk9UVE9NX0NPTE9SKGNydGMtPnBpcGUpLCB2YWwpOworCX0KIH0KIAogc3RhdGlj IHZvaWQgaW50ZWxfZmRpX25vcm1hbF90cmFpbihzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCkBAIC0x MTc4OCw2ICsxMTgxMCw5IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19hdG9taWNfY2hlY2soc3Ry dWN0IGRybV9jcnRjICpjcnRjLAogCQkJCQkJCSBwaXBlX2NvbmZpZyk7CiAJfQogCisJaWYgKGNy dGMtPnN0YXRlLT5iYWNrZ3JvdW5kX2NvbG9yLnYgIT0gY3J0Y19zdGF0ZS0+YmFja2dyb3VuZF9j b2xvci52KQorCQlwaXBlX2NvbmZpZy0+dXBkYXRlX3BpcGUgPSB0cnVlOworCiAJcmV0dXJuIHJl dDsKIH0KIApAQCAtMTMyMzAsNiArMTMyNTUsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9j cnRjX2Z1bmNzIGludGVsX2NydGNfZnVuY3MgPSB7CiAJLnNldF9jb25maWcgPSBkcm1fYXRvbWlj X2hlbHBlcl9zZXRfY29uZmlnLAogCS5kZXN0cm95ID0gaW50ZWxfY3J0Y19kZXN0cm95LAogCS5w YWdlX2ZsaXAgPSBpbnRlbF9jcnRjX3BhZ2VfZmxpcCwKKwkuc2V0X3Byb3BlcnR5ID0gZHJtX2F0 b21pY19oZWxwZXJfY3J0Y19zZXRfcHJvcGVydHksCiAJLmF0b21pY19kdXBsaWNhdGVfc3RhdGUg PSBpbnRlbF9jcnRjX2R1cGxpY2F0ZV9zdGF0ZSwKIAkuYXRvbWljX2Rlc3Ryb3lfc3RhdGUgPSBp bnRlbF9jcnRjX2Rlc3Ryb3lfc3RhdGUsCiB9OwpAQCAtMTM3ODAsNiArMTM4MDYsMTkgQEAgc3Rh dGljIHZvaWQgc2tsX2luaXRfc2NhbGVycyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3Qg aW50ZWxfY3J0YyAqaW50ZWxfY3IKIAlzY2FsZXJfc3RhdGUtPnNjYWxlcl9pZCA9IC0xOwogfQog CitzdGF0aWMgdm9pZCBpbnRlbF9jcmVhdGVfYmFja2dyb3VuZF9jb2xvcl9wcm9wZXJ0eShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAorCQkJCQkJICAgc3RydWN0IGludGVsX2NydGMgKmNydGMpCit7 CisJaWYgKCFkZXYtPm1vZGVfY29uZmlnLnByb3BfYmFja2dyb3VuZF9jb2xvcikKKwkJZGV2LT5t b2RlX2NvbmZpZy5wcm9wX2JhY2tncm91bmRfY29sb3IgPQorCQkJZHJtX21vZGVfY3JlYXRlX2Jh Y2tncm91bmRfY29sb3JfcHJvcGVydHkoZGV2KTsKKwlpZiAoIWRldi0+bW9kZV9jb25maWcucHJv cF9iYWNrZ3JvdW5kX2NvbG9yKQorCQlyZXR1cm47CisKKwlkcm1fb2JqZWN0X2F0dGFjaF9wcm9w ZXJ0eSgmY3J0Yy0+YmFzZS5iYXNlLAorCQkJCSAgIGRldi0+bW9kZV9jb25maWcucHJvcF9iYWNr Z3JvdW5kX2NvbG9yLCAwKTsKK30KKwogc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19pbml0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIGludCBwaXBlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC0xMzg1NSw2ICsxMzg5NCwxMCBAQCBz dGF0aWMgdm9pZCBpbnRlbF9jcnRjX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBp cGUpCiAJZHJtX2NydGNfaGVscGVyX2FkZCgmaW50ZWxfY3J0Yy0+YmFzZSwgJmludGVsX2hlbHBl cl9mdW5jcyk7CiAKIAlXQVJOX09OKGRybV9jcnRjX2luZGV4KCZpbnRlbF9jcnRjLT5iYXNlKSAh PSBpbnRlbF9jcnRjLT5waXBlKTsKKworCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KQor CQlpbnRlbF9jcmVhdGVfYmFja2dyb3VuZF9jb2xvcl9wcm9wZXJ0eShkZXYsIGludGVsX2NydGMp OworCiAJcmV0dXJuOwogCiBmYWlsOgotLSAKMi4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==