From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH 12/15] drm/i915: Split full retries loop out of clock recovery code Date: Mon, 5 Oct 2015 10:01:24 +0300 Message-ID: <1444028487-6501-13-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1444028487-6501-1-git-send-email-ander.conselvan.de.oliveira@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 66E066E524 for ; Mon, 5 Oct 2015 00:02:16 -0700 (PDT) In-Reply-To: <1444028487-6501-1-git-send-email-ander.conselvan.de.oliveira@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 Cc: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org V2hlbiBhIGZhaWx1cmUgdG8gYWNoaWV2ZSBjbG9jayByZWNvdmVyeSBoYXBwZW5zLCB0aGUgbGlu ayB0cmFpbmluZyBjb2RlCnJlcGVhdHMgdGhlIHRyYWluaW5nIHByb2Nlc3Mgc3RhcnRpbmcgd2l0 aCBpbml0aWFsIHZhbHVlcyB1cCB0byBmaXZlCnRpbWVzIGJlZm9yZSBnaXZpbmcgdXAuIFRoZSBs b2dpYyBmb3IgdGhlIHNvIGNhbGxlZCAiZnVsbCByZXRyaWVzIiBhbmQKdGhlICJ2b2x0YWdlIHRy aWVzIiB3YXMgY29udm9sdXRlZCBpbnRvIGEgc2luZ2xlIGxvb3AuIFRoaXMgcGF0Y2ggc3BsaXRz Cml0IGludG8gdHdvIHNlcGFyYXRlIGxvb3BzLCBtYWtpbmcgaXQgZWFzaWVyIHRvIGZvbGxvdy4K Ck5vdGUgdGhhdCBwcmlvciB0byB0aGlzIHBhdGNoLCBhIGZhaWx1cmUgdG8gZ2V0IGNsb2NrIHJl Y292ZXJ5IHdpdGgKcHJldmlvdXNseSBrbm93IGdvb2QgdmFsdWVzIHdvdWxkbid0IGNvdW50IGFz IGEgdm9sdGFnZSBvciBmdWxsIHJldHJ5CmZhaWx1cmUsIGJ1dCBub3cgdGhhdCBjb3VudHMgYXMg YSBmdWxsIHJldHJ5IGZhaWx1cmUuCgpTaWduZWQtb2ZmLWJ5OiBBbmRlciBDb25zZWx2YW4gZGUg T2xpdmVpcmEgPGFuZGVyLmNvbnNlbHZhbi5kZS5vbGl2ZWlyYUBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbGlua190cmFpbmluZy5jIHwgNzUgKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzUgaW5zZXJ0aW9ucygrKSwgNDAg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBf bGlua190cmFpbmluZy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbGlua190cmFp bmluZy5jCmluZGV4IGNkMTZkNjUuLjhiMjA5NzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RwX2xpbmtfdHJhaW5pbmcuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcF9saW5rX3RyYWluaW5nLmMKQEAgLTEzMiwxNCArMTMyLDYgQEAgc2V0dXBfY2xv Y2tfcmVjb3Zlcnkoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAogCWludGVsX2RwLT5EUCB8 PSBEUF9QT1JUX0VOOwogCi0JLyogY2xvY2sgcmVjb3ZlcnkgKi8KLQlpZiAoIWludGVsX2RwX3Jl c2V0X2xpbmtfdHJhaW4oaW50ZWxfZHAsCi0JCQkJICAgICAgIERQX1RSQUlOSU5HX1BBVFRFUk5f MSB8Ci0JCQkJICAgICAgIERQX0xJTktfU0NSQU1CTElOR19ESVNBQkxFKSkgewotCQlEUk1fRVJS T1IoImZhaWxlZCB0byBlbmFibGUgbGluayB0cmFpbmluZ1xuIik7Ci0JCXJldHVybiBmYWxzZTsK LQl9Ci0KIAlyZXR1cm4gdHJ1ZTsKIH0KIApAQCAtMTYxLDIwICsxNTMsMTMgQEAgaW50ZWxfZHBf Z2V0X3RyYWluX3ZvbHRhZ2Uoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAlyZXR1cm4gaW50 ZWxfZHAtPnRyYWluX3NldFswXSAmIERQX1RSQUlOX1ZPTFRBR0VfU1dJTkdfTUFTSzsKIH0KIAot LyogRW5hYmxlIGNvcnJlc3BvbmRpbmcgcG9ydCBhbmQgc3RhcnQgdHJhaW5pbmcgcGF0dGVybiAx ICovCiBzdGF0aWMgYm9vbAotaW50ZWxfZHBfbGlua190cmFpbmluZ19jbG9ja19yZWNvdmVyeShz dHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQorY2xvY2tfcmVjb3Zlcnlfdm9sdGFnZV9zdGVwKHN0 cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiB7Ci0JdWludDhfdCB2b2x0YWdlOwotCWludCB2b2x0 YWdlX3RyaWVzLCBsb29wX3RyaWVzOworCWludCB2b2x0YWdlX3RyaWVzID0gMDsKKwl1aW50OF90 IHZvbHRhZ2UgPSAweGZmOwogCXVpbnQ4X3QgbGlua19zdGF0dXNbRFBfTElOS19TVEFUVVNfU0la RV07CiAKLQlpZiAoIXNldHVwX2Nsb2NrX3JlY292ZXJ5KGludGVsX2RwKSkKLQkJcmV0dXJuIGZh bHNlOwotCi0Jdm9sdGFnZSA9IDB4ZmY7Ci0Jdm9sdGFnZV90cmllcyA9IDA7Ci0JbG9vcF90cmll cyA9IDA7CiAJZm9yICg7OykgewogCQlkcm1fZHBfbGlua190cmFpbl9jbG9ja19yZWNvdmVyeV9k ZWxheShpbnRlbF9kcC0+ZHBjZCk7CiAJCWlmICghaW50ZWxfZHBfZ2V0X2xpbmtfc3RhdHVzKGlu dGVsX2RwLCBsaW5rX3N0YXR1cykpIHsKQEAgLTE4MiwxMCArMTY3LDggQEAgaW50ZWxfZHBfbGlu a190cmFpbmluZ19jbG9ja19yZWNvdmVyeShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCQkJ YnJlYWs7CiAJCX0KIAotCQlpZiAoZHJtX2RwX2Nsb2NrX3JlY292ZXJ5X29rKGxpbmtfc3RhdHVz LCBpbnRlbF9kcC0+bGFuZV9jb3VudCkpIHsKLQkJCURSTV9ERUJVR19LTVMoImNsb2NrIHJlY292 ZXJ5IE9LXG4iKTsKKwkJaWYgKGRybV9kcF9jbG9ja19yZWNvdmVyeV9vayhsaW5rX3N0YXR1cywg aW50ZWxfZHAtPmxhbmVfY291bnQpKQogCQkJYnJlYWs7Ci0JCX0KIAogCQkvKgogCQkgKiBpZiB3 ZSB1c2VkIHByZXZpb3VzbHkgdHJhaW5lZCB2b2x0YWdlIGFuZCBwcmUtZW1waGFzaXMgdmFsdWVz CkBAIC0xOTUsMjggKzE3OCwxMiBAQCBpbnRlbF9kcF9saW5rX3RyYWluaW5nX2Nsb2NrX3JlY292 ZXJ5KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJCQlEUk1fREVCVUdfS01TKCJjbG9jayBy ZWNvdmVyeSBub3Qgb2ssIHJlc2V0Iik7CiAJCQkvKiBjbGVhciB0aGUgZmxhZyBhcyB3ZSBhcmUg bm90IHJldXNpbmcgdHJhaW4gc2V0ICovCiAJCQlpbnRlbF9kcC0+dHJhaW5fc2V0X3ZhbGlkID0g ZmFsc2U7Ci0JCQlpZiAoIWludGVsX2RwX3Jlc2V0X2xpbmtfdHJhaW4oaW50ZWxfZHAsCi0JCQkJ CQkgICAgICAgRFBfVFJBSU5JTkdfUEFUVEVSTl8xIHwKLQkJCQkJCSAgICAgICBEUF9MSU5LX1ND UkFNQkxJTkdfRElTQUJMRSkpIHsKLQkJCQlEUk1fRVJST1IoImZhaWxlZCB0byBlbmFibGUgbGlu ayB0cmFpbmluZ1xuIik7Ci0JCQkJcmV0dXJuIGZhbHNlOwotCQkJfQotCQkJY29udGludWU7CisJ CQlicmVhazsKIAkJfQogCiAJCS8qIENoZWNrIHRvIHNlZSBpZiB3ZSd2ZSB0cmllZCB0aGUgbWF4 IHZvbHRhZ2UgKi8KLQkJaWYgKG1heF92b2x0YWdlX3JlYWNoZWRfb25fYWxsX2xhbmVzKGludGVs X2RwKSkgewotCQkJKytsb29wX3RyaWVzOwotCQkJaWYgKGxvb3BfdHJpZXMgPT0gNSkgewotCQkJ CURSTV9FUlJPUigidG9vIG1hbnkgZnVsbCByZXRyaWVzLCBnaXZlIHVwXG4iKTsKLQkJCQlicmVh azsKLQkJCX0KLQkJCWludGVsX2RwX3Jlc2V0X2xpbmtfdHJhaW4oaW50ZWxfZHAsCi0JCQkJCQkg IERQX1RSQUlOSU5HX1BBVFRFUk5fMSB8Ci0JCQkJCQkgIERQX0xJTktfU0NSQU1CTElOR19ESVNB QkxFKTsKLQkJCXZvbHRhZ2VfdHJpZXMgPSAwOwotCQkJY29udGludWU7Ci0JCX0KKwkJaWYgKG1h eF92b2x0YWdlX3JlYWNoZWRfb25fYWxsX2xhbmVzKGludGVsX2RwKSkKKwkJCWJyZWFrOwogCiAJ CS8qIENoZWNrIHRvIHNlZSBpZiB3ZSd2ZSB0cmllZCB0aGUgc2FtZSB2b2x0YWdlIDUgdGltZXMg Ki8KIAkJaWYgKGludGVsX2RwX2dldF90cmFpbl92b2x0YWdlKGludGVsX2RwKSA9PSB2b2x0YWdl KSB7CkBAIC0yNDAsNiArMjA3LDM0IEBAIGludGVsX2RwX2xpbmtfdHJhaW5pbmdfY2xvY2tfcmVj b3Zlcnkoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAlyZXR1cm4gZHJtX2RwX2Nsb2NrX3Jl Y292ZXJ5X29rKGxpbmtfc3RhdHVzLCBpbnRlbF9kcC0+bGFuZV9jb3VudCk7CiB9CiAKKy8qIEVu YWJsZSBjb3JyZXNwb25kaW5nIHBvcnQgYW5kIHN0YXJ0IHRyYWluaW5nIHBhdHRlcm4gMSAqLwor c3RhdGljIGJvb2wKK2ludGVsX2RwX2xpbmtfdHJhaW5pbmdfY2xvY2tfcmVjb3Zlcnkoc3RydWN0 IGludGVsX2RwICppbnRlbF9kcCkKK3sKKwlpbnQgbG9vcF90cmllczsKKworCWlmICghc2V0dXBf Y2xvY2tfcmVjb3ZlcnkoaW50ZWxfZHApKQorCQlyZXR1cm4gZmFsc2U7CisKKwlmb3IgKGxvb3Bf dHJpZXMgPSAwOyBsb29wX3RyaWVzIDwgNTsgbG9vcF90cmllcysrKSB7CisJCWlmICghaW50ZWxf ZHBfcmVzZXRfbGlua190cmFpbihpbnRlbF9kcCwKKwkJCQkJICAgICAgIERQX1RSQUlOSU5HX1BB VFRFUk5fMSB8CisJCQkJCSAgICAgICBEUF9MSU5LX1NDUkFNQkxJTkdfRElTQUJMRSkpIHsKKwkJ CURSTV9FUlJPUigiZmFpbGVkIHRvIGVuYWJsZSBsaW5rIHRyYWluaW5nXG4iKTsKKwkJCXJldHVy biBmYWxzZTsKKwkJfQorCisJCWlmIChjbG9ja19yZWNvdmVyeV92b2x0YWdlX3N0ZXAoaW50ZWxf ZHApKSB7CisJCQlEUk1fREVCVUdfS01TKCJjbG9jayByZWNvdmVyeSBPS1xuIik7CisJCQlyZXR1 cm4gdHJ1ZTsKKwkJfQorCX0KKworCURSTV9FUlJPUigidG9vIG1hbnkgZnVsbCByZXRyaWVzLCBn aXZlIHVwXG4iKTsKKworCXJldHVybiBmYWxzZTsKK30KKwogc3RhdGljIGJvb2wKIHNldHVwX2No YW5uZWxfZXF1YWxpemF0aW9uKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiB7Ci0tIAoyLjQu MwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK