From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH 2/3] drm/i915: prefer INTEL_GEN(dev_priv) to INTEL_INFO(dev)->gen (part 2) Date: Mon, 12 Sep 2016 20:20:02 +0100 Message-ID: <1473708003-17327-3-git-send-email-david.s.gordon@intel.com> References: <1473708003-17327-1-git-send-email-david.s.gordon@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 2BC886E570 for ; Mon, 12 Sep 2016 19:20:17 +0000 (UTC) In-Reply-To: <1473708003-17327-1-git-send-email-david.s.gordon@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 TW9yZSBDb2NjaW5lbGxlcnksIGFzIGRlc2NyaWJlZCBpbiBwYXJ0IDEgb2YgdGhpcyBzZXJpZXMK CldoZXJldmVyIHdlIGZpbmQgIklOVEVMX0lORk8oZGV2KS0+Z2VuIiwgYW5kIGhhdmUgYSBzdWl0 YWJsZQoiZGV2X3ByaXYiIGluIHNjb3BlLCByZXBsYWNlIGl0IHdpdGggIklOVEVMX0dFTihkZXZf cHJpdikiLAp3aGljaCBpcyB0aGUgcHJlZmVycmVkIHdhc3kgdG8gYWNjZXNzIHRoaXMgZGV2aWNl IHByb3BlcnR5LgoKVGhpcyBwYXRjaCBjb3ZlcnMgdGhlIGZpbGVzIHRoYXQgcmVxdWlyZWQgYSBs aXR0bGUgbWFudWFsIGZpeHVwCmFmdGVyIHRoZSBDb2NjaSBzY3JpcHQsIGZvciBleGFtcGxlIHdo ZXJlIHRoZSBhdXRvLXJlcGxhY2VtZW50CmhhZCBsZWZ0IHNvbWUgb3RoZXIgbmVhcmJ5IG1hY3Jv IGNhbGwgc3RpbGwgdXNpbmcgKGRldiksIGFzIGluCgoiaWYgKElOVEVMX0lORk8oZGV2KS0+Z2Vu IDwgNyB8fCBJU19DSEVSUllWSUVXKGRldikpIgphdXRvdHJhbnNmb3JtZWQgdG8KImlmIChJTlRF TF9HRU4oZGV2X3ByaXYpIDwgNyB8fCBJU19DSEVSUllWSUVXKGRldikpIgphbmQgdGhlbiBtYW51 YWxseSB0bwoiaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA3IHx8IElTX0NIRVJSWVZJRVcoZGV2 X3ByaXYpKSIKCkFsc28gaW4gYSBmZXcgY2FzZXMgd2UgY2FuIHJlbW92ZSBvciBtb3ZlIGEgbG9j YWwgdmFyaWFibGUuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25A aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2ZlbmNlLmMgIHwg IDkgKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYyB8ICA2 ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zdXNwZW5kLmMgICAgfCAxMiArKysr KystLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZmVuY2UuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2ZlbmNlLmMKaW5kZXggOGRmMWZhNy4uMmNm NThkMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZmVuY2UuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9mZW5jZS5jCkBAIC02MCwxMSArNjAs MTIgQEAKIHN0YXRpYyB2b2lkIGk5NjVfd3JpdGVfZmVuY2VfcmVnKHN0cnVjdCBkcm1faTkxNV9m ZW5jZV9yZWcgKmZlbmNlLAogCQkJCSBzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKIHsKKwlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBmZW5jZS0+aTkxNTsKIAlpOTE1X3JlZ190IGZl bmNlX3JlZ19sbywgZmVuY2VfcmVnX2hpOwogCWludCBmZW5jZV9waXRjaF9zaGlmdDsKIAl1NjQg dmFsOwogCi0JaWYgKElOVEVMX0lORk8oZmVuY2UtPmk5MTUpLT5nZW4gPj0gNikgeworCWlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpID49IDYpIHsKIAkJZmVuY2VfcmVnX2xvID0gRkVOQ0VfUkVHX0dF TjZfTE8oZmVuY2UtPmlkKTsKIAkJZmVuY2VfcmVnX2hpID0gRkVOQ0VfUkVHX0dFTjZfSEkoZmVu Y2UtPmlkKTsKIAkJZmVuY2VfcGl0Y2hfc2hpZnQgPSBHRU42X0ZFTkNFX1BJVENIX1NISUZUOwpA QCAtOTIsOCArOTMsNiBAQCBzdGF0aWMgdm9pZCBpOTY1X3dyaXRlX2ZlbmNlX3JlZyhzdHJ1Y3Qg ZHJtX2k5MTVfZmVuY2VfcmVnICpmZW5jZSwKIAl9CiAKIAlpZiAoIXBpcGVsaW5lZCkgewotCQlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBmZW5jZS0+aTkxNTsKLQogCQkvKiBU byB3L2EgaW5jb2hlcmVuY3kgd2l0aCBub24tYXRvbWljIDY0LWJpdCByZWdpc3RlciB1cGRhdGVz LAogCQkgKiB3ZSBzcGxpdCB0aGUgNjQtYml0IHVwZGF0ZSBpbnRvIHR3byAzMi1iaXQgd3JpdGVz LiBJbiBvcmRlcgogCQkgKiBmb3IgYSBwYXJ0aWFsIGZlbmNlIG5vdCB0byBiZSBldmFsdWF0ZWQg YmV0d2VlbiB3cml0ZXMsIHdlCkBAIC00NDgsNyArNDQ3LDcgQEAgdm9pZCBpOTE1X2dlbV9yZXN0 b3JlX2ZlbmNlcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXVpbnQzMl90IHN3aXp6bGVfeCA9 IEk5MTVfQklUXzZfU1dJWlpMRV9VTktOT1dOOwogCXVpbnQzMl90IHN3aXp6bGVfeSA9IEk5MTVf QklUXzZfU1dJWlpMRV9VTktOT1dOOwogCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDgg fHwgSVNfVkFMTEVZVklFVyhkZXYpKSB7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCB8 fCBJU19WQUxMRVlWSUVXKGRldl9wcml2KSkgewogCQkvKgogCQkgKiBPbiBCRFcrLCBzd2l6emxp bmcgaXMgbm90IHVzZWQuIFdlIGxlYXZlIHRoZSBDUFUgbWVtb3J5CiAJCSAqIGNvbnRyb2xsZXIg aW4gY2hhcmdlIG9mIG9wdGltaXppbmcgbWVtb3J5IGFjY2Vzc2VzIHdpdGhvdXQKQEAgLTQ1OCw3 ICs0NTcsNyBAQCB2b2lkIGk5MTVfZ2VtX3Jlc3RvcmVfZmVuY2VzKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJCSAqLwogCQlzd2l6emxlX3ggPSBJOTE1X0JJVF82X1NXSVpaTEVfTk9ORTsKIAkJ c3dpenpsZV95ID0gSTkxNV9CSVRfNl9TV0laWkxFX05PTkU7Ci0JfSBlbHNlIGlmIChJTlRFTF9J TkZPKGRldiktPmdlbiA+PSA2KSB7CisJfSBlbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49 IDYpIHsKIAkJaWYgKGRldl9wcml2LT5wcmVzZXJ2ZV9iaW9zX3N3aXp6bGUpIHsKIAkJCWlmIChJ OTE1X1JFQUQoRElTUF9BUkJfQ1RMKSAmCiAJCQkgICAgRElTUF9USUxFX1NVUkZBQ0VfU1dJWlpM SU5HKSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCmluZGV4IDU5OTg5ZTgu LjAxOWJiOWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xl bi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCkBAIC0xMDks NyArMTA5LDcgQEAgc3RhdGljIHVuc2lnbmVkIGxvbmcgaTkxNV9zdG9sZW5fdG9fcGh5c2ljYWwo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkgKgogCSAqLwogCWJhc2UgPSAwOwotCWlmIChJTlRF TF9JTkZPKGRldiktPmdlbiA+PSAzKSB7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMykg ewogCQl1MzIgYnNtOwogCiAJCXBjaV9yZWFkX2NvbmZpZ19kd29yZChwZGV2LCBJTlRFTF9CU00s ICZic20pOwpAQCAtMjA0LDcgKzIwNCw3IEBAIHN0YXRpYyB1bnNpZ25lZCBsb25nIGk5MTVfc3Rv bGVuX3RvX3BoeXNpY2FsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCXJldHVybiAwOwogCiAJ LyogbWFrZSBzdXJlIHdlIGRvbid0IGNsb2JiZXIgdGhlIEdUVCBpZiBpdCdzIHdpdGhpbiBzdG9s ZW4gbWVtb3J5ICovCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDw9IDQgJiYgIUlTX0czMyhk ZXYpICYmICFJU19HNFgoZGV2KSkgeworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDw9IDQgJiYg IUlTX0czMyhkZXZfcHJpdikgJiYgIUlTX0c0WChkZXZfcHJpdikpIHsKIAkJc3RydWN0IHsKIAkJ CXUzMiBzdGFydCwgZW5kOwogCQl9IHN0b2xlblsyXSA9IHsKQEAgLTQxNyw3ICs0MTcsNyBAQCBp bnQgaTkxNV9nZW1faW5pdF9zdG9sZW4oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAltdXRleF9p bml0KCZkZXZfcHJpdi0+bW0uc3RvbGVuX2xvY2spOwogCiAjaWZkZWYgQ09ORklHX0lOVEVMX0lP TU1VCi0JaWYgKGludGVsX2lvbW11X2dmeF9tYXBwZWQgJiYgSU5URUxfSU5GTyhkZXYpLT5nZW4g PCA4KSB7CisJaWYgKGludGVsX2lvbW11X2dmeF9tYXBwZWQgJiYgSU5URUxfR0VOKGRldl9wcml2 KSA8IDgpIHsKIAkJRFJNX0lORk8oIkRNQVIgYWN0aXZlLCBkaXNhYmxpbmcgdXNlIG9mIHN0b2xl biBtZW1vcnlcbiIpOwogCQlyZXR1cm4gMDsKIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3N1c3BlbmQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3VzcGVu ZC5jCmluZGV4IGEwYWYxNzAuLmJiMDYyYmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfc3VzcGVuZC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3VzcGVu ZC5jCkBAIC0zNCwxMSArMzQsMTEgQEAgc3RhdGljIHZvaWQgaTkxNV9zYXZlX2Rpc3BsYXkoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGRldik7CiAKIAkvKiBEaXNwbGF5IGFyYml0cmF0aW9uIGNvbnRyb2wgKi8KLQlp ZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPD0gNCkKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8 PSA0KQogCQlkZXZfcHJpdi0+cmVnZmlsZS5zYXZlRFNQQVJCID0gSTkxNV9SRUFEKERTUEFSQik7 CiAKIAkvKiBzYXZlIEZCQyBpbnRlcnZhbCAqLwotCWlmIChIQVNfRkJDKGRldikgJiYgSU5URUxf SU5GTyhkZXYpLT5nZW4gPD0gNCAmJiAhSVNfRzRYKGRldikpCisJaWYgKEhBU19GQkMoZGV2X3By aXYpICYmIElOVEVMX0dFTihkZXZfcHJpdikgPD0gNCAmJiAhSVNfRzRYKGRldl9wcml2KSkKIAkJ ZGV2X3ByaXYtPnJlZ2ZpbGUuc2F2ZUZCQ19DT05UUk9MID0gSTkxNV9SRUFEKEZCQ19DT05UUk9M KTsKIH0KIApAQCAtNDcsMTQgKzQ3LDE0IEBAIHN0YXRpYyB2b2lkIGk5MTVfcmVzdG9yZV9kaXNw bGF5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShkZXYpOwogCiAJLyogRGlzcGxheSBhcmJpdHJhdGlvbiAqLwotCWlm IChJTlRFTF9JTkZPKGRldiktPmdlbiA8PSA0KQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDw9 IDQpCiAJCUk5MTVfV1JJVEUoRFNQQVJCLCBkZXZfcHJpdi0+cmVnZmlsZS5zYXZlRFNQQVJCKTsK IAogCS8qIG9ubHkgcmVzdG9yZSBGQkMgaW5mbyBvbiB0aGUgcGxhdGZvcm0gdGhhdCBzdXBwb3J0 cyBGQkMqLwogCWludGVsX2ZiY19nbG9iYWxfZGlzYWJsZShkZXZfcHJpdik7CiAKIAkvKiByZXN0 b3JlIEZCQyBpbnRlcnZhbCAqLwotCWlmIChIQVNfRkJDKGRldikgJiYgSU5URUxfSU5GTyhkZXYp LT5nZW4gPD0gNCAmJiAhSVNfRzRYKGRldikpCisJaWYgKEhBU19GQkMoZGV2X3ByaXYpICYmIElO VEVMX0dFTihkZXZfcHJpdikgPD0gNCAmJiAhSVNfRzRYKGRldl9wcml2KSkKIAkJSTkxNV9XUklU RShGQkNfQ09OVFJPTCwgZGV2X3ByaXYtPnJlZ2ZpbGUuc2F2ZUZCQ19DT05UUk9MKTsKIAogCWk5 MTVfcmVkaXNhYmxlX3ZnYShkZXYpOwpAQCAtNzUsNyArNzUsNyBAQCBpbnQgaTkxNV9zYXZlX3N0 YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQkJICAgICAmZGV2X3ByaXYtPnJlZ2ZpbGUu c2F2ZUdDREdNQlVTKTsKIAogCS8qIENhY2hlIG1vZGUgc3RhdGUgKi8KLQlpZiAoSU5URUxfSU5G TyhkZXYpLT5nZW4gPCA3KQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgNykKIAkJZGV2X3By aXYtPnJlZ2ZpbGUuc2F2ZUNBQ0hFX01PREVfMCA9IEk5MTVfUkVBRChDQUNIRV9NT0RFXzApOwog CiAJLyogTWVtb3J5IEFyYml0cmF0aW9uIHN0YXRlICovCkBAIC0xMjIsNyArMTIyLDcgQEAgaW50 IGk5MTVfcmVzdG9yZV9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWk5MTVfcmVzdG9y ZV9kaXNwbGF5KGRldik7CiAKIAkvKiBDYWNoZSBtb2RlIHN0YXRlICovCi0JaWYgKElOVEVMX0lO Rk8oZGV2KS0+Z2VuIDwgNykKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDcpCiAJCUk5MTVf V1JJVEUoQ0FDSEVfTU9ERV8wLCBkZXZfcHJpdi0+cmVnZmlsZS5zYXZlQ0FDSEVfTU9ERV8wIHwK IAkJCSAgIDB4ZmZmZjAwMDApOwogCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==