From: Ville Syrjala Subject: [PATCH v2 13/13] drm/i915: Rename variables in intel_primary_plane_create() Date: Wed, 30 May 2018 20:16:01 +0300 Message-ID: <20180530171601.19073-4-ville.syrjala@linux.intel.com> References: <20180530165933.11424-1-ville.syrjala@linux.intel.com> <20180530171601.19073-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 586A56EDD7 for ; Wed, 30 May 2018 17:16:15 +0000 (UTC) In-Reply-To: <20180530171601.19073-1-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkxl dCdzIHRyeSB0byBzdGljayBhIGNvbW1vbiBuYW1pbmcgcGF0dGVybiBpbiBhbGwgdGhlIHBsYW5l IGluaXQgZnVuY3MuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmph bGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyB8IDg2ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDQyIGluc2VydGlvbnMoKyksIDQ0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwppbmRleCA2ODQ1MTRjM2ZiNWMuLmQyMjY0YzA1NTlkZCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTMzMjQsODggKzEzMzI0LDg2IEBAIHN0 YXRpYyBib29sIGk5eHhfcGxhbmVfaGFzX2ZiYyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiBzdGF0aWMgc3RydWN0IGludGVsX3BsYW5lICoKIGludGVsX3ByaW1hcnlfcGxhbmVf Y3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUp CiB7Ci0Jc3RydWN0IGludGVsX3BsYW5lICpwcmltYXJ5OwotCWNvbnN0IHVpbnQzMl90ICppbnRl bF9wcmltYXJ5X2Zvcm1hdHM7CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZTsKIAl1bnNpZ25l ZCBpbnQgc3VwcG9ydGVkX3JvdGF0aW9uczsKIAl1bnNpZ25lZCBpbnQgcG9zc2libGVfY3J0Y3M7 Ci0JdW5zaWduZWQgaW50IG51bV9mb3JtYXRzOwotCWNvbnN0IHVpbnQ2NF90ICptb2RpZmllcnM7 CisJY29uc3QgdTY0ICptb2RpZmllcnM7CisJY29uc3QgdTMyICpmb3JtYXRzOworCWludCBudW1f Zm9ybWF0czsKIAlpbnQgcmV0OwogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkgewot CQlwcmltYXJ5ID0gc2tsX3VuaXZlcnNhbF9wbGFuZV9jcmVhdGUoZGV2X3ByaXYsIHBpcGUsCi0J CQkJCQkgICAgIFBMQU5FX1BSSU1BUlkpOwotCQlpZiAoSVNfRVJSKHByaW1hcnkpKQotCQkJcmV0 dXJuIHByaW1hcnk7CisJCXBsYW5lID0gc2tsX3VuaXZlcnNhbF9wbGFuZV9jcmVhdGUoZGV2X3By aXYsIHBpcGUsCisJCQkJCQkgICBQTEFORV9QUklNQVJZKTsKKwkJaWYgKElTX0VSUihwbGFuZSkp CisJCQlyZXR1cm4gcGxhbmU7CiAKIAkJLyogRklYTUUgdW5pZnkgKi8KLQkJcHJpbWFyeS0+Y2hl Y2tfcGxhbmUgPSBpbnRlbF9jaGVja19wcmltYXJ5X3BsYW5lOworCQlwbGFuZS0+Y2hlY2tfcGxh bmUgPSBpbnRlbF9jaGVja19wcmltYXJ5X3BsYW5lOwogCi0JCXJldHVybiBwcmltYXJ5OworCQly ZXR1cm4gcGxhbmU7CiAJfQogCi0JcHJpbWFyeSA9IGludGVsX3BsYW5lX2FsbG9jKCk7Ci0JaWYg KElTX0VSUihwcmltYXJ5KSkKLQkJcmV0dXJuIHByaW1hcnk7CisJcGxhbmUgPSBpbnRlbF9wbGFu ZV9hbGxvYygpOworCWlmIChJU19FUlIocGxhbmUpKQorCQlyZXR1cm4gcGxhbmU7CiAKLQlwcmlt YXJ5LT5jYW5fc2NhbGUgPSBmYWxzZTsKLQlwcmltYXJ5LT5tYXhfZG93bnNjYWxlID0gMTsKLQlw cmltYXJ5LT5waXBlID0gcGlwZTsKKwlwbGFuZS0+Y2FuX3NjYWxlID0gZmFsc2U7CisJcGxhbmUt Pm1heF9kb3duc2NhbGUgPSAxOworCXBsYW5lLT5waXBlID0gcGlwZTsKIAkvKgogCSAqIE9uIGdl bjIvMyBvbmx5IHBsYW5lIEEgY2FuIGRvIEZCQywgYnV0IHRoZSBwYW5lbCBmaXR0ZXIgYW5kIExW RFMKIAkgKiBwb3J0IGlzIGhvb2tlZCB0byBwaXBlIEIuIEhlbmNlIHdlIHdhbnQgcGxhbmUgQSBm ZWVkaW5nIHBpcGUgQi4KIAkgKi8KIAlpZiAoSEFTX0ZCQyhkZXZfcHJpdikgJiYgSU5URUxfR0VO KGRldl9wcml2KSA8IDQpCi0JCXByaW1hcnktPmk5eHhfcGxhbmUgPSAoZW51bSBpOXh4X3BsYW5l X2lkKSAhcGlwZTsKKwkJcGxhbmUtPmk5eHhfcGxhbmUgPSAoZW51bSBpOXh4X3BsYW5lX2lkKSAh cGlwZTsKIAllbHNlCi0JCXByaW1hcnktPmk5eHhfcGxhbmUgPSAoZW51bSBpOXh4X3BsYW5lX2lk KSBwaXBlOwotCXByaW1hcnktPmlkID0gUExBTkVfUFJJTUFSWTsKLQlwcmltYXJ5LT5mcm9udGJ1 ZmZlcl9iaXQgPSBJTlRFTF9GUk9OVEJVRkZFUihwaXBlLCBwcmltYXJ5LT5pZCk7CisJCXBsYW5l LT5pOXh4X3BsYW5lID0gKGVudW0gaTl4eF9wbGFuZV9pZCkgcGlwZTsKKwlwbGFuZS0+aWQgPSBQ TEFORV9QUklNQVJZOworCXBsYW5lLT5mcm9udGJ1ZmZlcl9iaXQgPSBJTlRFTF9GUk9OVEJVRkZF UihwaXBlLCBwbGFuZS0+aWQpOwogCi0JcHJpbWFyeS0+aGFzX2ZiYyA9IGk5eHhfcGxhbmVfaGFz X2ZiYyhkZXZfcHJpdiwgcHJpbWFyeS0+aTl4eF9wbGFuZSk7Ci0JaWYgKHByaW1hcnktPmhhc19m YmMpIHsKKwlwbGFuZS0+aGFzX2ZiYyA9IGk5eHhfcGxhbmVfaGFzX2ZiYyhkZXZfcHJpdiwgcGxh bmUtPmk5eHhfcGxhbmUpOworCWlmIChwbGFuZS0+aGFzX2ZiYykgewogCQlzdHJ1Y3QgaW50ZWxf ZmJjICpmYmMgPSAmZGV2X3ByaXYtPmZiYzsKIAotCQlmYmMtPnBvc3NpYmxlX2ZyYW1lYnVmZmVy X2JpdHMgfD0gcHJpbWFyeS0+ZnJvbnRidWZmZXJfYml0OworCQlmYmMtPnBvc3NpYmxlX2ZyYW1l YnVmZmVyX2JpdHMgfD0gcGxhbmUtPmZyb250YnVmZmVyX2JpdDsKIAl9CiAKLQlwcmltYXJ5LT5j aGVja19wbGFuZSA9IGludGVsX2NoZWNrX3ByaW1hcnlfcGxhbmU7CisJcGxhbmUtPmNoZWNrX3Bs YW5lID0gaW50ZWxfY2hlY2tfcHJpbWFyeV9wbGFuZTsKIAogCWlmIChJTlRFTF9HRU4oZGV2X3By aXYpID49IDQpIHsKLQkJaW50ZWxfcHJpbWFyeV9mb3JtYXRzID0gaTk2NV9wcmltYXJ5X2Zvcm1h dHM7CisJCWZvcm1hdHMgPSBpOTY1X3ByaW1hcnlfZm9ybWF0czsKIAkJbnVtX2Zvcm1hdHMgPSBB UlJBWV9TSVpFKGk5NjVfcHJpbWFyeV9mb3JtYXRzKTsKIAkJbW9kaWZpZXJzID0gaTl4eF9mb3Jt YXRfbW9kaWZpZXJzOwogCi0JCXByaW1hcnktPnVwZGF0ZV9wbGFuZSA9IGk5eHhfdXBkYXRlX3Bs YW5lOwotCQlwcmltYXJ5LT5kaXNhYmxlX3BsYW5lID0gaTl4eF9kaXNhYmxlX3BsYW5lOwotCQlw cmltYXJ5LT5nZXRfaHdfc3RhdGUgPSBpOXh4X3BsYW5lX2dldF9od19zdGF0ZTsKKwkJcGxhbmUt PnVwZGF0ZV9wbGFuZSA9IGk5eHhfdXBkYXRlX3BsYW5lOworCQlwbGFuZS0+ZGlzYWJsZV9wbGFu ZSA9IGk5eHhfZGlzYWJsZV9wbGFuZTsKKwkJcGxhbmUtPmdldF9od19zdGF0ZSA9IGk5eHhfcGxh bmVfZ2V0X2h3X3N0YXRlOwogCX0gZWxzZSB7Ci0JCWludGVsX3ByaW1hcnlfZm9ybWF0cyA9IGk4 eHhfcHJpbWFyeV9mb3JtYXRzOworCQlmb3JtYXRzID0gaTh4eF9wcmltYXJ5X2Zvcm1hdHM7CiAJ CW51bV9mb3JtYXRzID0gQVJSQVlfU0laRShpOHh4X3ByaW1hcnlfZm9ybWF0cyk7CiAJCW1vZGlm aWVycyA9IGk5eHhfZm9ybWF0X21vZGlmaWVyczsKIAotCQlwcmltYXJ5LT51cGRhdGVfcGxhbmUg PSBpOXh4X3VwZGF0ZV9wbGFuZTsKLQkJcHJpbWFyeS0+ZGlzYWJsZV9wbGFuZSA9IGk5eHhfZGlz YWJsZV9wbGFuZTsKLQkJcHJpbWFyeS0+Z2V0X2h3X3N0YXRlID0gaTl4eF9wbGFuZV9nZXRfaHdf c3RhdGU7CisJCXBsYW5lLT51cGRhdGVfcGxhbmUgPSBpOXh4X3VwZGF0ZV9wbGFuZTsKKwkJcGxh bmUtPmRpc2FibGVfcGxhbmUgPSBpOXh4X2Rpc2FibGVfcGxhbmU7CisJCXBsYW5lLT5nZXRfaHdf c3RhdGUgPSBpOXh4X3BsYW5lX2dldF9od19zdGF0ZTsKIAl9CiAKIAlwb3NzaWJsZV9jcnRjcyA9 IEJJVChwaXBlKTsKIAogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDUgfHwgSVNfRzRYKGRl dl9wcml2KSkKLQkJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KCZkZXZfcHJpdi0+ZHJt LCAmcHJpbWFyeS0+YmFzZSwKKwkJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KCZkZXZf cHJpdi0+ZHJtLCAmcGxhbmUtPmJhc2UsCiAJCQkJCSAgICAgICBwb3NzaWJsZV9jcnRjcywgJmk5 eHhfcGxhbmVfZnVuY3MsCi0JCQkJCSAgICAgICBpbnRlbF9wcmltYXJ5X2Zvcm1hdHMsIG51bV9m b3JtYXRzLAotCQkJCQkgICAgICAgbW9kaWZpZXJzLAorCQkJCQkgICAgICAgZm9ybWF0cywgbnVt X2Zvcm1hdHMsIG1vZGlmaWVycywKIAkJCQkJICAgICAgIERSTV9QTEFORV9UWVBFX1BSSU1BUlks CiAJCQkJCSAgICAgICAicHJpbWFyeSAlYyIsIHBpcGVfbmFtZShwaXBlKSk7CiAJZWxzZQotCQly ZXQgPSBkcm1fdW5pdmVyc2FsX3BsYW5lX2luaXQoJmRldl9wcml2LT5kcm0sICZwcmltYXJ5LT5i YXNlLAorCQlyZXQgPSBkcm1fdW5pdmVyc2FsX3BsYW5lX2luaXQoJmRldl9wcml2LT5kcm0sICZw bGFuZS0+YmFzZSwKIAkJCQkJICAgICAgIHBvc3NpYmxlX2NydGNzLCAmaTl4eF9wbGFuZV9mdW5j cywKLQkJCQkJICAgICAgIGludGVsX3ByaW1hcnlfZm9ybWF0cywgbnVtX2Zvcm1hdHMsCi0JCQkJ CSAgICAgICBtb2RpZmllcnMsCisJCQkJCSAgICAgICBmb3JtYXRzLCBudW1fZm9ybWF0cywgbW9k aWZpZXJzLAogCQkJCQkgICAgICAgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSwKIAkJCQkJICAgICAg ICJwbGFuZSAlYyIsCi0JCQkJCSAgICAgICBwbGFuZV9uYW1lKHByaW1hcnktPmk5eHhfcGxhbmUp KTsKKwkJCQkJICAgICAgIHBsYW5lX25hbWUocGxhbmUtPmk5eHhfcGxhbmUpKTsKIAlpZiAocmV0 KQogCQlnb3RvIGZhaWw7CiAKQEAgLTEzNDIxLDEyICsxMzQxOSwxMiBAQCBpbnRlbF9wcmltYXJ5 X3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcGlw ZSBwaXBlKQogCX0KIAogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDQpCi0JCWRybV9wbGFu ZV9jcmVhdGVfcm90YXRpb25fcHJvcGVydHkoJnByaW1hcnktPmJhc2UsCisJCWRybV9wbGFuZV9j cmVhdGVfcm90YXRpb25fcHJvcGVydHkoJnBsYW5lLT5iYXNlLAogCQkJCQkJICAgRFJNX01PREVf Uk9UQVRFXzAsCiAJCQkJCQkgICBzdXBwb3J0ZWRfcm90YXRpb25zKTsKIAogCWlmIChJTlRFTF9H RU4oZGV2X3ByaXYpID49IDkpCi0JCWRybV9wbGFuZV9jcmVhdGVfY29sb3JfcHJvcGVydGllcygm cHJpbWFyeS0+YmFzZSwKKwkJZHJtX3BsYW5lX2NyZWF0ZV9jb2xvcl9wcm9wZXJ0aWVzKCZwbGFu ZS0+YmFzZSwKIAkJCQkJCSAgQklUKERSTV9DT0xPUl9ZQ0JDUl9CVDYwMSkgfAogCQkJCQkJICBC SVQoRFJNX0NPTE9SX1lDQkNSX0JUNzA5KSwKIAkJCQkJCSAgQklUKERSTV9DT0xPUl9ZQ0JDUl9M SU1JVEVEX1JBTkdFKSB8CkBAIC0xMzQzNCwxMiArMTM0MzIsMTIgQEAgaW50ZWxfcHJpbWFyeV9w bGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBpcGUg cGlwZSkKIAkJCQkJCSAgRFJNX0NPTE9SX1lDQkNSX0JUNzA5LAogCQkJCQkJICBEUk1fQ09MT1Jf WUNCQ1JfTElNSVRFRF9SQU5HRSk7CiAKLQlkcm1fcGxhbmVfaGVscGVyX2FkZCgmcHJpbWFyeS0+ YmFzZSwgJmludGVsX3BsYW5lX2hlbHBlcl9mdW5jcyk7CisJZHJtX3BsYW5lX2hlbHBlcl9hZGQo JnBsYW5lLT5iYXNlLCAmaW50ZWxfcGxhbmVfaGVscGVyX2Z1bmNzKTsKIAotCXJldHVybiBwcmlt YXJ5OworCXJldHVybiBwbGFuZTsKIAogZmFpbDoKLQlpbnRlbF9wbGFuZV9mcmVlKHByaW1hcnkp OworCWludGVsX3BsYW5lX2ZyZWUocGxhbmUpOwogCiAJcmV0dXJuIEVSUl9QVFIocmV0KTsKIH0K LS0gCjIuMTYuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==