From: Tvrtko Ursulin Subject: [PATCH] drm/i915: Simplify intel_mark_busy/idle Date: Thu, 28 Apr 2016 12:57:00 +0100 Message-ID: <1461844620-35360-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 652E06E311 for ; Thu, 28 Apr 2016 11:57:03 +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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoZXkgdXNl IGRldl9wcml2IGV4Y2x1c2l2ZWx5IHNvIHBhc3MgaXQgaW4gaW5zdGVhZCBvZiBkZXYKZm9yIHNt YWxsZXIgc291cmNlIGFuZCBiaW5hcnkuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8 dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMgICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyB8IDE0ICsrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAg ICAgfCAgNCArKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggOTZmYmM5YWI0MDM5Li44YjEyNWFm YWMzZjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjY1OSw3ICsyNjU5LDcgQEAgdm9p ZCBfX2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0 LAogCXF1ZXVlX2RlbGF5ZWRfd29yayhkZXZfcHJpdi0+d3EsCiAJCQkgICAmZGV2X3ByaXYtPm1t LnJldGlyZV93b3JrLAogCQkJICAgcm91bmRfamlmZmllc191cF9yZWxhdGl2ZShIWikpOwotCWlu dGVsX21hcmtfYnVzeShkZXZfcHJpdi0+ZGV2KTsKKwlpbnRlbF9tYXJrX2J1c3koZGV2X3ByaXYp OwogCiAJLyogU2FuaXR5IGNoZWNrIHRoYXQgdGhlIHJlc2VydmVkIHNpemUgd2FzIGxhcmdlIGVu b3VnaC4gKi8KIAlyZXQgPSBpbnRlbF9yaW5nX2dldF90YWlsKHJpbmdidWYpIC0gcmVxdWVzdF9z dGFydDsKQEAgLTMwNDEsNyArMzA0MSw3IEBAIGk5MTVfZ2VtX2lkbGVfd29ya19oYW5kbGVyKHN0 cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAkgKiBBbHNvIGxvY2tpbmcgc2VlbXMgdG8gYmUgZnVi YXIgaGVyZSwgZW5naW5lLT5yZXF1ZXN0X2xpc3QgaXMgcHJvdGVjdGVkCiAJICogYnkgZGV2LT5z dHJ1Y3RfbXV0ZXguICovCiAKLQlpbnRlbF9tYXJrX2lkbGUoZGV2KTsKKwlpbnRlbF9tYXJrX2lk bGUoZGV2X3ByaXYpOwogCiAJaWYgKG11dGV4X3RyeWxvY2soJmRldi0+c3RydWN0X211dGV4KSkg ewogCQlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdikKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwppbmRleCAyZjM2NDE0NzAyZmUuLmQ1ZGM3OTkzZDg5YiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTA4MDgsMzEgKzEwODA4LDI3IEBAIHN0cnVj dCBkcm1fZGlzcGxheV9tb2RlICppbnRlbF9jcnRjX21vZGVfZ2V0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCiAJcmV0dXJuIG1vZGU7CiB9CiAKLXZvaWQgaW50ZWxfbWFya19idXN5KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCit2b2lkIGludGVsX21hcmtfYnVzeShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKLQogCWlmIChkZXZfcHJpdi0+bW0uYnVzeSkKIAkJcmV0dXJuOwog CiAJaW50ZWxfcnVudGltZV9wbV9nZXQoZGV2X3ByaXYpOwogCWk5MTVfdXBkYXRlX2dmeF92YWwo ZGV2X3ByaXYpOwotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA2KQorCWlmIChJTlRFTF9H RU4oZGV2X3ByaXYpID49IDYpCiAJCWdlbjZfcnBzX2J1c3koZGV2X3ByaXYpOwogCWRldl9wcml2 LT5tbS5idXN5ID0gdHJ1ZTsKIH0KIAotdm9pZCBpbnRlbF9tYXJrX2lkbGUoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKK3ZvaWQgaW50ZWxfbWFya19pZGxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOwotCiAJaWYgKCFkZXZfcHJpdi0+bW0uYnVzeSkKIAkJcmV0dXJuOwogCiAJ ZGV2X3ByaXYtPm1tLmJ1c3kgPSBmYWxzZTsKIAotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+ PSA2KQotCQlnZW42X3Jwc19pZGxlKGRldi0+ZGV2X3ByaXZhdGUpOworCWlmIChJTlRFTF9HRU4o ZGV2X3ByaXYpID49IDYpCisJCWdlbjZfcnBzX2lkbGUoZGV2X3ByaXYpOwogCiAJaW50ZWxfcnVu dGltZV9wbV9wdXQoZGV2X3ByaXYpOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBl MjNlZWQ3OTdmZmEuLjgyOWM2MzNjNzE1NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAg LTExMTcsOCArMTExNyw4IEBAIGV4dGVybiBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGlu dGVsX3BsYW5lX2Z1bmNzOwogdm9pZCBpbnRlbF9pbml0X2Rpc3BsYXlfaG9va3Moc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHVuc2lnbmVkIGludCBpbnRlbF9yb3RhdGlvbl9p bmZvX3NpemUoY29uc3Qgc3RydWN0IGludGVsX3JvdGF0aW9uX2luZm8gKnJvdF9pbmZvKTsKIGJv b2wgaW50ZWxfaGFzX3BlbmRpbmdfZmJfdW5waW4oc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci12 b2lkIGludGVsX21hcmtfYnVzeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKLXZvaWQgaW50ZWxf bWFya19pZGxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwordm9pZCBpbnRlbF9tYXJrX2J1c3ko c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKK3ZvaWQgaW50ZWxfbWFya19pZGxl KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGludGVsX2NydGNfcmVz dG9yZV9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CiBpbnQgaW50ZWxfZGlzcGxheV9zdXNw ZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBpbnRlbF9lbmNvZGVyX2Rlc3Ryb3ko c3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKTsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK