From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 8/9] drm/i915: Rename the local 'plane' variable to 'plane_id' in primary plane code Date: Tue, 8 Nov 2016 16:47:18 +0200 Message-ID: <1478616439-10150-9-git-send-email-ville.syrjala@linux.intel.com> References: <1478616439-10150-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id C92B66E56E for ; Tue, 8 Nov 2016 14:47:46 +0000 (UTC) In-Reply-To: <1478616439-10150-1-git-send-email-ville.syrjala@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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk5v dyB3ZSd2ZSByZW5hbWUgdGhlIGxvY2FsIHBsYW5lIGlkIHZhcmlhYmxlIGFzICdwbGFuZV9pZCcg ZXZlcnl3aGVyZQpleGNlcHQgdGhlIHByZS1TS0wgcHJpbWFyeSBwbGFuZSBjb2RlLiBMZXQncyBk byB0aGUgcmVuYW1lIHRoZXJlIGFzIHdlbGwKc28gdGhhdCB3ZSdsbCBmcmVlIHVwIHRoZSBuYW1l ICdwbGFuZScgZm9yIHVzZSB3aXRoIHN0cnVjdCBpbnRlbF9wbGFuZSouCgpTaWduZWQtb2ZmLWJ5 OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDU3ICsrKysrKysrKysrKysrKysr LS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDMw IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA5NTY0 NGM4Y2M1NjguLmJkMDg0YjA4NTQyMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwpAQCAtMzAxNCwxMCArMzAxNCw5IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3ByaW1hcnlf cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CiAJc3RydWN0IGRybV9m cmFtZWJ1ZmZlciAqZmIgPSBwbGFuZV9zdGF0ZS0+YmFzZS5mYjsKLQlpbnQgcGxhbmUgPSBpbnRl bF9jcnRjLT5wbGFuZTsKKwllbnVtIHBsYW5lIHBsYW5lX2lkID0gdG9faW50ZWxfcGxhbmUocHJp bWFyeSktPnBsYW5lOwogCXUzMiBsaW5lYXJfb2Zmc2V0OwogCXUzMiBkc3BjbnRyOwotCWk5MTVf cmVnX3QgcmVnID0gRFNQQ05UUihwbGFuZSk7CiAJdW5zaWduZWQgaW50IHJvdGF0aW9uID0gcGxh bmVfc3RhdGUtPmJhc2Uucm90YXRpb247CiAJaW50IHggPSBwbGFuZV9zdGF0ZS0+YmFzZS5zcmMu eDEgPj4gMTY7CiAJaW50IHkgPSBwbGFuZV9zdGF0ZS0+YmFzZS5zcmMueTEgPj4gMTY7CkBAIC0z MDMzLDE2ICszMDMyLDE2IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3ByaW1hcnlfcGxhbmUo c3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSwKIAkJLyogcGlwZXNyYyBhbmQgZHNwc2l6ZSBjb250 cm9sIHRoZSBzaXplIHRoYXQgaXMgc2NhbGVkIGZyb20sCiAJCSAqIHdoaWNoIHNob3VsZCBhbHdh eXMgYmUgdGhlIHVzZXIncyByZXF1ZXN0ZWQgc2l6ZS4KIAkJICovCi0JCUk5MTVfV1JJVEUoRFNQ U0laRShwbGFuZSksCisJCUk5MTVfV1JJVEUoRFNQU0laRShwbGFuZV9pZCksCiAJCQkgICAoKGNy dGNfc3RhdGUtPnBpcGVfc3JjX2ggLSAxKSA8PCAxNikgfAogCQkJICAgKGNydGNfc3RhdGUtPnBp cGVfc3JjX3cgLSAxKSk7Ci0JCUk5MTVfV1JJVEUoRFNQUE9TKHBsYW5lKSwgMCk7Ci0JfSBlbHNl IGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSAmJiBwbGFuZSA9PSBQTEFORV9CKSB7Ci0JCUk5 MTVfV1JJVEUoUFJJTVNJWkUocGxhbmUpLAorCQlJOTE1X1dSSVRFKERTUFBPUyhwbGFuZV9pZCks IDApOworCX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikgJiYgcGxhbmVfaWQgPT0g UExBTkVfQikgeworCQlJOTE1X1dSSVRFKFBSSU1TSVpFKHBsYW5lX2lkKSwKIAkJCSAgICgoY3J0 Y19zdGF0ZS0+cGlwZV9zcmNfaCAtIDEpIDw8IDE2KSB8CiAJCQkgICAoY3J0Y19zdGF0ZS0+cGlw ZV9zcmNfdyAtIDEpKTsKLQkJSTkxNV9XUklURShQUklNUE9TKHBsYW5lKSwgMCk7Ci0JCUk5MTVf V1JJVEUoUFJJTUNOU1RBTFBIQShwbGFuZSksIDApOworCQlJOTE1X1dSSVRFKFBSSU1QT1MocGxh bmVfaWQpLCAwKTsKKwkJSTkxNV9XUklURShQUklNQ05TVEFMUEhBKHBsYW5lX2lkKSwgMCk7CiAJ fQogCiAJc3dpdGNoIChmYi0+cGl4ZWxfZm9ybWF0KSB7CkBAIC0zMDk5LDIxICszMDk4LDIxIEBA IHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAq cHJpbWFyeSwKIAlpbnRlbF9jcnRjLT5hZGp1c3RlZF94ID0geDsKIAlpbnRlbF9jcnRjLT5hZGp1 c3RlZF95ID0geTsKIAotCUk5MTVfV1JJVEUocmVnLCBkc3BjbnRyKTsKKwlJOTE1X1dSSVRFKERT UENOVFIocGxhbmVfaWQpLCBkc3BjbnRyKTsKIAotCUk5MTVfV1JJVEUoRFNQU1RSSURFKHBsYW5l KSwgZmItPnBpdGNoZXNbMF0pOworCUk5MTVfV1JJVEUoRFNQU1RSSURFKHBsYW5lX2lkKSwgZmIt PnBpdGNoZXNbMF0pOwogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA0KSB7Ci0JCUk5MTVf V1JJVEUoRFNQU1VSRihwbGFuZSksCisJCUk5MTVfV1JJVEUoRFNQU1VSRihwbGFuZV9pZCksCiAJ CQkgICBpbnRlbF9mYl9ndHRfb2Zmc2V0KGZiLCByb3RhdGlvbikgKwogCQkJICAgaW50ZWxfY3J0 Yy0+ZHNwYWRkcl9vZmZzZXQpOwotCQlJOTE1X1dSSVRFKERTUFRJTEVPRkYocGxhbmUpLCAoeSA8 PCAxNikgfCB4KTsKLQkJSTkxNV9XUklURShEU1BMSU5PRkYocGxhbmUpLCBsaW5lYXJfb2Zmc2V0 KTsKKwkJSTkxNV9XUklURShEU1BUSUxFT0ZGKHBsYW5lX2lkKSwgKHkgPDwgMTYpIHwgeCk7CisJ CUk5MTVfV1JJVEUoRFNQTElOT0ZGKHBsYW5lX2lkKSwgbGluZWFyX29mZnNldCk7CiAJfSBlbHNl IHsKLQkJSTkxNV9XUklURShEU1BBRERSKHBsYW5lKSwKKwkJSTkxNV9XUklURShEU1BBRERSKHBs YW5lX2lkKSwKIAkJCSAgIGludGVsX2ZiX2d0dF9vZmZzZXQoZmIsIHJvdGF0aW9uKSArCiAJCQkg ICBpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldCk7CiAJfQotCVBPU1RJTkdfUkVBRChyZWcpOwor CVBPU1RJTkdfUkVBRChEU1BDTlRSKHBsYW5lX2lkKSk7CiB9CiAKIHN0YXRpYyB2b2lkIGk5eHhf ZGlzYWJsZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCkBAIC0zMTIx LDE1ICszMTIwLDE0IEBAIHN0YXRpYyB2b2lkIGk5eHhfZGlzYWJsZV9wcmltYXJ5X3BsYW5lKHN0 cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNy dGMtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRl dik7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMp OwotCWludCBwbGFuZSA9IGludGVsX2NydGMtPnBsYW5lOworCWVudW0gcGxhbmUgcGxhbmVfaWQg PSB0b19pbnRlbF9wbGFuZShwcmltYXJ5KS0+cGxhbmU7CiAKLQlJOTE1X1dSSVRFKERTUENOVFIo cGxhbmUpLCAwKTsKKwlJOTE1X1dSSVRFKERTUENOVFIocGxhbmVfaWQpLCAwKTsKIAlpZiAoSU5U RUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSA0KQotCQlJOTE1X1dSSVRFKERTUFNVUkYocGxhbmUp LCAwKTsKKwkJSTkxNV9XUklURShEU1BTVVJGKHBsYW5lX2lkKSwgMCk7CiAJZWxzZQotCQlJOTE1 X1dSSVRFKERTUEFERFIocGxhbmUpLCAwKTsKLQlQT1NUSU5HX1JFQUQoRFNQQ05UUihwbGFuZSkp OworCQlJOTE1X1dSSVRFKERTUEFERFIocGxhbmVfaWQpLCAwKTsKKwlQT1NUSU5HX1JFQUQoRFNQ Q05UUihwbGFuZV9pZCkpOwogfQogCiBzdGF0aWMgdm9pZCBpcm9ubGFrZV91cGRhdGVfcHJpbWFy eV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5LApAQCAtMzE0MCwxMCArMzEzOCw5IEBA IHN0YXRpYyB2b2lkIGlyb25sYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxh bmUgKnByaW1hcnksCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShkZXYpOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0Yyhj cnRjX3N0YXRlLT5iYXNlLmNydGMpOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxh bmVfc3RhdGUtPmJhc2UuZmI7Ci0JaW50IHBsYW5lID0gaW50ZWxfY3J0Yy0+cGxhbmU7CisJZW51 bSBwbGFuZSBwbGFuZV9pZCA9IHRvX2ludGVsX3BsYW5lKHByaW1hcnkpLT5wbGFuZTsKIAl1MzIg bGluZWFyX29mZnNldDsKIAl1MzIgZHNwY250cjsKLQlpOTE1X3JlZ190IHJlZyA9IERTUENOVFIo cGxhbmUpOwogCXVuc2lnbmVkIGludCByb3RhdGlvbiA9IHBsYW5lX3N0YXRlLT5iYXNlLnJvdGF0 aW9uOwogCWludCB4ID0gcGxhbmVfc3RhdGUtPmJhc2Uuc3JjLngxID4+IDE2OwogCWludCB5ID0g cGxhbmVfc3RhdGUtPmJhc2Uuc3JjLnkxID4+IDE2OwpAQCAtMzIwMiwxOSArMzE5OSwxOSBAQCBz dGF0aWMgdm9pZCBpcm9ubGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5l ICpwcmltYXJ5LAogCWludGVsX2NydGMtPmFkanVzdGVkX3ggPSB4OwogCWludGVsX2NydGMtPmFk anVzdGVkX3kgPSB5OwogCi0JSTkxNV9XUklURShyZWcsIGRzcGNudHIpOworCUk5MTVfV1JJVEUo RFNQQ05UUihwbGFuZV9pZCksIGRzcGNudHIpOwogCi0JSTkxNV9XUklURShEU1BTVFJJREUocGxh bmUpLCBmYi0+cGl0Y2hlc1swXSk7Ci0JSTkxNV9XUklURShEU1BTVVJGKHBsYW5lKSwKKwlJOTE1 X1dSSVRFKERTUFNUUklERShwbGFuZV9pZCksIGZiLT5waXRjaGVzWzBdKTsKKwlJOTE1X1dSSVRF KERTUFNVUkYocGxhbmVfaWQpLAogCQkgICBpbnRlbF9mYl9ndHRfb2Zmc2V0KGZiLCByb3RhdGlv bikgKwogCQkgICBpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldCk7CiAJaWYgKElTX0hBU1dFTEwo ZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpIHsKLQkJSTkxNV9XUklURShEU1BP RkZTRVQocGxhbmUpLCAoeSA8PCAxNikgfCB4KTsKKwkJSTkxNV9XUklURShEU1BPRkZTRVQocGxh bmVfaWQpLCAoeSA8PCAxNikgfCB4KTsKIAl9IGVsc2UgewotCQlJOTE1X1dSSVRFKERTUFRJTEVP RkYocGxhbmUpLCAoeSA8PCAxNikgfCB4KTsKLQkJSTkxNV9XUklURShEU1BMSU5PRkYocGxhbmUp LCBsaW5lYXJfb2Zmc2V0KTsKKwkJSTkxNV9XUklURShEU1BUSUxFT0ZGKHBsYW5lX2lkKSwgKHkg PDwgMTYpIHwgeCk7CisJCUk5MTVfV1JJVEUoRFNQTElOT0ZGKHBsYW5lX2lkKSwgbGluZWFyX29m ZnNldCk7CiAJfQotCVBPU1RJTkdfUkVBRChyZWcpOworCVBPU1RJTkdfUkVBRChEU1BDTlRSKHBs YW5lX2lkKSk7CiB9CiAKIHUzMiBpbnRlbF9mYl9zdHJpZGVfYWxpZ25tZW50KGNvbnN0IHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK