From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH] drm/i915: unify partial/normal page insertion loops Date: Tue, 15 Mar 2016 16:05:58 +0000 Message-ID: <1458057958-16233-1-git-send-email-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 379F56E701 for ; Tue, 15 Mar 2016 16:06:04 +0000 (UTC) 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 Q2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KU2ln bmVkLW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgfCA0MCArKysrKysrKysrKysrKysrLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMjQg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggYjg1NGFmMi4uMTNjZTJi ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0xNzk4LDYgKzE3OTgsNyBAQCBpbnQgaTkx NV9nZW1fZmF1bHQoc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEsIHN0cnVjdCB2bV9mYXVsdCAq dm1mKQogCXVuc2lnbmVkIGxvbmcgcGZuOwogCWludCByZXQgPSAwOwogCWJvb2wgd3JpdGUgPSAh ISh2bWYtPmZsYWdzICYgRkFVTFRfRkxBR19XUklURSk7CisJdW5zaWduZWQgbG9uZyBiYXNlLCBz aXplOwogCiAJaW50ZWxfcnVudGltZV9wbV9nZXQoZGV2X3ByaXYpOwogCkBAIC0xODU5LDE3ICsx ODYwLDI1IEBAIGludCBpOTE1X2dlbV9mYXVsdChzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSwg c3RydWN0IHZtX2ZhdWx0ICp2bWYpCiAJCWk5MTVfZ2VtX29ial9nZ3R0X29mZnNldF92aWV3KG9i aiwgJnZpZXcpOwogCXBmbiA+Pj0gUEFHRV9TSElGVDsKIAorCWJhc2UgPSB2bWEtPnZtX3N0YXJ0 OworCiAJaWYgKHVubGlrZWx5KHZpZXcudHlwZSA9PSBJOTE1X0dHVFRfVklFV19QQVJUSUFMKSkg eworCQliYXNlICs9IHZpZXcucGFyYW1zLnBhcnRpYWwub2Zmc2V0IDw8IFBBR0VfU0hJRlQ7CisJ CXNpemUgPSB2aWV3LnBhcmFtcy5wYXJ0aWFsLnNpemU7CisJfSBlbHNlIHsKKwkJc2l6ZSA9IG1p bl90KHVuc2lnbmVkIGxvbmcsIHZtYS0+dm1fZW5kIC0gdm1hLT52bV9zdGFydCwKKwkJCSAgICAg b2JqLT5iYXNlLnNpemUpID4+IFBBR0VfU0hJRlQ7CisJfQorCisJaWYgKCFvYmotPmZhdWx0X21h cHBhYmxlIHx8IHZpZXcudHlwZSA9PSBJOTE1X0dHVFRfVklFV19QQVJUSUFMKSB7CisJCXVuc2ln bmVkIGxvbmcgaTsKKwogCQkvKiBPdmVycmlkaW5nIGV4aXN0aW5nIHBhZ2VzIGluIHBhcnRpYWwg dmlldyBkb2VzIG5vdCBjYXVzZQogCQkgKiB1cyBhbnkgdHJvdWJsZSBhcyBUTEJzIGFyZSBzdGls bCB2YWxpZCBiZWNhdXNlIHRoZSBmYXVsdAogCQkgKiBpcyBkdWUgdG8gdXNlcnNwYWNlIGxvc2lu ZyBwYXJ0IG9mIHRoZSBtYXBwaW5nIG9yIG5ldmVyCiAJCSAqIGhhdmluZyBhY2Nlc3NlZCBpdCBi ZWZvcmUgKGF0IHRoaXMgcGFydGlhbHMnIHJhbmdlKS4KIAkJICovCi0JCXVuc2lnbmVkIGxvbmcg YmFzZSA9IHZtYS0+dm1fc3RhcnQgKwotCQkJCSAgICAgKHZpZXcucGFyYW1zLnBhcnRpYWwub2Zm c2V0IDw8IFBBR0VfU0hJRlQpOwotCQl1bnNpZ25lZCBpbnQgaTsKLQotCQlmb3IgKGkgPSAwOyBp IDwgdmlldy5wYXJhbXMucGFydGlhbC5zaXplOyBpKyspIHsKKwkJZm9yIChpID0gMDsgaSA8IHNp emU7IGkrKykgewogCQkJcmV0ID0gdm1faW5zZXJ0X3Bmbih2bWEsIGJhc2UgKyBpICogUEFHRV9T SVpFLCBwZm4gKyBpKTsKIAkJCWlmIChyZXQpCiAJCQkJYnJlYWs7CkBAIC0xODc3LDI1ICsxODg2 LDggQEAgaW50IGk5MTVfZ2VtX2ZhdWx0KHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hLCBzdHJ1 Y3Qgdm1fZmF1bHQgKnZtZikKIAogCQlvYmotPmZhdWx0X21hcHBhYmxlID0gdHJ1ZTsKIAl9IGVs c2UgewotCQlpZiAoIW9iai0+ZmF1bHRfbWFwcGFibGUpIHsKLQkJCXVuc2lnbmVkIGxvbmcgc2l6 ZSA9IG1pbl90KHVuc2lnbmVkIGxvbmcsCi0JCQkJCQkgICB2bWEtPnZtX2VuZCAtIHZtYS0+dm1f c3RhcnQsCi0JCQkJCQkgICBvYmotPmJhc2Uuc2l6ZSk7Ci0JCQlpbnQgaTsKLQotCQkJZm9yIChp ID0gMDsgaSA8IHNpemUgPj4gUEFHRV9TSElGVDsgaSsrKSB7Ci0JCQkJcmV0ID0gdm1faW5zZXJ0 X3Bmbih2bWEsCi0JCQkJCQkgICAgKHVuc2lnbmVkIGxvbmcpdm1hLT52bV9zdGFydCArIGkgKiBQ QUdFX1NJWkUsCi0JCQkJCQkgICAgcGZuICsgaSk7Ci0JCQkJaWYgKHJldCkKLQkJCQkJYnJlYWs7 Ci0JCQl9Ci0KLQkJCW9iai0+ZmF1bHRfbWFwcGFibGUgPSB0cnVlOwotCQl9IGVsc2UKLQkJCXJl dCA9IHZtX2luc2VydF9wZm4odm1hLAotCQkJCQkgICAgKHVuc2lnbmVkIGxvbmcpdm1mLT52aXJ0 dWFsX2FkZHJlc3MsCi0JCQkJCSAgICBwZm4gKyBwYWdlX29mZnNldCk7CisJCXJldCA9IHZtX2lu c2VydF9wZm4odm1hLCAodW5zaWduZWQgbG9uZyl2bWYtPnZpcnR1YWxfYWRkcmVzcywKKwkJCQkg ICAgcGZuICsgcGFnZV9vZmZzZXQpOwogCX0KIHVucGluOgogCWk5MTVfZ2VtX29iamVjdF9nZ3R0 X3VucGluX3ZpZXcob2JqLCAmdmlldyk7Ci0tIAoyLjQuMwoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==