From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH v2] drm/i915: Use bitmask for IS_REVID checking Date: Tue, 10 May 2016 14:53:56 +0100 Message-ID: <1462888436-10475-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1462885341-30380-1-git-send-email-tvrtko.ursulin@linux.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 F037A89856 for ; Tue, 10 May 2016 13:54:06 +0000 (UTC) In-Reply-To: <1462885341-30380-1-git-send-email-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 Cc: Jani Nikula List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldpdGggdGhp cyBzY2hlbWUgYWxsIGNhbGwgc2l0ZXMgb2YgSVNfU0tMX1JFVklEIGFuZCBJU19CWFRfUkVWSUQK cmVzdWx0IGluIGEgbWF4aW11bSBvZiBvbmUgY29uZGl0aW9uYWwganVtcCBpbnN0cnVjdGlvbiAo d2FzCnRocmVlIGJlZm9yZSkgYW5kIG92ZXJhbGwgcmVkdWN0aW9uIGluIGNvZGUgc2l6ZS4KCnYy OiBTaW1wbGlmaWVkLCBub3cgc2F2ZXMgfjg4MCBieXRlcyBvZiB0ZXh0LgoKU2lnbmVkLW9mZi1i eTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IENocmlzIFdp bHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogSmFuaSBOaWt1bGEgPGphbmkubmlr dWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jIHwgIDgg KysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggfCAyMSArKysrKysrKysr KysrKysrLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwppbmRleCA0NmFjMWRhNjRhMDkuLmYyYWQ3OGQ4 Mjk2ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCkBAIC0xMDcyLDYgKzEwNzIsMTQgQEAgc3Rh dGljIGludCBpOTE1X2RyaXZlcl9pbml0X2Vhcmx5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKIAltZW1jcHkoZGV2aWNlX2luZm8sIGluZm8sIHNpemVvZihkZXZfcHJpdi0+aW5m bykpOwogCWRldmljZV9pbmZvLT5kZXZpY2VfaWQgPSBkZXYtPnBkZXYtPmRldmljZTsKIAorCS8q IEZvciB1bmtub3duIHJldmlzaW9ucyBtYXNrIHN0YXlzIGF0IHplcm8gd2hpY2ggaXMgY29ycmVj dC4gKi8KKwlpZiAoSVNfU0tZTEFLRShkZXZfcHJpdikgJiYgZGV2LT5wZGV2LT5yZXZpc2lvbiA8 CisJICAgIHNpemVvZihkZXZpY2VfaW5mby0+c2tsX3Jldl9tYXNrKSAqIEJJVFNfUEVSX0JZVEUp CisJCWRldmljZV9pbmZvLT5za2xfcmV2X21hc2sgPSBCSVQoZGV2LT5wZGV2LT5yZXZpc2lvbik7 CisJZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikgJiYgZGV2LT5wZGV2LT5yZXZpc2lvbiA8 CisJICAgICAgICAgc2l6ZW9mKGRldmljZV9pbmZvLT5ieHRfcmV2X21hc2spICogQklUU19QRVJf QllURSkKKwkJZGV2aWNlX2luZm8tPmJ4dF9yZXZfbWFzayA9IEJJVChkZXYtPnBkZXYtPnJldmlz aW9uKTsKKwogCXNwaW5fbG9ja19pbml0KCZkZXZfcHJpdi0+aXJxX2xvY2spOwogCXNwaW5fbG9j a19pbml0KCZkZXZfcHJpdi0+Z3B1X2Vycm9yLmxvY2spOwogCW11dGV4X2luaXQoJmRldl9wcml2 LT5iYWNrbGlnaHRfbG9jayk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAyNmU3ZGU0MTU5 NjYuLjE4ZWVlNTc1YjlhZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC03NTcsNiArNzU3 LDggQEAgc3RydWN0IGludGVsX2NzciB7CiBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gewogCXUz MiBkaXNwbGF5X21taW9fb2Zmc2V0OwogCXUxNiBkZXZpY2VfaWQ7CisJdTggc2tsX3Jldl9tYXNr OworCXU4IGJ4dF9yZXZfbWFzazsKIAl1OCBudW1fcGlwZXM6MzsKIAl1OCBudW1fc3ByaXRlc1tJ OTE1X01BWF9QSVBFU107CiAJdTggZ2VuOwpAQCAtMjUxOSwxNCArMjUyMSwyMyBAQCBzdHJ1Y3Qg ZHJtX2k5MTVfY21kX3RhYmxlIHsKICNkZWZpbmUgSU5URUxfREVWSUQocCkJKElOVEVMX0lORk8o cCktPmRldmljZV9pZCkKICNkZWZpbmUgSU5URUxfUkVWSUQocCkJKF9fSTkxNV9fKHApLT5kZXYt PnBkZXYtPnJldmlzaW9uKQogCi0jZGVmaW5lIFJFVklEX0ZPUkVWRVIJCTB4ZmYKKyNkZWZpbmUg UkVWSURfRk9SRVZFUgkJMAorCiAvKgogICogUmV0dXJuIHRydWUgaWYgcmV2aXNpb24gaXMgaW4g cmFuZ2UgW3NpbmNlLHVudGlsXSBpbmNsdXNpdmUuCiAgKgogICogVXNlIDAgZm9yIG9wZW4tZW5k ZWQgc2luY2UsIGFuZCBSRVZJRF9GT1JFVkVSIGZvciBvcGVuLWVuZGVkIHVudGlsLgogICovCi0j ZGVmaW5lIElTX1JFVklEKHAsIHNpbmNlLCB1bnRpbCkgXAotCShJTlRFTF9SRVZJRChwKSA+PSAo c2luY2UpICYmIElOVEVMX1JFVklEKHApIDw9ICh1bnRpbCkpCisjZGVmaW5lIElTX1JFVklEKHAs IG1hc2ssIHNpbmNlLCB1bnRpbCkgKHtcCisJdW5zaWduZWQgaW50IF9fcyA9IChzaW5jZSksIF9f ZSA9ICh1bnRpbCk7IFwKKwlCVUlMRF9CVUdfT04oIV9fYnVpbHRpbl9jb25zdGFudF9wKHNpbmNl KSk7IFwKKwlCVUlMRF9CVUdfT04oIV9fYnVpbHRpbl9jb25zdGFudF9wKHVudGlsKSk7IFwKKwlC VUlMRF9CVUdfT04oc2luY2UgPj0gc2l6ZW9mKElOVEVMX0lORk8ocCktPm1hc2spICogQklUU19Q RVJfQllURSk7IFwKKwlCVUlMRF9CVUdfT04odW50aWwgPj0gc2l6ZW9mKElOVEVMX0lORk8ocCkt Pm1hc2spICogQklUU19QRVJfQllURSk7IFwKKwlpZiAoKF9fZSkgPT0gUkVWSURfRk9SRVZFUikg XAorCQlfX2UgPSBCSVRTX1BFUl9MT05HIC0gMTsgXAorCSEhKElOVEVMX0lORk8ocCktPm1hc2sg JiBHRU5NQVNLKChfX2UpLCAoX19zKSkpOyBcCit9KQogCiAjZGVmaW5lIElTX0k4MzAoZGV2KQkJ KElOVEVMX0RFVklEKGRldikgPT0gMHgzNTc3KQogI2RlZmluZSBJU184NDVHKGRldikJCShJTlRF TF9ERVZJRChkZXYpID09IDB4MjU2MikKQEAgLTI2MDUsMTQgKzI2MTYsMTQgQEAgc3RydWN0IGRy bV9pOTE1X2NtZF90YWJsZSB7CiAjZGVmaW5lIFNLTF9SRVZJRF9FMAkJMHg0CiAjZGVmaW5lIFNL TF9SRVZJRF9GMAkJMHg1CiAKLSNkZWZpbmUgSVNfU0tMX1JFVklEKHAsIHNpbmNlLCB1bnRpbCkg KElTX1NLWUxBS0UocCkgJiYgSVNfUkVWSUQocCwgc2luY2UsIHVudGlsKSkKKyNkZWZpbmUgSVNf U0tMX1JFVklEKHAsIHNpbmNlLCB1bnRpbCkgSVNfUkVWSUQocCwgc2tsX3Jldl9tYXNrLCBzaW5j ZSwgdW50aWwpCiAKICNkZWZpbmUgQlhUX1JFVklEX0EwCQkweDAKICNkZWZpbmUgQlhUX1JFVklE X0ExCQkweDEKICNkZWZpbmUgQlhUX1JFVklEX0IwCQkweDMKICNkZWZpbmUgQlhUX1JFVklEX0Mw CQkweDkKIAotI2RlZmluZSBJU19CWFRfUkVWSUQocCwgc2luY2UsIHVudGlsKSAoSVNfQlJPWFRP TihwKSAmJiBJU19SRVZJRChwLCBzaW5jZSwgdW50aWwpKQorI2RlZmluZSBJU19CWFRfUkVWSUQo cCwgc2luY2UsIHVudGlsKSBJU19SRVZJRChwLCBieHRfcmV2X21hc2ssIHNpbmNlLCB1bnRpbCkK IAogLyoKICAqIFRoZSBnZW5YIGRlc2lnbmF0aW9uIHR5cGljYWxseSByZWZlcnMgdG8gdGhlIHJl bmRlciBlbmdpbmUsIHNvIHJlbmRlcgotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=