From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 5/5] drm/i915: Consolidate gen8_emit_pipe_control Date: Thu, 16 Feb 2017 12:23:25 +0000 Message-ID: <20170216122325.31391-6-tvrtko.ursulin@linux.intel.com> References: <20170216122325.31391-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 68EC26EAF4 for ; Thu, 16 Feb 2017 12:23:48 +0000 (UTC) Received: by mail-wr0-x244.google.com with SMTP id i10so1862695wrb.0 for ; Thu, 16 Feb 2017 04:23:48 -0800 (PST) In-Reply-To: <20170216122325.31391-1-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldlIGhhdmUg YSBmZXcgb3BlbiBjb2RlZCBpbnN0YW5jZXMgaW4gdGhlIGV4ZWNsaXN0cyBjb2RlIGFuZCBhbgph bG1vc3Qgc3VpdGFibGUgaGVscGVyIGluIGludGVsX3JpbmdidWYuYwoKV2UgY2FuIGNvbnNvbGlk YXRlIHRvIGEgc2luZ2xlIGhlbHBlciBpZiB3ZSBjaGFuZ2UgdGhlIGV4aXN0aW5nCmhlbHBlciB0 byBlbWl0IGRpcmVjdGx5IHRvIHJpbmcgYnVmZmVyIG1lbW9yeSBhbmQgbW92ZSB0aGUgc3BhY2UK cmVzZXJ2YXRpb24gb3V0c2lkZSBpdC4KCnYyOiBEcm9wIG1lbWNweSBmb3IgbWVtc2V0LiAoQ2hy aXMgV2lsc29uKQoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGlu QGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29u LmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8IDc3 ICsrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5jIHwgNDUgKysrKysrKy0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgMTEgKysrKysKIDMgZmlsZXMgY2hhbmdlZCwg NTIgaW5zZXJ0aW9ucygrKSwgODEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YwppbmRleCBlYzM5ZTNlNDIyY2EuLjIzMWIwMTFlZTFmMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmMKQEAgLTkxOCwxMiArOTE4LDEwIEBAIGdlbjhfZW1pdF9mbHVzaF9jb2hlcmVudGwzX3dh KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwgdTMyICpiYXRjaCkKIAkqYmF0Y2grKyA9 IGk5MTVfbW1pb19yZWdfb2Zmc2V0KEdFTjhfTDNTUUNSRUc0KTsKIAkqYmF0Y2grKyA9IDB4NDA0 MDAwMDAgfCBHRU44X0xRU0NfRkxVU0hfQ09IRVJFTlRfTElORVM7CiAKLQkqYmF0Y2grKyA9IEdG WF9PUF9QSVBFX0NPTlRST0woNik7Ci0JKmJhdGNoKysgPSBQSVBFX0NPTlRST0xfQ1NfU1RBTEwg fCBQSVBFX0NPTlRST0xfRENfRkxVU0hfRU5BQkxFOwotCSpiYXRjaCsrID0gMDsKLQkqYmF0Y2gr KyA9IDA7Ci0JKmJhdGNoKysgPSAwOwotCSpiYXRjaCsrID0gMDsKKwliYXRjaCA9IGdlbjhfZW1p dF9waXBlX2NvbnRyb2woYmF0Y2gsCisJCQkJICAgICAgIFBJUEVfQ09OVFJPTF9DU19TVEFMTCB8 CisJCQkJICAgICAgIFBJUEVfQ09OVFJPTF9EQ19GTFVTSF9FTkFCTEUsCisJCQkJICAgICAgIDAp OwogCiAJKmJhdGNoKysgPSBNSV9MT0FEX1JFR0lTVEVSX01FTV9HRU44IHwgTUlfU1JNX0xSTV9H TE9CQUxfR1RUOwogCSpiYXRjaCsrID0gaTkxNV9tbWlvX3JlZ19vZmZzZXQoR0VOOF9MM1NRQ1JF RzQpOwpAQCAtOTU3LDE1ICs5NTUsMTUgQEAgc3RhdGljIHUzMiAqZ2VuOF9pbml0X2luZGlyZWN0 Y3R4X2JiKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwgdTMyICpiYXRjaCkKIAlpZiAo SVNfQlJPQURXRUxMKGVuZ2luZS0+aTkxNSkpCiAJCWJhdGNoID0gZ2VuOF9lbWl0X2ZsdXNoX2Nv aGVyZW50bDNfd2EoZW5naW5lLCBiYXRjaCk7CiAKLQkqYmF0Y2grKyA9IEdGWF9PUF9QSVBFX0NP TlRST0woNik7Ci0JKmJhdGNoKysgPSBQSVBFX0NPTlRST0xfRkxVU0hfTDMgfCBQSVBFX0NPTlRS T0xfR0xPQkFMX0dUVF9JVkIgfAotCQkgICBQSVBFX0NPTlRST0xfQ1NfU1RBTEwgfCBQSVBFX0NP TlRST0xfUVdfV1JJVEU7CiAJLyogV2FDbGVhclNsbVNwYWNlQXRDb250ZXh0U3dpdGNoOmJkdyxj aHYgKi8KIAkvKiBBY3R1YWwgc2NyYXRjaCBsb2NhdGlvbiBpcyBhdCAxMjggYnl0ZXMgb2Zmc2V0 ICovCi0JKmJhdGNoKysgPSBpOTE1X2dndHRfb2Zmc2V0KGVuZ2luZS0+c2NyYXRjaCkgKyAyICog Q0FDSEVMSU5FX0JZVEVTOwotCSpiYXRjaCsrID0gMDsKLQkqYmF0Y2grKyA9IDA7Ci0JKmJhdGNo KysgPSAwOworCWJhdGNoID0gZ2VuOF9lbWl0X3BpcGVfY29udHJvbChiYXRjaCwKKwkJCQkgICAg ICAgUElQRV9DT05UUk9MX0ZMVVNIX0wzIHwKKwkJCQkgICAgICAgUElQRV9DT05UUk9MX0dMT0JB TF9HVFRfSVZCIHwKKwkJCQkgICAgICAgUElQRV9DT05UUk9MX0NTX1NUQUxMIHwKKwkJCQkgICAg ICAgUElQRV9DT05UUk9MX1FXX1dSSVRFLAorCQkJCSAgICAgICBpOTE1X2dndHRfb2Zmc2V0KGVu Z2luZS0+c2NyYXRjaCkgKworCQkJCSAgICAgICAyICogQ0FDSEVMSU5FX0JZVEVTKTsKIAogCS8q IFBhZCB0byBlbmQgb2YgY2FjaGVsaW5lICovCiAJd2hpbGUgKCh1bnNpZ25lZCBsb25nKWJhdGNo ICUgQ0FDSEVMSU5FX0JZVEVTKQpAQCAtMTAxMywxNCArMTAxMSwxMyBAQCBzdGF0aWMgdTMyICpn ZW45X2luaXRfaW5kaXJlY3RjdHhfYmIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCB1 MzIgKmJhdGNoKQogCS8qIFdhQ2xlYXJTbG1TcGFjZUF0Q29udGV4dFN3aXRjaDprYmwgKi8KIAkv KiBBY3R1YWwgc2NyYXRjaCBsb2NhdGlvbiBpcyBhdCAxMjggYnl0ZXMgb2Zmc2V0ICovCiAJaWYg KElTX0tCTF9SRVZJRChlbmdpbmUtPmk5MTUsIDAsIEtCTF9SRVZJRF9BMCkpIHsKLQkJKmJhdGNo KysgPSBHRlhfT1BfUElQRV9DT05UUk9MKDYpOwotCQkqYmF0Y2grKyA9IFBJUEVfQ09OVFJPTF9G TFVTSF9MMyB8IFBJUEVfQ09OVFJPTF9HTE9CQUxfR1RUX0lWQiB8Ci0JCQkgICBQSVBFX0NPTlRS T0xfQ1NfU1RBTEwgfCBQSVBFX0NPTlRST0xfUVdfV1JJVEU7Ci0JCSpiYXRjaCsrID0gaTkxNV9n Z3R0X29mZnNldChlbmdpbmUtPnNjcmF0Y2gpICsKLQkJCSAgIDIgKiBDQUNIRUxJTkVfQllURVM7 Ci0JCSpiYXRjaCsrID0gMDsKLQkJKmJhdGNoKysgPSAwOwotCQkqYmF0Y2grKyA9IDA7CisJCWJh dGNoID0gZ2VuOF9lbWl0X3BpcGVfY29udHJvbChiYXRjaCwKKwkJCQkJICAgICAgIFBJUEVfQ09O VFJPTF9GTFVTSF9MMyB8CisJCQkJCSAgICAgICBQSVBFX0NPTlRST0xfR0xPQkFMX0dUVF9JVkIg fAorCQkJCQkgICAgICAgUElQRV9DT05UUk9MX0NTX1NUQUxMIHwKKwkJCQkJICAgICAgIFBJUEVf Q09OVFJPTF9RV19XUklURSwKKwkJCQkJICAgICAgIGk5MTVfZ2d0dF9vZmZzZXQoZW5naW5lLT5z Y3JhdGNoKQorCQkJCQkgICAgICAgKyAyICogQ0FDSEVMSU5FX0JZVEVTKTsKIAl9CiAKIAkvKiBX YU1lZGlhUG9vbFN0YXRlQ21kSW5XQUJCOmJ4dCxnbGsgKi8KQEAgLTE0NTAsMzkgKzE0NDcsMTcg QEAgc3RhdGljIGludCBnZW44X2VtaXRfZmx1c2hfcmVuZGVyKHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxdWVzdCwKIAlpZiAoSVNfRVJSKGNzKSkKIAkJcmV0dXJuIFBUUl9FUlIoY3Mp OwogCi0JaWYgKHZmX2ZsdXNoX3dhKSB7Ci0JCSpjcysrID0gR0ZYX09QX1BJUEVfQ09OVFJPTCg2 KTsKLQkJKmNzKysgPSAwOwotCQkqY3MrKyA9IDA7Ci0JCSpjcysrID0gMDsKLQkJKmNzKysgPSAw OwotCQkqY3MrKyA9IDA7Ci0JfQorCWlmICh2Zl9mbHVzaF93YSkKKwkJY3MgPSBnZW44X2VtaXRf cGlwZV9jb250cm9sKGNzLCAwLCAwKTsKIAotCWlmIChkY19mbHVzaF93YSkgewotCQkqY3MrKyA9 IEdGWF9PUF9QSVBFX0NPTlRST0woNik7Ci0JCSpjcysrID0gUElQRV9DT05UUk9MX0RDX0ZMVVNI X0VOQUJMRTsKLQkJKmNzKysgPSAwOwotCQkqY3MrKyA9IDA7Ci0JCSpjcysrID0gMDsKLQkJKmNz KysgPSAwOwotCX0KKwlpZiAoZGNfZmx1c2hfd2EpCisJCWNzID0gZ2VuOF9lbWl0X3BpcGVfY29u dHJvbChjcywgUElQRV9DT05UUk9MX0RDX0ZMVVNIX0VOQUJMRSwKKwkJCQkJICAgIDApOwogCi0J KmNzKysgPSBHRlhfT1BfUElQRV9DT05UUk9MKDYpOwotCSpjcysrID0gZmxhZ3M7Ci0JKmNzKysg PSBzY3JhdGNoX2FkZHI7Ci0JKmNzKysgPSAwOwotCSpjcysrID0gMDsKLQkqY3MrKyA9IDA7CisJ Y3MgPSBnZW44X2VtaXRfcGlwZV9jb250cm9sKGNzLCBmbGFncywgc2NyYXRjaF9hZGRyKTsKIAot CWlmIChkY19mbHVzaF93YSkgewotCQkqY3MrKyA9IEdGWF9PUF9QSVBFX0NPTlRST0woNik7Ci0J CSpjcysrID0gUElQRV9DT05UUk9MX0NTX1NUQUxMOwotCQkqY3MrKyA9IDA7Ci0JCSpjcysrID0g MDsKLQkJKmNzKysgPSAwOwotCQkqY3MrKyA9IDA7Ci0JfQorCWlmIChkY19mbHVzaF93YSkKKwkJ Y3MgPSBnZW44X2VtaXRfcGlwZV9jb250cm9sKGNzLCBQSVBFX0NPTlRST0xfQ1NfU1RBTEwsIDAp OwogCiAJaW50ZWxfcmluZ19hZHZhbmNlKHJlcXVlc3QsIGNzKTsKIApkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDYyOWZlNjU4NGU2MS4uZDU2ZjM4NDkzOGY3IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0zMzQsMzUgKzMzNCwx NiBAQCBnZW43X3JlbmRlcl9yaW5nX2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxLCB1MzIgbW9kZSkKIH0KIAogc3RhdGljIGludAotZ2VuOF9lbWl0X3BpcGVfY29udHJvbChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKLQkJICAgICAgIHUzMiBmbGFncywgdTMy IHNjcmF0Y2hfYWRkcikKK2dlbjhfcmVuZGVyX3JpbmdfZmx1c2goc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEsIHUzMiBtb2RlKQogeworCXUzMiBmbGFnczsKIAl1MzIgKmNzOwogCi0J Y3MgPSBpbnRlbF9yaW5nX2JlZ2luKHJlcSwgNik7CisJY3MgPSBpbnRlbF9yaW5nX2JlZ2luKHJl cSwgbW9kZSAmIEVNSVRfSU5WQUxJREFURSA/IDEyIDogNik7CiAJaWYgKElTX0VSUihjcykpCiAJ CXJldHVybiBQVFJfRVJSKGNzKTsKIAotCSpjcysrID0gR0ZYX09QX1BJUEVfQ09OVFJPTCg2KTsK LQkqY3MrKyA9IGZsYWdzOwotCSpjcysrID0gc2NyYXRjaF9hZGRyOwotCSpjcysrID0gMDsKLQkq Y3MrKyA9IDA7Ci0JKmNzKysgPSAwOwotCWludGVsX3JpbmdfYWR2YW5jZShyZXEsIGNzKTsKLQot CXJldHVybiAwOwotfQotCi1zdGF0aWMgaW50Ci1nZW44X3JlbmRlcl9yaW5nX2ZsdXNoKHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLCB1MzIgbW9kZSkKLXsKLQl1MzIgc2NyYXRjaF9h ZGRyID0KLQkJaTkxNV9nZ3R0X29mZnNldChyZXEtPmVuZ2luZS0+c2NyYXRjaCkgKyAyICogQ0FD SEVMSU5FX0JZVEVTOwotCXUzMiBmbGFncyA9IDA7Ci0JaW50IHJldDsKLQotCWZsYWdzIHw9IFBJ UEVfQ09OVFJPTF9DU19TVEFMTDsKKwlmbGFncyA9IFBJUEVfQ09OVFJPTF9DU19TVEFMTDsKIAog CWlmIChtb2RlICYgRU1JVF9GTFVTSCkgewogCQlmbGFncyB8PSBQSVBFX0NPTlRST0xfUkVOREVS X1RBUkdFVF9DQUNIRV9GTFVTSDsKQEAgLTM4MSwxNSArMzYyLDE5IEBAIGdlbjhfcmVuZGVyX3Jp bmdfZmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsIHUzMiBtb2RlKQogCQlm bGFncyB8PSBQSVBFX0NPTlRST0xfR0xPQkFMX0dUVF9JVkI7CiAKIAkJLyogV2FDc1N0YWxsQmVm b3JlU3RhdGVDYWNoZUludmFsaWRhdGU6YmR3LGNodiAqLwotCQlyZXQgPSBnZW44X2VtaXRfcGlw ZV9jb250cm9sKHJlcSwKLQkJCQkJICAgICBQSVBFX0NPTlRST0xfQ1NfU1RBTEwgfAotCQkJCQkg ICAgIFBJUEVfQ09OVFJPTF9TVEFMTF9BVF9TQ09SRUJPQVJELAotCQkJCQkgICAgIDApOwotCQlp ZiAocmV0KQotCQkJcmV0dXJuIHJldDsKKwkJY3MgPSBnZW44X2VtaXRfcGlwZV9jb250cm9sKGNz LAorCQkJCQkgICAgUElQRV9DT05UUk9MX0NTX1NUQUxMIHwKKwkJCQkJICAgIFBJUEVfQ09OVFJP TF9TVEFMTF9BVF9TQ09SRUJPQVJELAorCQkJCQkgICAgMCk7CiAJfQogCi0JcmV0dXJuIGdlbjhf ZW1pdF9waXBlX2NvbnRyb2wocmVxLCBmbGFncywgc2NyYXRjaF9hZGRyKTsKKwljcyA9IGdlbjhf ZW1pdF9waXBlX2NvbnRyb2woY3MsIGZsYWdzLAorCQkJCSAgICBpOTE1X2dndHRfb2Zmc2V0KHJl cS0+ZW5naW5lLT5zY3JhdGNoKSArCisJCQkJICAgIDIgKiBDQUNIRUxJTkVfQllURVMpOworCisJ aW50ZWxfcmluZ19hZHZhbmNlKHJlcSwgY3MpOworCisJcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyB2 b2lkIHJpbmdfc2V0dXBfcGh5c19zdGF0dXNfcGFnZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggMWQ5ZmQ0 ZTQyNjIyLi40Y2E1MzA4ZTEyYmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmgKQEAgLTYzMSw0ICs2MzEsMTUgQEAgdm9pZCBpbnRlbF9lbmdpbmVfcmVzZXRfYnJlYWRj cnVtYnMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIHZvaWQgaW50ZWxfZW5naW5l X2ZpbmlfYnJlYWRjcnVtYnMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIHVuc2ln bmVkIGludCBpbnRlbF9icmVhZGNydW1ic19idXN5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpp OTE1KTsKIAorc3RhdGljIGlubGluZSB1MzIgKmdlbjhfZW1pdF9waXBlX2NvbnRyb2wodTMyICpi YXRjaCwgdTMyIGZsYWdzLCB1MzIgb2Zmc2V0KQoreworCW1lbXNldChiYXRjaCwgMCwgNiAqIHNp emVvZih1MzIpKTsKKworCWJhdGNoWzBdID0gR0ZYX09QX1BJUEVfQ09OVFJPTCg2KTsKKwliYXRj aFsxXSA9IGZsYWdzOworCWJhdGNoWzJdID0gb2Zmc2V0OworCisJcmV0dXJuIGJhdGNoICsgNjsK K30KKwogI2VuZGlmIC8qIF9JTlRFTF9SSU5HQlVGRkVSX0hfICovCi0tIAoyLjkuMwoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==