From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH v4 3/3] drm/i915: tidy up a few leftovers Date: Tue, 19 Jan 2016 19:02:55 +0000 Message-ID: <1453230175-19330-4-git-send-email-david.s.gordon@intel.com> References: <1453230175-19330-1-git-send-email-david.s.gordon@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 ESMTP id 7B4796E84B for ; Tue, 19 Jan 2016 11:03:03 -0800 (PST) In-Reply-To: <1453230175-19330-1-git-send-email-david.s.gordon@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 VGhlcmUgYXJlIGEgZmV3IGJpdHMgb2YgY29kZSB3aGljaCB0aGUgdHJhbnNmb3JtYXRpb25zIGlt cGxlbWVudGVkIGJ5CnRoZSBwcmV2aW91cyBwYXRjaCByZXZlYWwgdG8gYmUgc3Vib3B0aW1hbCwg b25jZSB0aGUgbm90aW9uIG9mIGEgcGVyLQpyaW5nIGRlZmF1bHQgY29udGV4dCBoYXMgZ29uZSBh d2F5LiBTbyB0aGlzIHRpZGllcyB1cCB0aGUgbGVmdG92ZXJzLgoKSXQgY291bGQgaGF2ZSBiZWVu IHNxdWFzaGVkIGludG8gdGhlIHByZXZpb3VzIHBhdGNoLCBidXQgdGhhdCB3b3VsZCBoYXZlCm1h ZGUgdGhhdCBwYXRjaCBsZXNzIGNsZWFybHkgYSBzaW1wbGUgdHJhbnNmb3JtYXRpb24uIEluIHBh cnRpY3VsYXIsIGFueQpjaGFuZ2Ugd2hpY2ggYWx0ZXJzIHRoZSBjb2RlIGJsb2NrIHN0cnVjdHVy ZSBvciBpbmRlbnRhdGlvbiBoYXMgYmVlbgpkZWZlcnJlZCBpbnRvIHRoaXMgc2VwYXJhdGUgcGF0 Y2gsIGJlY2F1c2Ugc3VjaCB0aGluZ3MgdGVuZCB0byBtYWtlCmRpZmZzIG1vcmUgZGlmZmljdWx0 IHRvIHJlYWQuCgp2NDoJUmViYXNlZAoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlk LnMuZ29yZG9uQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IE5pY2sgSG9hdGggPG5pY2hvbGFzLmhv YXRoQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8 IDE1ICsrKysrLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAg fCAgNiArKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgIHwgMzggKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAyNCBp bnNlcnRpb25zKCspLCAzNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdm cy5jCmluZGV4IDM3YzJjNTAuLmM1ZGIyMzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdm cy5jCkBAIC0xOTYwLDExICsxOTYwLDggQEAgc3RhdGljIGludCBpOTE1X2NvbnRleHRfc3RhdHVz KHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCiAJCXNlcV9wdXRzKG0sICJIVyBj b250ZXh0ICIpOwogCQlkZXNjcmliZV9jdHgobSwgY3R4KTsKLQkJZm9yX2VhY2hfcmluZyhyaW5n LCBkZXZfcHJpdiwgaSkgewotCQkJaWYgKGRldl9wcml2LT5rZXJuZWxfY29udGV4dCA9PSBjdHgp Ci0JCQkJc2VxX3ByaW50ZihtLCAiKGRlZmF1bHQgY29udGV4dCAlcykgIiwKLQkJCQkJICAgcmlu Zy0+bmFtZSk7Ci0JCX0KKwkJaWYgKGN0eCA9PSBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQpCisJ CQlzZXFfcHJpbnRmKG0sICIoa2VybmVsIGNvbnRleHQpICIpOwogCiAJCWlmIChpOTE1LmVuYWJs ZV9leGVjbGlzdHMpIHsKIAkJCXNlcV9wdXRjKG0sICdcbicpOwpAQCAtMjA1NiwxMiArMjA1Mywx MCBAQCBzdGF0aWMgaW50IGk5MTVfZHVtcF9scmMoc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1 bnVzZWQpCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotCWxpc3RfZm9yX2VhY2hfZW50cnko Y3R4LCAmZGV2X3ByaXYtPmNvbnRleHRfbGlzdCwgbGluaykgewotCQlmb3JfZWFjaF9yaW5nKHJp bmcsIGRldl9wcml2LCBpKSB7Ci0JCQlpZiAoZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0ICE9IGN0 eCkKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KGN0eCwgJmRldl9wcml2LT5jb250ZXh0X2xpc3QsIGxp bmspCisJCWlmIChjdHggIT0gZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0KQorCQkJZm9yX2VhY2hf cmluZyhyaW5nLCBkZXZfcHJpdiwgaSkKIAkJCQlpOTE1X2R1bXBfbHJjX29iaihtLCBjdHgsIHJp bmcpOwotCQl9Ci0JfQogCiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDA2YWJlMWIuLjZhM2U0ZWUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYwpAQCAtMjY3OSwxMCArMjY3OSw4IEBAIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9m cmVlKHN0cnVjdCBrcmVmICpyZXFfcmVmKQogCQlpOTE1X2dlbV9yZXF1ZXN0X3JlbW92ZV9mcm9t X2NsaWVudChyZXEpOwogCiAJaWYgKGN0eCkgewotCQlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3Rz KSB7Ci0JCQlpZiAoY3R4ICE9IHJlcS0+aTkxNS0+a2VybmVsX2NvbnRleHQpCi0JCQkJaW50ZWxf bHJfY29udGV4dF91bnBpbihyZXEpOwotCQl9CisJCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMg JiYgY3R4ICE9IHJlcS0+aTkxNS0+a2VybmVsX2NvbnRleHQpCisJCQlpbnRlbF9scl9jb250ZXh0 X3VucGluKHJlcSk7CiAKIAkJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShjdHgpOwogCX0K ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggMmM2ZGE0MC4uMTM0Mzc5ZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmMKQEAgLTY4NiwxNiArNjg2LDEwIEBAIHN0YXRpYyBpbnQgZXhlY2xp c3RzX21vdmVfdG9fZ3B1KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCiBpbnQg aW50ZWxfbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxdWVzdCkKIHsKLQlpbnQgcmV0OworCWludCByZXQgPSAwOwogCiAJcmVx dWVzdC0+cmluZ2J1ZiA9IHJlcXVlc3QtPmN0eC0+ZW5naW5lW3JlcXVlc3QtPnJpbmctPmlkXS5y aW5nYnVmOwogCi0JaWYgKHJlcXVlc3QtPmN0eCAhPSByZXF1ZXN0LT5pOTE1LT5rZXJuZWxfY29u dGV4dCkgewotCQlyZXQgPSBpbnRlbF9scl9jb250ZXh0X3BpbihyZXF1ZXN0KTsKLQkJaWYgKHJl dCkKLQkJCXJldHVybiByZXQ7Ci0JfQotCiAJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9u KSB7CiAJCS8qCiAJCSAqIENoZWNrIHRoYXQgdGhlIEd1QyBoYXMgc3BhY2UgZm9yIHRoZSByZXF1 ZXN0IGJlZm9yZQpAQCAtNzA5LDcgKzcwMywxMCBAQCBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2Fs bG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdAog CQkJcmV0dXJuIHJldDsKIAl9CiAKLQlyZXR1cm4gMDsKKwlpZiAocmVxdWVzdC0+Y3R4ICE9IHJl cXVlc3QtPmk5MTUtPmtlcm5lbF9jb250ZXh0KQorCQlyZXQgPSBpbnRlbF9scl9jb250ZXh0X3Bp bihyZXF1ZXN0KTsKKworCXJldHVybiByZXQ7CiB9CiAKIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5n X3dhaXRfZm9yX3NwYWNlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLApAQCAtMjM5 MSwyMiArMjM4OCwyMSBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRfZnJlZShzdHJ1Y3QgaW50ZWxf Y29udGV4dCAqY3R4KQogewogCWludCBpOwogCi0JZm9yIChpID0gMDsgaSA8IEk5MTVfTlVNX1JJ TkdTOyBpKyspIHsKKwlmb3IgKGkgPSBJOTE1X05VTV9SSU5HUzsgLS1pID49IDA7ICkgeworCQlz dHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IGN0eC0+ZW5naW5lW2ldLnJpbmdidWY7 CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0gY3R4LT5lbmdpbmVbaV0u c3RhdGU7CiAKLQkJaWYgKGN0eF9vYmopIHsKLQkJCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpy aW5nYnVmID0KLQkJCQkJY3R4LT5lbmdpbmVbaV0ucmluZ2J1ZjsKLQkJCXN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcgPSByaW5nYnVmLT5yaW5nOworCQlpZiAoIWN0eF9vYmopCisJCQljb250 aW51ZTsKIAotCQkJaWYgKGN0eCA9PSBjdHgtPmk5MTUtPmtlcm5lbF9jb250ZXh0KSB7Ci0JCQkJ aW50ZWxfdW5waW5fcmluZ2J1ZmZlcl9vYmoocmluZ2J1Zik7Ci0JCQkJaTkxNV9nZW1fb2JqZWN0 X2dndHRfdW5waW4oY3R4X29iaik7Ci0JCQl9Ci0JCQlXQVJOX09OKGN0eC0+ZW5naW5lW3Jpbmct PmlkXS5waW5fY291bnQpOwotCQkJaW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHJpbmdidWYpOwotCQkJ ZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJmN0eF9vYmotPmJhc2UpOworCQlpZiAoY3R4ID09 IGN0eC0+aTkxNS0+a2VybmVsX2NvbnRleHQpIHsKKwkJCWludGVsX3VucGluX3JpbmdidWZmZXJf b2JqKHJpbmdidWYpOworCQkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oY3R4X29iaik7CiAJ CX0KKworCQlXQVJOX09OKGN0eC0+ZW5naW5lW2ldLnBpbl9jb3VudCk7CisJCWludGVsX3Jpbmdi dWZmZXJfZnJlZShyaW5nYnVmKTsKKwkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJmN0eF9v YmotPmJhc2UpOwogCX0KIH0KIApAQCAtMjQ4MSw3ICsyNDc3LDcgQEAgc3RhdGljIHZvaWQgbHJj X3NldHVwX2hhcmR3YXJlX3N0YXR1c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcs CiAgKi8KIAogaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfYWxsb2Moc3RydWN0IGludGVs X2NvbnRleHQgKmN0eCwKLQkJCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCisJ CQkJICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiB7CiAJc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IHJpbmctPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29i ajsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=