From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas De Marchi Subject: [PATCH 2/5] drm/i915/tgl: re-indent code to prepare for DKL changes Date: Thu, 25 Jul 2019 16:56:40 -0700 Message-ID: <20190725235643.6870-3-lucas.demarchi@intel.com> References: <20190725235643.6870-1-lucas.demarchi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6FFA36E839 for ; Thu, 25 Jul 2019 23:57:02 +0000 (UTC) In-Reply-To: <20190725235643.6870-1-lucas.demarchi@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 VGhlIGZpbmFsIHNhdmUgb3BlcmF0aW9uIGludG8gcGxsX3N0YXRlIG9mIHRoZSBjYWxjdWxhdGlv bnMgZG9uZSB3aWxsCmJlIGRpZmZlcmVudCBmb3IgREtMIFBIWS4gUHJlcGFyZSBmb3IgdGhhdCBi eSByZWluZGVudGluZyBjb2RlIHNvIGl0J3MKZWFzaWVyIHRvIGNoZWNrIGZvciBjb3JyZWN0bmVz cy4gVGhpcyBvbmUgaGFzIG5vIGNoYW5nZSBpbiBiZWhhdmlvci4KClNpZ25lZC1vZmYtYnk6IEx1 Y2FzIERlIE1hcmNoaSA8bHVjYXMuZGVtYXJjaGlAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogTWF0 dCBBdHdvb2QgPG1hdHRoZXcucy5hdHdvb2RAaW50ZWwuY29tPgpMaW5rOiBodHRwczovL3BhdGNo d29yay5mcmVlZGVza3RvcC5vcmcvcGF0Y2gvbXNnaWQvMjAxOTA3MTMwMTA5NDAuMTc3MTEtMTAt bHVjYXMuZGVtYXJjaGlAaW50ZWwuY29tCi0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxh eS9pbnRlbF9kcGxsX21nci5jIHwgMTE5ICsrKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDY2IGluc2VydGlvbnMoKyksIDUzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZHBsbF9tZ3IuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2Rpc3BsYXkvaW50ZWxfZHBsbF9tZ3IuYwppbmRleCBmOWJkZjg1MTRhNTMuLjdlZWZk NjNhOGI3ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9k cGxsX21nci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZHBsbF9t Z3IuYwpAQCAtMjgwNCw2MCArMjgwNCw3MyBAQCBzdGF0aWMgYm9vbCBpY2xfY2FsY19tZ19wbGxf c3RhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJfQogCXNzY19zdGVw bG9nID0gNDsKIAotCXBsbF9zdGF0ZS0+bWdfcGxsX2RpdjAgPSAobTJkaXZfcmVtID4gMCA/IE1H X1BMTF9ESVYwX0ZSQUNORU5fSCA6IDApIHwKLQkJCQkgIE1HX1BMTF9ESVYwX0ZCRElWX0ZSQUMo bTJkaXZfZnJhYykgfAotCQkJCSAgTUdfUExMX0RJVjBfRkJESVZfSU5UKG0yZGl2X2ludCk7Ci0K LQlwbGxfc3RhdGUtPm1nX3BsbF9kaXYxID0gTUdfUExMX0RJVjFfSVJFRl9ORElWUkFUSU8oaXJl Zl9uZGl2KSB8Ci0JCQkJIE1HX1BMTF9ESVYxX0RJVEhFUl9ESVZfMiB8Ci0JCQkJIE1HX1BMTF9E SVYxX05ESVZSQVRJTygxKSB8Ci0JCQkJIE1HX1BMTF9ESVYxX0ZCUFJFRElWKG0xZGl2KTsKLQot CXBsbF9zdGF0ZS0+bWdfcGxsX2xmID0gTUdfUExMX0xGX1REQ1RBUkdFVENOVCh0ZGNfdGFyZ2V0 Y250KSB8Ci0JCQkgICAgICAgTUdfUExMX0xGX0FGQ0NOVFNFTF81MTIgfAotCQkJICAgICAgIE1H X1BMTF9MRl9HQUlOQ1RSTCgxKSB8Ci0JCQkgICAgICAgTUdfUExMX0xGX0lOVF9DT0VGRihpbnRf Y29lZmYpIHwKLQkJCSAgICAgICBNR19QTExfTEZfUFJPUF9DT0VGRihwcm9wX2NvZWZmKTsKLQot CXBsbF9zdGF0ZS0+bWdfcGxsX2ZyYWNfbG9jayA9IE1HX1BMTF9GUkFDX0xPQ0tfVFJVRUxPQ0tf Q1JJVF8zMiB8Ci0JCQkJICAgICAgTUdfUExMX0ZSQUNfTE9DS19FQVJMWUxPQ0tfQ1JJVF8zMiB8 Ci0JCQkJICAgICAgTUdfUExMX0ZSQUNfTE9DS19MT0NLVEhSRVNIKDEwKSB8Ci0JCQkJICAgICAg TUdfUExMX0ZSQUNfTE9DS19EQ09ESVRIRVJFTiB8Ci0JCQkJICAgICAgTUdfUExMX0ZSQUNfTE9D S19GRUVERldSREdBSU4oZmVlZGZ3Z2Fpbik7Ci0JaWYgKHVzZV9zc2MgfHwgbTJkaXZfcmVtID4g MCkKLQkJcGxsX3N0YXRlLT5tZ19wbGxfZnJhY19sb2NrIHw9IE1HX1BMTF9GUkFDX0xPQ0tfRkVF REZXUkRDQUxfRU47Ci0KLQlwbGxfc3RhdGUtPm1nX3BsbF9zc2MgPSAodXNlX3NzYyA/IE1HX1BM TF9TU0NfRU4gOiAwKSB8Ci0JCQkJTUdfUExMX1NTQ19UWVBFKDIpIHwKLQkJCQlNR19QTExfU1ND X1NURVBMRU5HVEgoc3NjX3N0ZXBsZW4pIHwKLQkJCQlNR19QTExfU1NDX1NURVBOVU0oc3NjX3N0 ZXBsb2cpIHwKLQkJCQlNR19QTExfU1NDX0ZMTEVOIHwKLQkJCQlNR19QTExfU1NDX1NURVBTSVpF KHNzY19zdGVwc2l6ZSk7Ci0KLQlwbGxfc3RhdGUtPm1nX3BsbF90ZGNfY29sZHN0X2JpYXMgPSBN R19QTExfVERDX0NPTERTVF9DT0xEU1RBUlQgfAotCQkJCQkgICAgTUdfUExMX1REQ19DT0xEU1Rf SVJFRklOVF9FTiB8Ci0JCQkJCSAgICBNR19QTExfVERDX0NPTERTVF9SRUZCSUFTX1NUQVJUX1BV TFNFX1coaXJlZl9wdWxzZV93KSB8Ci0JCQkJCSAgICBNR19QTExfVERDX1REQ09WQ0NPUlJfRU4g fAotCQkJCQkgICAgTUdfUExMX1REQ19URENTRUwoMyk7Ci0KLQlwbGxfc3RhdGUtPm1nX3BsbF9i aWFzID0gTUdfUExMX0JJQVNfQklBU19HQl9TRUwoMykgfAotCQkJCSBNR19QTExfQklBU19JTklU X0RDT0FNUCgweDNGKSB8Ci0JCQkJIE1HX1BMTF9CSUFTX0JJQVNfQk9OVVMoMTApIHwKLQkJCQkg TUdfUExMX0JJQVNfQklBU0NBTF9FTiB8Ci0JCQkJIE1HX1BMTF9CSUFTX0NUUklNKDEyKSB8Ci0J CQkJIE1HX1BMTF9CSUFTX1ZSRUZfUkRBQyg0KSB8Ci0JCQkJIE1HX1BMTF9CSUFTX0lSRUZUUklN KGlyZWZfdHJpbSk7Ci0KLQlpZiAocmVmY2xrX2toeiA9PSAzODQwMCkgewotCQlwbGxfc3RhdGUt Pm1nX3BsbF90ZGNfY29sZHN0X2JpYXNfbWFzayA9IE1HX1BMTF9URENfQ09MRFNUX0NPTERTVEFS VDsKLQkJcGxsX3N0YXRlLT5tZ19wbGxfYmlhc19tYXNrID0gMDsKLQl9IGVsc2UgewotCQlwbGxf c3RhdGUtPm1nX3BsbF90ZGNfY29sZHN0X2JpYXNfbWFzayA9IC0xVTsKLQkJcGxsX3N0YXRlLT5t Z19wbGxfYmlhc19tYXNrID0gLTFVOwotCX0KKwkvKiB3cml0ZSBwbGxfc3RhdGUgY2FsY3VsYXRp b25zICovCisJeworCQlwbGxfc3RhdGUtPm1nX3BsbF9kaXYwID0KKwkJCShtMmRpdl9yZW0gPiAw ID8gTUdfUExMX0RJVjBfRlJBQ05FTl9IIDogMCkgfAorCQkJTUdfUExMX0RJVjBfRkJESVZfRlJB QyhtMmRpdl9mcmFjKSB8CisJCQlNR19QTExfRElWMF9GQkRJVl9JTlQobTJkaXZfaW50KTsKKwor CQlwbGxfc3RhdGUtPm1nX3BsbF9kaXYxID0KKwkJCU1HX1BMTF9ESVYxX0lSRUZfTkRJVlJBVElP KGlyZWZfbmRpdikgfAorCQkJTUdfUExMX0RJVjFfRElUSEVSX0RJVl8yIHwKKwkJCU1HX1BMTF9E SVYxX05ESVZSQVRJTygxKSB8CisJCQlNR19QTExfRElWMV9GQlBSRURJVihtMWRpdik7CisKKwkJ cGxsX3N0YXRlLT5tZ19wbGxfbGYgPQorCQkJTUdfUExMX0xGX1REQ1RBUkdFVENOVCh0ZGNfdGFy Z2V0Y250KSB8CisJCQlNR19QTExfTEZfQUZDQ05UU0VMXzUxMiB8CisJCQlNR19QTExfTEZfR0FJ TkNUUkwoMSkgfAorCQkJTUdfUExMX0xGX0lOVF9DT0VGRihpbnRfY29lZmYpIHwKKwkJCU1HX1BM TF9MRl9QUk9QX0NPRUZGKHByb3BfY29lZmYpOworCisJCXBsbF9zdGF0ZS0+bWdfcGxsX2ZyYWNf bG9jayA9CisJCQlNR19QTExfRlJBQ19MT0NLX1RSVUVMT0NLX0NSSVRfMzIgfAorCQkJTUdfUExM X0ZSQUNfTE9DS19FQVJMWUxPQ0tfQ1JJVF8zMiB8CisJCQlNR19QTExfRlJBQ19MT0NLX0xPQ0tU SFJFU0goMTApIHwKKwkJCU1HX1BMTF9GUkFDX0xPQ0tfRENPRElUSEVSRU4gfAorCQkJTUdfUExM X0ZSQUNfTE9DS19GRUVERldSREdBSU4oZmVlZGZ3Z2Fpbik7CisJCWlmICh1c2Vfc3NjIHx8IG0y ZGl2X3JlbSA+IDApCisJCQlwbGxfc3RhdGUtPm1nX3BsbF9mcmFjX2xvY2sgfD0KKwkJCQlNR19Q TExfRlJBQ19MT0NLX0ZFRURGV1JEQ0FMX0VOOworCisJCXBsbF9zdGF0ZS0+bWdfcGxsX3NzYyA9 CisJCQkodXNlX3NzYyA/IE1HX1BMTF9TU0NfRU4gOiAwKSB8CisJCQlNR19QTExfU1NDX1RZUEUo MikgfAorCQkJTUdfUExMX1NTQ19TVEVQTEVOR1RIKHNzY19zdGVwbGVuKSB8CisJCQlNR19QTExf U1NDX1NURVBOVU0oc3NjX3N0ZXBsb2cpIHwKKwkJCU1HX1BMTF9TU0NfRkxMRU4gfAorCQkJTUdf UExMX1NTQ19TVEVQU0laRShzc2Nfc3RlcHNpemUpOworCisJCXBsbF9zdGF0ZS0+bWdfcGxsX3Rk Y19jb2xkc3RfYmlhcyA9CisJCQlNR19QTExfVERDX0NPTERTVF9DT0xEU1RBUlQgfAorCQkJTUdf UExMX1REQ19DT0xEU1RfSVJFRklOVF9FTiB8CisJCQlNR19QTExfVERDX0NPTERTVF9SRUZCSUFT X1NUQVJUX1BVTFNFX1coaXJlZl9wdWxzZV93KSB8CisJCQlNR19QTExfVERDX1REQ09WQ0NPUlJf RU4gfAorCQkJTUdfUExMX1REQ19URENTRUwoMyk7CisKKwkJcGxsX3N0YXRlLT5tZ19wbGxfYmlh cyA9CisJCQlNR19QTExfQklBU19CSUFTX0dCX1NFTCgzKSB8CisJCQlNR19QTExfQklBU19JTklU X0RDT0FNUCgweDNGKSB8CisJCQlNR19QTExfQklBU19CSUFTX0JPTlVTKDEwKSB8CisJCQlNR19Q TExfQklBU19CSUFTQ0FMX0VOIHwKKwkJCU1HX1BMTF9CSUFTX0NUUklNKDEyKSB8CisJCQlNR19Q TExfQklBU19WUkVGX1JEQUMoNCkgfAorCQkJTUdfUExMX0JJQVNfSVJFRlRSSU0oaXJlZl90cmlt KTsKKworCQlpZiAocmVmY2xrX2toeiA9PSAzODQwMCkgeworCQkJcGxsX3N0YXRlLT5tZ19wbGxf dGRjX2NvbGRzdF9iaWFzX21hc2sgPQorCQkJCU1HX1BMTF9URENfQ09MRFNUX0NPTERTVEFSVDsK KwkJCXBsbF9zdGF0ZS0+bWdfcGxsX2JpYXNfbWFzayA9IDA7CisJCX0gZWxzZSB7CisJCQlwbGxf c3RhdGUtPm1nX3BsbF90ZGNfY29sZHN0X2JpYXNfbWFzayA9IC0xVTsKKwkJCXBsbF9zdGF0ZS0+ bWdfcGxsX2JpYXNfbWFzayA9IC0xVTsKKwkJfQogCi0JcGxsX3N0YXRlLT5tZ19wbGxfdGRjX2Nv bGRzdF9iaWFzICY9IHBsbF9zdGF0ZS0+bWdfcGxsX3RkY19jb2xkc3RfYmlhc19tYXNrOwotCXBs bF9zdGF0ZS0+bWdfcGxsX2JpYXMgJj0gcGxsX3N0YXRlLT5tZ19wbGxfYmlhc19tYXNrOworCQlw bGxfc3RhdGUtPm1nX3BsbF90ZGNfY29sZHN0X2JpYXMgJj0KKwkJCXBsbF9zdGF0ZS0+bWdfcGxs X3RkY19jb2xkc3RfYmlhc19tYXNrOworCQlwbGxfc3RhdGUtPm1nX3BsbF9iaWFzICY9IHBsbF9z dGF0ZS0+bWdfcGxsX2JpYXNfbWFzazsKKwl9CiAKIAlyZXR1cm4gdHJ1ZTsKIH0KLS0gCjIuMjEu MAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4