From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 7/9] drm/i915: Move some variables to tighter scope Date: Tue, 12 Mar 2019 22:58:42 +0200 Message-ID: <20190312205844.6339-8-ville.syrjala@linux.intel.com> References: <20190312205844.6339-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 C21526E032 for ; Tue, 12 Mar 2019 20:59:10 +0000 (UTC) In-Reply-To: <20190312205844.6339-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkNs ZWFuIHVwIHNrbF9hbGxvY2F0ZV9waXBlX2RkYigpIGEgYml0IGJ5IG1vdmluZyB0aGUgJ3dtJyB2 YXJpYWJsZQp0byB0aWdodGVyIHNjb3BlLiBXZSdsbCBhbHNvIGNvbnNpdGlmeSBpdCB3aGVyZSBh cHByb3ByaWF0ZS4KCkNjOiBOZWVsIERlc2FpIDxuZWVsLmRlc2FpQGludGVsLmNvbT4KU2lnbmVk LW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgMjMgKysrKysrKysrKysrKy0t LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCA4YWZiYzU2YWQ4OWEuLmI5NThhMWEwMDAx NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC00MzM2LDcgKzQzMzYsNiBAQCBza2xfYWxs b2NhdGVfcGlwZV9kZGIoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmRldik7CiAJc3RydWN0 IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCXN0cnVjdCBz a2xfZGRiX2VudHJ5ICphbGxvYyA9ICZjc3RhdGUtPndtLnNrbC5kZGI7Ci0Jc3RydWN0IHNrbF9w bGFuZV93bSAqd207CiAJdTE2IGFsbG9jX3NpemUsIHN0YXJ0ID0gMDsKIAl1MTYgdG90YWxbSTkx NV9NQVhfUExBTkVTXSA9IHt9OwogCXUxNiB1dl90b3RhbFtJOTE1X01BWF9QTEFORVNdID0ge307 CkBAIC00MzkzLDcgKzQzOTIsOCBAQCBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNzdGF0ZSwKIAlmb3IgKGxldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXZf cHJpdik7IGxldmVsID49IDA7IGxldmVsLS0pIHsKIAkJYmxvY2tzID0gMDsKIAkJZm9yX2VhY2hf cGxhbmVfaWRfb25fY3J0YyhpbnRlbF9jcnRjLCBwbGFuZV9pZCkgewotCQkJd20gPSAmY3N0YXRl LT53bS5za2wub3B0aW1hbC5wbGFuZXNbcGxhbmVfaWRdOworCQkJY29uc3Qgc3RydWN0IHNrbF9w bGFuZV93bSAqd20gPQorCQkJCSZjc3RhdGUtPndtLnNrbC5vcHRpbWFsLnBsYW5lc1twbGFuZV9p ZF07CiAKIAkJCWlmIChwbGFuZV9pZCA9PSBQTEFORV9DVVJTT1IpIHsKIAkJCQlpZiAoV0FSTl9P Tih3bS0+d21bbGV2ZWxdLm1pbl9kZGJfYWxsb2MgPgpAQCAtNDQyNyw2ICs0NDI3LDggQEAgc2ts X2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJICog cHJvcG9ydGlvbmFsIHRvIGl0cyByZWxhdGl2ZSBkYXRhIHJhdGUuCiAJICovCiAJZm9yX2VhY2hf cGxhbmVfaWRfb25fY3J0YyhpbnRlbF9jcnRjLCBwbGFuZV9pZCkgeworCQljb25zdCBzdHJ1Y3Qg c2tsX3BsYW5lX3dtICp3bSA9CisJCQkmY3N0YXRlLT53bS5za2wub3B0aW1hbC5wbGFuZXNbcGxh bmVfaWRdOwogCQl1NjQgcmF0ZTsKIAkJdTE2IGV4dHJhOwogCkBAIC00NDQwLDggKzQ0NDIsNiBA QCBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwK IAkJaWYgKHRvdGFsX2RhdGFfcmF0ZSA9PSAwKQogCQkJYnJlYWs7CiAKLQkJd20gPSAmY3N0YXRl LT53bS5za2wub3B0aW1hbC5wbGFuZXNbcGxhbmVfaWRdOwotCiAJCXJhdGUgPSBwbGFuZV9kYXRh X3JhdGVbcGxhbmVfaWRdOwogCQlleHRyYSA9IG1pbl90KHUxNiwgYWxsb2Nfc2l6ZSwKIAkJCSAg ICAgIERJVjY0X1U2NF9ST1VORF9VUChhbGxvY19zaXplICogcmF0ZSwKQEAgLTQ0NjYsMTQgKzQ0 NjYsMTQgQEAgc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj c3RhdGUsCiAJLyogU2V0IHRoZSBhY3R1YWwgRERCIHN0YXJ0L2VuZCBwb2ludHMgZm9yIGVhY2gg cGxhbmUgKi8KIAlzdGFydCA9IGFsbG9jLT5zdGFydDsKIAlmb3JfZWFjaF9wbGFuZV9pZF9vbl9j cnRjKGludGVsX2NydGMsIHBsYW5lX2lkKSB7Ci0JCXN0cnVjdCBza2xfZGRiX2VudHJ5ICpwbGFu ZV9hbGxvYywgKnV2X3BsYW5lX2FsbG9jOworCQlzdHJ1Y3Qgc2tsX2RkYl9lbnRyeSAqcGxhbmVf YWxsb2MgPQorCQkJJmNzdGF0ZS0+d20uc2tsLnBsYW5lX2RkYl95W3BsYW5lX2lkXTsKKwkJc3Ry dWN0IHNrbF9kZGJfZW50cnkgKnV2X3BsYW5lX2FsbG9jID0KKwkJCSZjc3RhdGUtPndtLnNrbC5w bGFuZV9kZGJfdXZbcGxhbmVfaWRdOwogCiAJCWlmIChwbGFuZV9pZCA9PSBQTEFORV9DVVJTT1Ip CiAJCQljb250aW51ZTsKIAotCQlwbGFuZV9hbGxvYyA9ICZjc3RhdGUtPndtLnNrbC5wbGFuZV9k ZGJfeVtwbGFuZV9pZF07Ci0JCXV2X3BsYW5lX2FsbG9jID0gJmNzdGF0ZS0+d20uc2tsLnBsYW5l X2RkYl91dltwbGFuZV9pZF07Ci0KIAkJLyogR2VuMTErIHVzZXMgYSBzZXBhcmF0ZSBwbGFuZSBm b3IgVVYgd2F0ZXJtYXJrcyAqLwogCQlXQVJOX09OKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEg JiYgdXZfdG90YWxbcGxhbmVfaWRdKTsKIApAQCAtNDQ5OSw3ICs0NDk5LDggQEAgc2tsX2FsbG9j YXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJICovCiAJZm9y IChsZXZlbCsrOyBsZXZlbCA8PSBpbGtfd21fbWF4X2xldmVsKGRldl9wcml2KTsgbGV2ZWwrKykg ewogCQlmb3JfZWFjaF9wbGFuZV9pZF9vbl9jcnRjKGludGVsX2NydGMsIHBsYW5lX2lkKSB7Ci0J CQl3bSA9ICZjc3RhdGUtPndtLnNrbC5vcHRpbWFsLnBsYW5lc1twbGFuZV9pZF07CisJCQlzdHJ1 Y3Qgc2tsX3BsYW5lX3dtICp3bSA9CisJCQkJJmNzdGF0ZS0+d20uc2tsLm9wdGltYWwucGxhbmVz W3BsYW5lX2lkXTsKIAogCQkJLyoKIAkJCSAqIFdlIG9ubHkgZGlzYWJsZSB0aGUgd2F0ZXJtYXJr cyBmb3IgZWFjaCBwbGFuZSBpZgpAQCAtNDUzNSw3ICs0NTM2LDkgQEAgc2tsX2FsbG9jYXRlX3Bp cGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJICogZG9uJ3QgaGF2ZSBl bm91Z2ggRERCIGJsb2NrcyBmb3IgaXQuCiAJICovCiAJZm9yX2VhY2hfcGxhbmVfaWRfb25fY3J0 YyhpbnRlbF9jcnRjLCBwbGFuZV9pZCkgewotCQl3bSA9ICZjc3RhdGUtPndtLnNrbC5vcHRpbWFs LnBsYW5lc1twbGFuZV9pZF07CisJCXN0cnVjdCBza2xfcGxhbmVfd20gKndtID0KKwkJCSZjc3Rh dGUtPndtLnNrbC5vcHRpbWFsLnBsYW5lc1twbGFuZV9pZF07CisKIAkJaWYgKHdtLT50cmFuc193 bS5wbGFuZV9yZXNfYiA+PSB0b3RhbFtwbGFuZV9pZF0pCiAJCQltZW1zZXQoJndtLT50cmFuc193 bSwgMCwgc2l6ZW9mKHdtLT50cmFuc193bSkpOwogCX0KLS0gCjIuMTkuMgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4