From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id D68CB8924C for ; Mon, 28 Jan 2019 20:01:43 +0000 (UTC) From: Ville Syrjala Date: Mon, 28 Jan 2019 22:01:26 +0200 Message-Id: <20190128200126.1270-6-ville.syrjala@linux.intel.com> In-Reply-To: <20190128200126.1270-1-ville.syrjala@linux.intel.com> References: <20190128200126.1270-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 6/6] tools/intel_watermark: Clean up the platform checks in the ilk+ code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org List-ID: RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClJl cGxhY2UgdGhlIG9sZCBoYW5kIHJvbGxlZCBwbGF0Zm9ybSBjaGVjayBmdW5jcyB3aXRoIHNvbWVo dGluZwptb3JlIHN0YW5kYXJkLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxs ZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiB0b29scy9pbnRlbF93YXRlcm1hcmsuYyB8 IDQyICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdG9v bHMvaW50ZWxfd2F0ZXJtYXJrLmMgYi90b29scy9pbnRlbF93YXRlcm1hcmsuYwppbmRleCA2YTQ3 YjMzYzQzOGMuLmU3MWMzZDljZmY2ZCAxMDA2NDQKLS0tIGEvdG9vbHMvaW50ZWxfd2F0ZXJtYXJr LmMKKysrIGIvdG9vbHMvaW50ZWxfd2F0ZXJtYXJrLmMKQEAgLTEyNSwxNiArMTI1LDYgQEAgc3Rh dGljIGNoYXIgZW5kaXNfYXN0KGJvb2wgZW5hYmxlZCkKIAlyZXR1cm4gZW5hYmxlZCA/ICcqJyA6 ICcgJzsKIH0KIAotc3RhdGljIGludCBpc19nZW43X3BsdXModWludDMyX3QgZCkKLXsKLQlyZXR1 cm4gIShJU19HRU41KGQpIHx8IElTX0dFTjYoZCkpOwotfQotCi1zdGF0aWMgaW50IGlzX2hzd19w bHVzKHVpbnQzMl90IGQpCi17Ci0JcmV0dXJuICEoSVNfR0VONShkKSB8fCBJU19HRU42KGQpIHx8 IElTX0lWWUJSSURHRShkKSk7Ci19Ci0KIHN0YXRpYyBpbnQgc2tsX251bV9wbGFuZXModWludDMy X3QgZCwgaW50IHBpcGUpCiB7CiAJaWYgKElTX0dFTjExKGQpKQpAQCAtNDc2LDE0ICs0NjYsMTQg QEAgc3RhdGljIHZvaWQgaWxrX3dtX2R1bXAodm9pZCkKIAl1aW50MzJfdCB3bV9scFszXTsKIAl1 aW50MzJfdCB3bV9scF9zcHJbM107CiAJdWludDMyX3QgYXJiX2N0bCwgYXJiX2N0bDIsIHdtX21p c2MgPSAwOwotCWludCBudW1fcGlwZXMgPSBpc19nZW43X3BsdXMoZGV2aWQpID8gMyA6IDI7CisJ aW50IG51bV9waXBlcyA9IGludGVsX2dlbihkZXZpZCkgPj0gNyA/IDMgOiAyOwogCXN0cnVjdCBp bGtfd20gd20gPSB7fTsKIAogCWludGVsX3JlZ2lzdGVyX2FjY2Vzc19pbml0KGludGVsX2dldF9w Y2lfZGV2aWNlKCksIDAsIC0xKTsKIAogCWZvciAoaSA9IDA7IGkgPCBudW1fcGlwZXM7IGkrKykg ewogCQlkc3BjbnRyW2ldID0gcmVhZF9yZWcoMHg3MDE4MCArIGkgKiAweDEwMDApOwotCQlpZiAo aXNfZ2VuN19wbHVzKGRldmlkKSkKKwkJaWYgKGludGVsX2dlbihkZXZpZCkgPj0gNykKIAkJCXNw Y250cltpXSA9IHJlYWRfcmVnKDB4NzAyODAgKyBpICogMHgxMDAwKTsKIAkJZWxzZQogCQkJc3Bj bnRyW2ldID0gcmVhZF9yZWcoMHg3MjE4MCArIGkgKiAweDEwMDApOwpAQCAtNDk0LDcgKzQ4NCw3 IEBAIHN0YXRpYyB2b2lkIGlsa193bV9kdW1wKHZvaWQpCiAJaWYgKG51bV9waXBlcyA9PSAzKQog CQl3bV9waXBlWzJdID0gcmVhZF9yZWcoMHg0NTIwMCk7CiAKLQlpZiAoaXNfaHN3X3BsdXMoZGV2 aWQpKSB7CisJaWYgKElTX0JST0FEV0VMTChkZXZpZCkgfHwgSVNfSEFTV0VMTChkZXZpZCkpIHsK IAkJd21fbGluZXRpbWVbMF0gPSByZWFkX3JlZygweDQ1MjcwKTsKIAkJd21fbGluZXRpbWVbMV0g PSByZWFkX3JlZygweDQ1Mjc0KTsKIAkJd21fbGluZXRpbWVbMl0gPSByZWFkX3JlZygweDQ1Mjc4 KTsKQEAgLTUwNSwyMSArNDk1LDIxIEBAIHN0YXRpYyB2b2lkIGlsa193bV9kdW1wKHZvaWQpCiAJ d21fbHBbMl0gPSByZWFkX3JlZygweDQ1MTEwKTsKIAogCXdtX2xwX3NwclswXSA9IHJlYWRfcmVn KDB4NDUxMjApOwotCWlmIChpc19nZW43X3BsdXMoZGV2aWQpKSB7CisJaWYgKGludGVsX2dlbihk ZXZpZCkgPj0gNykgewogCQl3bV9scF9zcHJbMV0gPSByZWFkX3JlZygweDQ1MTI0KTsKIAkJd21f bHBfc3ByWzJdID0gcmVhZF9yZWcoMHg0NTEyOCk7CiAJfQogCiAJYXJiX2N0bCA9IHJlYWRfcmVn KDB4NDUwMDApOwogCWFyYl9jdGwyID0gcmVhZF9yZWcoMHg0NTAwNCk7Ci0JaWYgKGlzX2hzd19w bHVzKGRldmlkKSkKKwlpZiAoSVNfQlJPQURXRUxMKGRldmlkKSB8fCBJU19IQVNXRUxMKGRldmlk KSkKIAkJd21fbWlzYyA9IHJlYWRfcmVnKDB4NDUyNjApOwogCiAJaW50ZWxfcmVnaXN0ZXJfYWNj ZXNzX2ZpbmkoKTsKIAogCWZvciAoaSA9IDA7IGkgPCBudW1fcGlwZXM7IGkrKykKIAkJcHJpbnRm KCIgICAgV01fUElQRV8lYyA9IDB4JTA4eFxuIiwgcGlwZV9uYW1lKGkpLCB3bV9waXBlW2ldKTsK LQlpZiAoaXNfaHN3X3BsdXMoZGV2aWQpKSB7CisJaWYgKElTX0JST0FEV0VMTChkZXZpZCkgfHwg SVNfSEFTV0VMTChkZXZpZCkpIHsKIAkJZm9yIChpID0gMDsgaSA8IG51bV9waXBlczsgaSsrKQog CQkJcHJpbnRmKCJXTV9MSU5FVElNRV8lYyA9IDB4JTA4eFxuIiwgcGlwZV9uYW1lKGkpLCB3bV9s aW5ldGltZVtpXSk7CiAJfQpAQCAtNTI3LDEzICs1MTcsMTMgQEAgc3RhdGljIHZvaWQgaWxrX3dt X2R1bXAodm9pZCkKIAlwcmludGYoIiAgICAgICBXTV9MUDIgPSAweCUwOHhcbiIsIHdtX2xwWzFd KTsKIAlwcmludGYoIiAgICAgICBXTV9MUDMgPSAweCUwOHhcbiIsIHdtX2xwWzJdKTsKIAlwcmlu dGYoIiAgIFdNX0xQMV9TUFIgPSAweCUwOHhcbiIsIHdtX2xwX3NwclswXSk7Ci0JaWYgKGlzX2dl bjdfcGx1cyhkZXZpZCkpIHsKKwlpZiAoaW50ZWxfZ2VuKGRldmlkKSA+PSA3KSB7CiAJCXByaW50 ZigiICAgV01fTFAyX1NQUiA9IDB4JTA4eFxuIiwgd21fbHBfc3ByWzFdKTsKIAkJcHJpbnRmKCIg ICBXTV9MUDNfU1BSID0gMHglMDh4XG4iLCB3bV9scF9zcHJbMl0pOwogCX0KIAlwcmludGYoIiAg ICAgIEFSQl9DVEwgPSAweCUwOHhcbiIsIGFyYl9jdGwpOwogCXByaW50ZigiICAgICBBUkJfQ1RM MiA9IDB4JTA4eFxuIiwgYXJiX2N0bDIpOwotCWlmIChpc19oc3dfcGx1cyhkZXZpZCkpCisJaWYg KElTX0JST0FEV0VMTChkZXZpZCkgfHwgSVNfSEFTV0VMTChkZXZpZCkpCiAJCXByaW50ZigiICAg ICAgV01fTUlTQyA9IDB4JTA4eFxuIiwgd21fbWlzYyk7CiAKIAlmb3IgKGkgPSAwIDsgaSA8IG51 bV9waXBlczsgaSsrKSB7CkBAIC01NDEsNyArNTMxLDcgQEAgc3RhdGljIHZvaWQgaWxrX3dtX2R1 bXAodm9pZCkKIAkJd20ucGlwZVtpXS5zcHJpdGUgPSBSRUdfREVDT0RFMSh3bV9waXBlW2ldLCA4 LCA4KTsKIAkJd20ucGlwZVtpXS5jdXJzb3IgPSBSRUdfREVDT0RFMSh3bV9waXBlW2ldLCAwLCA2 KTsKIAotCQlpZiAoaXNfaHN3X3BsdXMoZGV2aWQpKSB7CisJCWlmIChJU19CUk9BRFdFTEwoZGV2 aWQpIHx8IElTX0hBU1dFTEwoZGV2aWQpKSB7CiAJCQl3bS5saW5ldGltZVtpXS5saW5ldGltZSA9 IFJFR19ERUNPREUxKHdtX2xpbmV0aW1lW2ldLCAwLCA5KTsKIAkJCXdtLmxpbmV0aW1lW2ldLmlw cyA9IFJFR19ERUNPREUxKHdtX2xpbmV0aW1lW2ldLCAxNiwgOSk7CiAJCX0KQEAgLTU1NiwxNSAr NTQ2LDE1IEBAIHN0YXRpYyB2b2lkIGlsa193bV9kdW1wKHZvaWQpCiAJZm9yIChpID0gMDsgaSA8 IDM7IGkrKykgewogCQl3bS5scFtpXS5lbmFibGVkID0gUkVHX0RFQ09ERTEod21fbHBbaV0sIDMx LCAxKTsKIAkJd20ubHBbaV0ubGF0ZW5jeSA9IFJFR19ERUNPREUxKHdtX2xwW2ldLCAyNCwgNyk7 Ci0JCWlmIChJU19HRU44KGRldmlkKSkKKwkJaWYgKElTX0JST0FEV0VMTChkZXZpZCkpCiAJCQl3 bS5scFtpXS5mYmMgPSBSRUdfREVDT0RFMSh3bV9scFtpXSwgMTksIDUpOwogCQllbHNlCiAJCQl3 bS5scFtpXS5mYmMgPSBSRUdfREVDT0RFMSh3bV9scFtpXSwgMjAsIDQpOwogCQl3bS5scFtpXS5w cmltYXJ5ID0gUkVHX0RFQ09ERTEod21fbHBbaV0sIDgsIDExKTsKIAkJd20ubHBbaV0uY3Vyc29y ID0gUkVHX0RFQ09ERTEod21fbHBbaV0sIDAsIDgpOwogCi0JCWlmIChpID09IDAgfHwgaXNfZ2Vu N19wbHVzKGRldmlkKSkgewotCQkJaWYgKCFpc19nZW43X3BsdXMoZGV2aWQpKQorCQlpZiAoaSA9 PSAwIHx8IGludGVsX2dlbihkZXZpZCkgPj0gNykgeworCQkJaWYgKGludGVsX2dlbihkZXZpZCkg PCA3KQogCQkJCXdtLmxwW2ldLnNwcml0ZV9lbmFibGVkID0gUkVHX0RFQ09ERTEod21fbHBfc3By W2ldLCAzMSwgMSk7CiAJCQl3bS5scFtpXS5zcHJpdGUgPSBSRUdfREVDT0RFMSh3bV9scF9zcHJb aV0sIDAsIDExKTsKIAkJfQpAQCAtNTc0LDcgKzU2NCw3IEBAIHN0YXRpYyB2b2lkIGlsa193bV9k dW1wKHZvaWQpCiAJCXByaW50ZigiV01fUElQRV8lYzogcHJpbWFyeT0lZCwgY3Vyc29yPSVkLCBz cHJpdGU9JWRcbiIsCiAJCSAgICAgICBwaXBlX25hbWUoaSksIHdtLnBpcGVbaV0ucHJpbWFyeSwg d20ucGlwZVtpXS5jdXJzb3IsIHdtLnBpcGVbaV0uc3ByaXRlKTsKIAl9Ci0JaWYgKGlzX2hzd19w bHVzKGRldmlkKSkgeworCWlmIChJU19CUk9BRFdFTEwoZGV2aWQpIHx8IElTX0hBU1dFTEwoZGV2 aWQpKSB7CiAJCWZvciAoaSA9IDA7IGkgPCBudW1fcGlwZXM7IGkrKykgewogCQkJcHJpbnRmKCJX TV9MSU5FVElNRV8lYzogbGluZSB0aW1lPSVkICglLjNmIHVzZWMpLCBpcHMgbGluZSB0aW1lPSVk ICglLjNmIHVzZWMpXG4iLAogCQkJICAgICAgIHBpcGVfbmFtZShpKSwKQEAgLTU4Miw3ICs1NzIs NyBAQCBzdGF0aWMgdm9pZCBpbGtfd21fZHVtcCh2b2lkKQogCQkJICAgICAgIHdtLmxpbmV0aW1l W2ldLmlwcywgd20ubGluZXRpbWVbaV0uaXBzICogMC4xMjVmKTsKIAkJfQogCX0KLQlpZiAoaXNf Z2VuN19wbHVzKGRldmlkKSkgeworCWlmIChpbnRlbF9nZW4oZGV2aWQpID49IDcpIHsKIAkJZm9y IChpID0gMDsgaSA8IDM7IGkrKykgewogCQkJcHJpbnRmKCJXTV9MUCVkOiAlcywgbGF0ZW5jeT0l ZCwgZmJjPSVkLCBwcmltYXJ5PSVkLCBjdXJzb3I9JWQsIHNwcml0ZT0lZFxuIiwKIAkJCSAgICAg ICBpICsgMSwgZW5kaXMod20ubHBbaV0uZW5hYmxlZCksIHdtLmxwW2ldLmxhdGVuY3ksIHdtLmxw W2ldLmZiYywKQEAgLTYwNywxMCArNTk3LDEwIEBAIHN0YXRpYyB2b2lkIGlsa193bV9kdW1wKHZv aWQpCiAJCQlwcmludGYoIlNwcml0ZSAlYyB0cmlja2xlIGZlZWQgPSAlc1xuIiwKIAkJCSAgICAg ICBwaXBlX25hbWUoaSksIGVuZGlzKCF3bS5waXBlW2ldLnNwcml0ZV90cmlja2xlX2ZlZWRfZGlz KSk7CiAJfQotCWlmIChpc19oc3dfcGx1cyhkZXZpZCkpIHsKKwlpZiAoSVNfQlJPQURXRUxMKGRl dmlkKSB8fCBJU19IQVNXRUxMKGRldmlkKSkgewogCQlwcmludGYoIkREQiBwYXJ0aXRpb25pbmcg PSAlc1xuIiwKIAkJICAgICAgIFJFR19ERUNPREUxKHdtX21pc2MsIDAsIDEpID8gIjUvNiIgOiAi MS8yIik7Ci0JfSBlbHNlIGlmIChpc19nZW43X3BsdXMoZGV2aWQpKSB7CisJfSBlbHNlIGlmIChp bnRlbF9nZW4oZGV2aWQpID49IDcpIHsKIAkJcHJpbnRmKCJEREIgcGFydGl0aW9uaW5nID0gJXNc biIsCiAJCSAgICAgICBSRUdfREVDT0RFMShhcmJfY3RsMiwgNiwgMSkgPyAiNS82IiA6ICIxLzIi KTsKIAl9Ci0tIAoyLjE5LjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRl dgo=