From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Weinehall Subject: [PATCH 12/12] drm/i915: INTEL_GEN() fixes, part 6 Date: Mon, 29 Aug 2016 13:31:52 +0300 Message-ID: <20160829103152.31282-13-david.weinehall@linux.intel.com> References: <20160829103152.31282-1-david.weinehall@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 67F836E51D for ; Mon, 29 Aug 2016 10:32:21 +0000 (UTC) In-Reply-To: <20160829103152.31282-1-david.weinehall@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 Cc: --dry-run@freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RmluYWwgYmF0Y2ggb2YgSU5URUxfSU5GTygpLT5nZW4gdG8gSU5URUxfR0VOKCkuCgpTaWduZWQt b2ZmLWJ5OiBEYXZpZCBXZWluZWhhbGwgPGRhdmlkLndlaW5laGFsbEBsaW51eC5pbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICB8ICAyICstCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgIHwgMjEgKysrKysrKysrKystLS0tLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIHwgIDQgKystLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyAgICAgICB8ICA4ICsrKystLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgIHwgIDIgKy0KIDUgZmlsZXMgY2hhbmdlZCwg MTkgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMK aW5kZXggY2VmM2MzNGIxNWFiLi5jNWZiMTJjZGY0MzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu YwpAQCAtNTc1LDcgKzU3NSw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2VtX2Zpbmkoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAkgKiBtYWNoaW5lcyBpcyBhIGdvb2QgaWRlYSwgd2UgZG9uJ3QgLSBq dXN0IGluIGNhc2UgaXQgbGVhdmVzIHRoZQogCSAqIG1hY2hpbmUgaW4gYW4gdW51c2FibGUgY29u ZGl0aW9uLgogCSAqLwotCWlmIChIQVNfSFdfQ09OVEVYVFMoZGV2KSkgeworCWlmIChIQVNfSFdf Q09OVEVYVFMoZGV2X3ByaXYpKSB7CiAJCWludCByZXNldCA9IGludGVsX2dwdV9yZXNldChkZXZf cHJpdiwgQUxMX0VOR0lORVMpOwogCQlXQVJOX09OKHJlc2V0ICYmIHJlc2V0ICE9IC1FTk9ERVYp OwogCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGZmOGRmMjk5NWRmOC4uN2MwMWIxYzNh ZjU0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI3MzUsOCArMjczNSw4IEBAIHN0cnVj dCBkcm1faTkxNV9jbWRfdGFibGUgewogCQkJCSBIQVNfRURSQU0oZGV2KSkKICNkZWZpbmUgSTkx NV9ORUVEX0dGWF9IV1MoZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5uZWVkX2dmeF9od3MpCiAKLSNk ZWZpbmUgSEFTX0hXX0NPTlRFWFRTKGRldikJKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDYpCi0j ZGVmaW5lIEhBU19MT0dJQ0FMX1JJTkdfQ09OVEVYVFMoZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5n ZW4gPj0gOCkKKyNkZWZpbmUgSEFTX0hXX0NPTlRFWFRTKGRldl9wcml2KQkoSU5URUxfR0VOKGRl dl9wcml2KSA+PSA2KQorI2RlZmluZSBIQVNfTE9HSUNBTF9SSU5HX0NPTlRFWFRTKGRldl9wcml2 KQkoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KQogI2RlZmluZSBVU0VTX1BQR1RUKGRldikJCShp OTE1LmVuYWJsZV9wcGd0dCkKICNkZWZpbmUgVVNFU19GVUxMX1BQR1RUKGRldikJKGk5MTUuZW5h YmxlX3BwZ3R0ID49IDIpCiAjZGVmaW5lIFVTRVNfRlVMTF80OEJJVF9QUEdUVChkZXYpCShpOTE1 LmVuYWJsZV9wcGd0dCA9PSAzKQpAQCAtMjc1OSw4ICsyNzU5LDggQEAgc3RydWN0IGRybV9pOTE1 X2NtZF90YWJsZSB7CiAgKiBsZWdhY3kgaXJxIG5vLiBpcyBzaGFyZWQgd2l0aCBhbm90aGVyIGRl dmljZS4gVGhlIGtlcm5lbCB0aGVuIGRpc2FibGVzIHRoYXQKICAqIGludGVycnVwdCBzb3VyY2Ug YW5kIHNvIHByZXZlbnRzIHRoZSBvdGhlciBkZXZpY2UgZnJvbSB3b3JraW5nIHByb3Blcmx5Lgog ICovCi0jZGVmaW5lIEhBU19BVVhfSVJRKGRldikgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDUp Ci0jZGVmaW5lIEhBU19HTUJVU19JUlEoZGV2KSAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNSkK KyNkZWZpbmUgSEFTX0FVWF9JUlEoZGV2X3ByaXYpCShJTlRFTF9HRU4oZGV2X3ByaXYpID49IDUp CisjZGVmaW5lIEhBU19HTUJVU19JUlEoZGV2X3ByaXYpCShJTlRFTF9HRU4oZGV2X3ByaXYpID49 IDUpCiAKIC8qIFdpdGggdGhlIDk0NSBhbmQgbGF0ZXIsIFkgdGlsaW5nIGdvdCBhZGp1c3RlZCBz byB0aGF0IGl0IHdhcyAzMiAxMjgtYnl0ZQogICogcm93cywgd2hpY2ggY2hhbmdlZCB0aGUgYWxp Z25tZW50IHJlcXVpcmVtZW50cyBhbmQgZmVuY2UgcHJvZ3JhbW1pbmcuCkBAIC0yNzcwLDE0ICsy NzcwLDE1IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogI2RlZmluZSBTVVBQT1JUU19U VihkZXYpCQkoSU5URUxfSU5GTyhkZXYpLT5zdXBwb3J0c190dikKICNkZWZpbmUgSTkxNV9IQVNf SE9UUExVRyhkZXYpCQkgKElOVEVMX0lORk8oZGV2KS0+aGFzX2hvdHBsdWcpCiAKLSNkZWZpbmUg SEFTX0ZXX0JMQyhkZXYpIChJTlRFTF9JTkZPKGRldiktPmdlbiA+IDIpCisjZGVmaW5lIEhBU19G V19CTEMoZGV2X3ByaXYpCShJTlRFTF9HRU4oZGV2X3ByaXYpID4gMikKICNkZWZpbmUgSEFTX1BJ UEVfQ1hTUihkZXYpIChJTlRFTF9JTkZPKGRldiktPmhhc19waXBlX2N4c3IpCiAjZGVmaW5lIEhB U19GQkMoZGV2KSAoSU5URUxfSU5GTyhkZXYpLT5oYXNfZmJjKQogCiAjZGVmaW5lIEhBU19JUFMo ZGV2KQkJKElTX0hTV19VTFQoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkKIAotI2RlZmluZSBI QVNfRFBfTVNUKGRldikJCShJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikgfHwg XAotCQkJCSBJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KQorI2RlZmluZSBIQVNfRFBfTVNUKGRl dl9wcml2KQkoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgXAorCQkJCSBJU19CUk9BRFdFTEwoZGV2 X3ByaXYpIHx8IFwKKwkJCQkgSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KQogCiAjZGVmaW5lIEhB U19EREkoZGV2KQkJKElOVEVMX0lORk8oZGV2KS0+aGFzX2RkaSkKICNkZWZpbmUgSEFTX0ZQR0Ff REJHX1VOQ0xBSU1FRChkZXYpCShJTlRFTF9JTkZPKGRldiktPmhhc19mcGdhX2RiZykKQEAgLTI3 ODgsMTAgKzI3ODksMTAgQEAgc3RydWN0IGRybV9pOTE1X2NtZF90YWJsZSB7CiAJCQkJIElTX0JS T0FEV0VMTChkZXYpIHx8IElTX1ZBTExFWVZJRVcoZGV2KSB8fCBcCiAJCQkJIElTX0NIRVJSWVZJ RVcoZGV2KSB8fCBJU19TS1lMQUtFKGRldikgfHwgXAogCQkJCSBJU19LQUJZTEFLRShkZXYpIHx8 IElTX0JST1hUT04oZGV2KSkKLSNkZWZpbmUgSEFTX1JDNihkZXYpCQkoSU5URUxfSU5GTyhkZXYp LT5nZW4gPj0gNikKLSNkZWZpbmUgSEFTX1JDNnAoZGV2KQkJKElTX0dFTjYoZGV2KSB8fCBJU19J VllCUklER0UoZGV2KSkKKyNkZWZpbmUgSEFTX1JDNihkZXZfcHJpdikJKElOVEVMX0dFTihkZXZf cHJpdikgPj0gNikKKyNkZWZpbmUgSEFTX1JDNnAoZGV2X3ByaXYpCShJU19HRU42KGRldl9wcml2 KSB8fCBJU19JVllCUklER0UoZGV2X3ByaXYpKQogCi0jZGVmaW5lIEhBU19DU1IoZGV2KQkoSVNf R0VOOShkZXYpKQorI2RlZmluZSBIQVNfQ1NSKGRldl9wcml2KQkoSVNfR0VOOShkZXZfcHJpdikp CiAKIC8qCiAgKiBGb3Igbm93LCBhbnl0aGluZyB3aXRoIGEgR3VDIHJlcXVpcmVzIHVDb2RlIGxv YWRpbmcsIGFuZCB0aGVuIHN1cHBvcnRzCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3Iu YwppbmRleCAzYzhhOGQ2MjQ4YzYuLjI4MTQ4MzkyMThhOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dwdV9lcnJvci5jCkBAIC0zNzUsNyArMzc1LDcgQEAgaW50IGk5MTVfZXJyb3Jfc3RhdGVf dG9fc3RyKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKm0sCiAJCSAgIHBkZXYtPnN1 YnN5c3RlbV9kZXZpY2UpOwogCWVycl9wcmludGYobSwgIklPTU1VIGVuYWJsZWQ/OiAlZFxuIiwg ZXJyb3ItPmlvbW11KTsKIAotCWlmIChIQVNfQ1NSKGRldikpIHsKKwlpZiAoSEFTX0NTUihkZXZf cHJpdikpIHsKIAkJc3RydWN0IGludGVsX2NzciAqY3NyID0gJmRldl9wcml2LT5jc3I7CiAKIAkJ ZXJyX3ByaW50ZihtLCAiRE1DIGxvYWRlZDogJXNcbiIsCkBAIC0xMzQwLDcgKzEzNDAsNyBAQCBz dGF0aWMgdm9pZCBpOTE1X2NhcHR1cmVfcmVnX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAl9CiAKIAkvKiA0OiBFdmVyeXRoaW5nIGVsc2UgKi8KLQlpZiAoSEFTX0hX X0NPTlRFWFRTKGRldikpCisJaWYgKEhBU19IV19DT05URVhUUyhkZXZfcHJpdikpCiAJCWVycm9y LT5jY2lkID0gSTkxNV9SRUFEKENDSUQpOwogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0g OCkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggMmUyMTI4Y2RlZmVjLi45ODFmYmIxNDlm ZGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtODQyLDE0ICs4NDIsMTQgQEAgaW50ZWxf ZHBfYXV4X2NoKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJCXVpbnQ4X3QgKnJlY3YsIGlu dCByZWN2X3NpemUpCiB7CiAJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3Bv cnQgPSBkcF90b19kaWdfcG9ydChpbnRlbF9kcCk7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGludGVsX2RpZ19wb3J0LT5iYXNlLmJhc2UuZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPQorCQkJCQl0b19pOTE1KGludGVsX2RpZ19wb3J0LT5iYXNlLmJhc2UuZGV2KTsKIAlp OTE1X3JlZ190IGNoX2N0bCA9IGludGVsX2RwLT5hdXhfY2hfY3RsX3JlZzsKIAl1aW50MzJfdCBh dXhfY2xvY2tfZGl2aWRlcjsKIAlpbnQgaSwgcmV0LCByZWN2X2J5dGVzOwogCXVpbnQzMl90IHN0 YXR1czsKIAlpbnQgdHJ5LCBjbG9jayA9IDA7Ci0JYm9vbCBoYXNfYXV4X2lycSA9IEhBU19BVVhf SVJRKGRldik7CisJYm9vbCBoYXNfYXV4X2lycSA9IEhBU19BVVhfSVJRKGRldl9wcml2KTsKIAli b29sIHZkZDsKIAogCXBwc19sb2NrKGludGVsX2RwKTsKQEAgLTU2NTEsNyArNTY1MSw3IEBAIGlu dGVsX2RwX2luaXRfY29ubmVjdG9yKHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2Rp Z19wb3J0LAogCX0KIAogCS8qIGluaXQgTVNUIG9uIHBvcnRzIHRoYXQgY2FuIHN1cHBvcnQgaXQg Ki8KLQlpZiAoSEFTX0RQX01TVChkZXYpICYmICFpc19lZHAoaW50ZWxfZHApICYmCisJaWYgKEhB U19EUF9NU1QoZGV2X3ByaXYpICYmICFpc19lZHAoaW50ZWxfZHApICYmCiAJICAgIChwb3J0ID09 IFBPUlRfQiB8fCBwb3J0ID09IFBPUlRfQyB8fCBwb3J0ID09IFBPUlRfRCkpCiAJCWludGVsX2Rw X21zdF9lbmNvZGVyX2luaXQoaW50ZWxfZGlnX3BvcnQsCiAJCQkJCSAgaW50ZWxfY29ubmVjdG9y LT5iYXNlLmJhc2UuaWQpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggM2VlYzE4N2Y1Njk3 Li4yOGFhNmVkYTU2MDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMTU5OCw3ICsxNTk4 LDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICp1bnVzZWRf Y3J0YykKIAlpbnRlbF9zZXRfbWVtb3J5X2N4c3IoZGV2X3ByaXYsIGZhbHNlKTsKIAogCS8qIENh bGMgc3IgZW50cmllcyBmb3Igb25lIHBsYW5lIGNvbmZpZ3MgKi8KLQlpZiAoSEFTX0ZXX0JMQyhk ZXYpICYmIGVuYWJsZWQpIHsKKwlpZiAoSEFTX0ZXX0JMQyhkZXZfcHJpdikgJiYgZW5hYmxlZCkg ewogCQkvKiBzZWxmLXJlZnJlc2ggaGFzIG11Y2ggaGlnaGVyIGxhdGVuY3kgKi8KIAkJc3RhdGlj IGNvbnN0IGludCBzcl9sYXRlbmN5X25zID0gNjAwMDsKIAkJY29uc3Qgc3RydWN0IGRybV9kaXNw bGF5X21vZGUgKmFkanVzdGVkX21vZGUgPSAmdG9faW50ZWxfY3J0YyhlbmFibGVkKS0+Y29uZmln LT5iYXNlLmFkanVzdGVkX21vZGU7Ci0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==