From: Ander Conselvan de Oliveira Subject: [PATCH 1/3] drm/i915: Don't check modeset state in the hw state force restore path Date: Fri, 12 Jun 2015 10:19:40 +0300 Message-ID: <1434093582-5824-2-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1434093582-5824-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id DCFD46E2C2 for ; Fri, 12 Jun 2015 00:19:56 -0700 (PDT) In-Reply-To: <1434093582-5824-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 U2luY2UgdGhlIGZvcmNlIHJlc3RvcmUgbG9naWMgd2lsbCByZXN0b3JlIHRoZSBDUlRDcyBzdGF0 ZSBvbmUgYXQgYQp0aW1lLCBpdCBpcyBwb3NzaWJsZSB0aGF0IHRoZSBzdGF0ZSB3aWxsIGJlIGlu Y29uc2lzdGVudCB1bnRpbCB0aGUgd2hvbGUKb3BlcmF0aW9uIGZpbmlzaGVzLiBBIGNhbGwgdG8g aW50ZWxfbW9kZXNldF9jaGVja19zdGF0ZSgpIGlzIGRvbmUgb25jZQppdCdzIG92ZXIsIHNvIGRv bid0IGNoZWNrIHRoZSBzdGF0ZSBtdWx0aXBsZSB0aW1lcyBpbiBiZXR3ZWVuLiBUaGlzCnJlZ3Jl c3Npb24gd2FzIGludHJvZHVjZWQgaW46Cgpjb21taXQgN2YyNzEyNmVhM2RiNmFkZTg4NmYxOGZk MzljYWYwZmYwY2QxZDM3ZgpBdXRob3I6IEplc3NlIEJhcm5lcyA8amJhcm5lc0B2aXJ0dW91c2dl ZWsub3JnPgpEYXRlOiAgIFdlZCBOb3YgNSAxNDoyNjowNiAyMDE0IC0wODAwCgogICAgZHJtL2k5 MTU6IGZhY3RvciBvdXQgY29tcHV0ZV9jb25maWcgZnJvbSBfX2ludGVsX3NldF9tb2RlIHYzCgpC dWd6aWxsYTogaHR0cHM6Ly9idWd6aWxsYS5rZXJuZWwub3JnL3Nob3dfYnVnLmNnaT9pZD05NDQz MQpDYzogSmVzc2UgQmFybmVzIDxqYmFybmVzQHZpcnR1b3VzZ2Vlay5vcmc+ClNpZ25lZC1vZmYt Ynk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRlLm9saXZl aXJhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg fCAyMSArKysrKysrKysrKystLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMiBpbnNlcnRpb25z KCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRl eCA0ZTNmMzAyLi42ZWY1N2U2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBA IC04Nyw3ICs4Nyw4IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3BjaF9jbG9ja19nZXQoc3RydWN0 IGludGVsX2NydGMgKmNydGMsCiAJCQkJICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVf Y29uZmlnKTsKIAogc3RhdGljIGludCBpbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNy dGMsCi0JCQkgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7CisJCQkgIHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKKwkJCSAgYm9vbCBjaGVjayk7CiBzdGF0aWMgaW50IGlu dGVsX2ZyYW1lYnVmZmVyX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkgIHN0cnVj dCBpbnRlbF9mcmFtZWJ1ZmZlciAqaWZiLAogCQkJCSAgc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIg Km1vZGVfY21kLApAQCAtMTAwOTYsNyArMTAwOTcsNyBAQCByZXRyeToKIAogCWRybV9tb2RlX2Nv cHkoJmNydGNfc3RhdGUtPmJhc2UubW9kZSwgbW9kZSk7CiAKLQlpZiAoaW50ZWxfc2V0X21vZGUo Y3J0Yywgc3RhdGUpKSB7CisJaWYgKGludGVsX3NldF9tb2RlKGNydGMsIHN0YXRlLCB0cnVlKSkg ewogCQlEUk1fREVCVUdfS01TKCJmYWlsZWQgdG8gc2V0IG1vZGUgb24gbG9hZC1kZXRlY3QgcGlw ZVxuIik7CiAJCWlmIChvbGQtPnJlbGVhc2VfZmIpCiAJCQlvbGQtPnJlbGVhc2VfZmItPmZ1bmNz LT5kZXN0cm95KG9sZC0+cmVsZWFzZV9mYik7CkBAIC0xMDE3MCw3ICsxMDE3MSw3IEBAIHZvaWQg aW50ZWxfcmVsZWFzZV9sb2FkX2RldGVjdF9waXBlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25u ZWN0b3IsCiAJCWlmIChyZXQpCiAJCQlnb3RvIGZhaWw7CiAKLQkJcmV0ID0gaW50ZWxfc2V0X21v ZGUoY3J0Yywgc3RhdGUpOworCQlyZXQgPSBpbnRlbF9zZXRfbW9kZShjcnRjLCBzdGF0ZSwgdHJ1 ZSk7CiAJCWlmIChyZXQpCiAJCQlnb3RvIGZhaWw7CiAKQEAgLTEyNjQ2LDIwICsxMjY0NywyMiBA QCBzdGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICptb2Rlc2V0X2Ny dGMsCiB9CiAKIHN0YXRpYyBpbnQgaW50ZWxfc2V0X21vZGVfd2l0aF9jb25maWcoc3RydWN0IGRy bV9jcnRjICpjcnRjLAotCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2Nv bmZpZykKKwkJCQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCisJ CQkJICAgICAgYm9vbCBjaGVjaykKIHsKIAlpbnQgcmV0OwogCiAJcmV0ID0gX19pbnRlbF9zZXRf bW9kZShjcnRjLCBwaXBlX2NvbmZpZyk7CiAKLQlpZiAocmV0ID09IDApCisJaWYgKHJldCA9PSAw ICYmIGNoZWNrKQogCQlpbnRlbF9tb2Rlc2V0X2NoZWNrX3N0YXRlKGNydGMtPmRldik7CiAKIAly ZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgaW50IGludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0 YyAqY3J0YywKLQkJCSAgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQorCQkJICBzdHJ1 Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCisJCQkgIGJvb2wgY2hlY2spCiB7CiAJc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnOwogCWludCByZXQgPSAwOwpAQCAtMTI2NzAs NyArMTI2NzMsNyBAQCBzdGF0aWMgaW50IGludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKIAkJZ290byBvdXQ7CiAJfQogCi0JcmV0ID0gaW50ZWxfc2V0X21vZGVfd2l0aF9jb25m aWcoY3J0YywgcGlwZV9jb25maWcpOworCXJldCA9IGludGVsX3NldF9tb2RlX3dpdGhfY29uZmln KGNydGMsIHBpcGVfY29uZmlnLCBjaGVjayk7CiAJaWYgKHJldCkKIAkJZ290byBvdXQ7CiAKQEAg LTEyNzQ3LDcgKzEyNzUwLDcgQEAgdm9pZCBpbnRlbF9jcnRjX3Jlc3RvcmVfbW9kZShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpCiAJaW50ZWxfbW9kZXNldF9zZXR1cF9wbGFuZV9zdGF0ZShzdGF0ZSwg Y3J0YywgJmNydGMtPm1vZGUsCiAJCQkJCWNydGMtPnByaW1hcnktPmZiLCBjcnRjLT54LCBjcnRj LT55KTsKIAotCXJldCA9IGludGVsX3NldF9tb2RlKGNydGMsIHN0YXRlKTsKKwlyZXQgPSBpbnRl bF9zZXRfbW9kZShjcnRjLCBzdGF0ZSwgZmFsc2UpOwogCWlmIChyZXQpCiAJCWRybV9hdG9taWNf c3RhdGVfZnJlZShzdGF0ZSk7CiB9CkBAIC0xMjk0Nyw3ICsxMjk1MCw3IEBAIHN0YXRpYyBpbnQg aW50ZWxfY3J0Y19zZXRfY29uZmlnKHN0cnVjdCBkcm1fbW9kZV9zZXQgKnNldCkKIAogCXByaW1h cnlfcGxhbmVfd2FzX3Zpc2libGUgPSBwcmltYXJ5X3BsYW5lX3Zpc2libGUoc2V0LT5jcnRjKTsK IAotCXJldCA9IGludGVsX3NldF9tb2RlX3dpdGhfY29uZmlnKHNldC0+Y3J0YywgcGlwZV9jb25m aWcpOworCXJldCA9IGludGVsX3NldF9tb2RlX3dpdGhfY29uZmlnKHNldC0+Y3J0YywgcGlwZV9j b25maWcsIHRydWUpOwogCiAJaWYgKHJldCA9PSAwICYmCiAJICAgIHBpcGVfY29uZmlnLT5iYXNl LmVuYWJsZSAmJgotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==