From: Ander Conselvan de Oliveira Subject: [PATCH v2 1/3] drm/i915: Don't check modeset state in the hw state force restore path Date: Tue, 16 Jun 2015 11:49:43 +0300 Message-ID: <1434444585-25708-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 C01E86E527 for ; Tue, 16 Jun 2015 01:49:56 -0700 (PDT) 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 MTU6IGZhY3RvciBvdXQgY29tcHV0ZV9jb25maWcgZnJvbSBfX2ludGVsX3NldF9tb2RlIHYzCgp2 MjogUmVuYW1lIGNoZWNrIHBhcmFtZXRlciB0byBmb3JjZV9yZXN0b3JlLiAoTWF0dCkKCkJ1Z3pp bGxhOiBodHRwczovL2J1Z3ppbGxhLmtlcm5lbC5vcmcvc2hvd19idWcuY2dpP2lkPTk0NDMxCkNj OiBKZXNzZSBCYXJuZXMgPGpiYXJuZXNAdmlydHVvdXNnZWVrLm9yZz4KU2lnbmVkLW9mZi1ieTog QW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFA aW50ZWwuY29tPgpSZXZpZXdlZC1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAyMSArKysr KysrKysrKystLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCA5IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA0ZTNmMzAy Li5iY2YxMDQxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC04Nyw3ICs4 Nyw4IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3BjaF9jbG9ja19nZXQoc3RydWN0IGludGVsX2Ny dGMgKmNydGMsCiAJCQkJICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnKTsK IAogc3RhdGljIGludCBpbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCi0JCQkg IHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7CisJCQkgIHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZSwKKwkJCSAgYm9vbCBmb3JjZV9yZXN0b3JlKTsKIHN0YXRpYyBpbnQgaW50 ZWxfZnJhbWVidWZmZXJfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCSAgc3RydWN0 IGludGVsX2ZyYW1lYnVmZmVyICppZmIsCiAJCQkJICBzdHJ1Y3QgZHJtX21vZGVfZmJfY21kMiAq bW9kZV9jbWQsCkBAIC0xMDA5Niw3ICsxMDA5Nyw3IEBAIHJldHJ5OgogCiAJZHJtX21vZGVfY29w eSgmY3J0Y19zdGF0ZS0+YmFzZS5tb2RlLCBtb2RlKTsKIAotCWlmIChpbnRlbF9zZXRfbW9kZShj cnRjLCBzdGF0ZSkpIHsKKwlpZiAoaW50ZWxfc2V0X21vZGUoY3J0Yywgc3RhdGUsIHRydWUpKSB7 CiAJCURSTV9ERUJVR19LTVMoImZhaWxlZCB0byBzZXQgbW9kZSBvbiBsb2FkLWRldGVjdCBwaXBl XG4iKTsKIAkJaWYgKG9sZC0+cmVsZWFzZV9mYikKIAkJCW9sZC0+cmVsZWFzZV9mYi0+ZnVuY3Mt PmRlc3Ryb3kob2xkLT5yZWxlYXNlX2ZiKTsKQEAgLTEwMTcwLDcgKzEwMTcxLDcgQEAgdm9pZCBp bnRlbF9yZWxlYXNlX2xvYWRfZGV0ZWN0X3BpcGUoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5l Y3RvciwKIAkJaWYgKHJldCkKIAkJCWdvdG8gZmFpbDsKIAotCQlyZXQgPSBpbnRlbF9zZXRfbW9k ZShjcnRjLCBzdGF0ZSk7CisJCXJldCA9IGludGVsX3NldF9tb2RlKGNydGMsIHN0YXRlLCB0cnVl KTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gZmFpbDsKIApAQCAtMTI2NDYsMjAgKzEyNjQ3LDIyIEBA IHN0YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKm1vZGVzZXRfY3J0 YywKIH0KIAogc3RhdGljIGludCBpbnRlbF9zZXRfbW9kZV93aXRoX2NvbmZpZyhzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCi0JCQkJICAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29u ZmlnKQorCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKKwkJ CQkgICAgICBib29sIGZvcmNlX3Jlc3RvcmUpCiB7CiAJaW50IHJldDsKIAogCXJldCA9IF9faW50 ZWxfc2V0X21vZGUoY3J0YywgcGlwZV9jb25maWcpOwogCi0JaWYgKHJldCA9PSAwKQorCWlmIChy ZXQgPT0gMCAmJiBmb3JjZV9yZXN0b3JlKQogCQlpbnRlbF9tb2Rlc2V0X2NoZWNrX3N0YXRlKGNy dGMtPmRldik7CiAKIAlyZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgaW50IGludGVsX3NldF9tb2Rl KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKLQkJCSAgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0 YXRlKQorCQkJICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCisJCQkgIGJvb2wgZm9y Y2VfcmVzdG9yZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWc7CiAJ aW50IHJldCA9IDA7CkBAIC0xMjY3MCw3ICsxMjY3Myw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfc2V0 X21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlnb3RvIG91dDsKIAl9CiAKLQlyZXQgPSBp bnRlbF9zZXRfbW9kZV93aXRoX2NvbmZpZyhjcnRjLCBwaXBlX2NvbmZpZyk7CisJcmV0ID0gaW50 ZWxfc2V0X21vZGVfd2l0aF9jb25maWcoY3J0YywgcGlwZV9jb25maWcsIGZvcmNlX3Jlc3RvcmUp OwogCWlmIChyZXQpCiAJCWdvdG8gb3V0OwogCkBAIC0xMjc0Nyw3ICsxMjc1MCw3IEBAIHZvaWQg aW50ZWxfY3J0Y19yZXN0b3JlX21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWludGVsX21v ZGVzZXRfc2V0dXBfcGxhbmVfc3RhdGUoc3RhdGUsIGNydGMsICZjcnRjLT5tb2RlLAogCQkJCQlj cnRjLT5wcmltYXJ5LT5mYiwgY3J0Yy0+eCwgY3J0Yy0+eSk7CiAKLQlyZXQgPSBpbnRlbF9zZXRf bW9kZShjcnRjLCBzdGF0ZSk7CisJcmV0ID0gaW50ZWxfc2V0X21vZGUoY3J0Yywgc3RhdGUsIGZh bHNlKTsKIAlpZiAocmV0KQogCQlkcm1fYXRvbWljX3N0YXRlX2ZyZWUoc3RhdGUpOwogfQpAQCAt MTI5NDcsNyArMTI5NTAsNyBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfc2V0X2NvbmZpZyhzdHJ1 Y3QgZHJtX21vZGVfc2V0ICpzZXQpCiAKIAlwcmltYXJ5X3BsYW5lX3dhc192aXNpYmxlID0gcHJp bWFyeV9wbGFuZV92aXNpYmxlKHNldC0+Y3J0Yyk7CiAKLQlyZXQgPSBpbnRlbF9zZXRfbW9kZV93 aXRoX2NvbmZpZyhzZXQtPmNydGMsIHBpcGVfY29uZmlnKTsKKwlyZXQgPSBpbnRlbF9zZXRfbW9k ZV93aXRoX2NvbmZpZyhzZXQtPmNydGMsIHBpcGVfY29uZmlnLCB0cnVlKTsKIAogCWlmIChyZXQg PT0gMCAmJgogCSAgICBwaXBlX2NvbmZpZy0+YmFzZS5lbmFibGUgJiYKLS0gCjIuMS4wCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=