From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: Don't check modeset state in the hw state force restore path Date: Tue, 02 Jun 2015 10:12:24 +0300 Message-ID: <87vbf6y46f.fsf@intel.com> References: <1433162483-25476-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id A55466E022 for ; Tue, 2 Jun 2015 00:14:09 -0700 (PDT) In-Reply-To: <1433162483-25476-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 T24gTW9uLCAwMSBKdW4gMjAxNSwgQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5j b25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPiB3cm90ZToKPiBTaW5jZSB0aGUgZm9yY2Ug cmVzdG9yZSBsb2dpYyB3aWxsIHJlc3RvcmUgdGhlIENSVENzIHN0YXRlIG9uZSBhdCBhCj4gdGlt ZSwgaXQgaXMgcG9zc2libGUgdGhhdCB0aGUgc3RhdGUgd2lsbCBiZSBpbmNvbnNpc3RlbnQgdW50 aWwgdGhlIHdob2xlCj4gb3BlcmF0aW9uIGZpbmlzaGVzLiBBIGNhbGwgdG8gaW50ZWxfbW9kZXNl dF9jaGVja19zdGF0ZSgpIGlzIGRvbmUgb25jZQo+IGl0J3Mgb3Zlciwgc28gZG9uJ3QgY2hlY2sg dGhlIHN0YXRlIG11bHRpcGxlIHRpbWVzIGluIGJldHdlZW4uIFRoaXMKPiByZWdyZXNzaW9uIHdh cyBpbnRyb2R1Y2VkIGluOgo+Cj4gY29tbWl0IDdmMjcxMjZlYTNkYjZhZGU4ODZmMThmZDM5Y2Fm MGZmMGNkMWQzN2YKPiBBdXRob3I6IEplc3NlIEJhcm5lcyA8amJhcm5lc0B2aXJ0dW91c2dlZWsu b3JnPgo+IERhdGU6ICAgV2VkIE5vdiA1IDE0OjI2OjA2IDIwMTQgLTA4MDAKPgo+ICAgICBkcm0v aTkxNTogZmFjdG9yIG91dCBjb21wdXRlX2NvbmZpZyBmcm9tIF9faW50ZWxfc2V0X21vZGUgdjMK Pgo+IEJ1Z3ppbGxhOiBodHRwczovL2J1Z3ppbGxhLmtlcm5lbC5vcmcvc2hvd19idWcuY2dpP2lk PTk0NDMxCj4gQ2M6IEplc3NlIEJhcm5lcyA8amJhcm5lc0B2aXJ0dW91c2dlZWsub3JnPgo+IFNp Z25lZC1vZmYtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFu LmRlLm9saXZlaXJhQGludGVsLmNvbT4KPiAtLS0KPgo+IEhpLAo+Cj4gVGhpcyBwYXRjaCBhcHBs aWVzIG9uIHRvcCBvZiBuaWdodGx5LCBidXQgaXQgaXMgb25seSByZWxldmFudCB3aXRob3V0Cj4g TWFhcnRlbidzICJkcm0vaTkxNTogQ29udmVydCB0byBhdG9taWMsIHBhcnQgMiIgc2VyaWVzLCBi ZWNhdXNlIG9mIHRoZQo+IGNoYW5nZXMgdG8gdGhlIGh3IHN0YXRlIHJlYWQgb3V0IGFuZCBmb3Jj ZSByZXN0b3JlIGxvZ2ljLgo+Cj4gVGhlIHJlZ3Jlc3Npb24gZXhpc3RzIHNpbmNlIDMuMTkuCgpT b29vLCBJIHRoaW5rIHRoaXMgc2hvdWxkIGJlIGFwcGxpZWQgdG8gZml4ZXMsIHdpdGggY2M6IHN0 YWJsZSB2My4xOSssCmFuZCBJSVVDIE1hYXJ0ZW4ncyBzZXJpZXMgbWFrZXMgdGhpcyBvYnNvbGV0 ZSBpbiBkaW5xPwoKTm93IHdlIGp1c3QgbmVlZCByZXZpZXcuLi4gTWFhcnRlbj8KCkJSLApKYW5p LgoKCgoKPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAy MSArKysrKysrKysrKystLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlvbnMo KyksIDkgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4g aW5kZXggMTZlMTU5ZC4uMjRmYjdjZSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKPiBAQCAtODcsNyArODcsOCBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9wY2hfY2xvY2tf Z2V0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAo+ICAJCQkJICAgc3RydWN0IGludGVsX2NydGNf c3RhdGUgKnBpcGVfY29uZmlnKTsKPiAgCj4gIHN0YXRpYyBpbnQgaW50ZWxfc2V0X21vZGUoc3Ry dWN0IGRybV9jcnRjICpjcnRjLAo+IC0JCQkgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSk7Cj4gKwkJCSAgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAo+ICsJCQkgIGJvb2wg Y2hlY2spOwo+ICBzdGF0aWMgaW50IGludGVsX2ZyYW1lYnVmZmVyX2luaXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKPiAgCQkJCSAgc3RydWN0IGludGVsX2ZyYW1lYnVmZmVyICppZmIsCj4gIAkJ CQkgIHN0cnVjdCBkcm1fbW9kZV9mYl9jbWQyICptb2RlX2NtZCwKPiBAQCAtMTAyODIsNyArMTAy ODMsNyBAQCByZXRyeToKPiAgCj4gIAlkcm1fbW9kZV9jb3B5KCZjcnRjX3N0YXRlLT5iYXNlLm1v ZGUsIG1vZGUpOwo+ICAKPiAtCWlmIChpbnRlbF9zZXRfbW9kZShjcnRjLCBzdGF0ZSkpIHsKPiAr CWlmIChpbnRlbF9zZXRfbW9kZShjcnRjLCBzdGF0ZSwgdHJ1ZSkpIHsKPiAgCQlEUk1fREVCVUdf S01TKCJmYWlsZWQgdG8gc2V0IG1vZGUgb24gbG9hZC1kZXRlY3QgcGlwZVxuIik7Cj4gIAkJaWYg KG9sZC0+cmVsZWFzZV9mYikKPiAgCQkJb2xkLT5yZWxlYXNlX2ZiLT5mdW5jcy0+ZGVzdHJveShv bGQtPnJlbGVhc2VfZmIpOwo+IEBAIC0xMDM1Niw3ICsxMDM1Nyw3IEBAIHZvaWQgaW50ZWxfcmVs ZWFzZV9sb2FkX2RldGVjdF9waXBlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCj4g IAkJaWYgKHJldCkKPiAgCQkJZ290byBmYWlsOwo+ICAKPiAtCQlyZXQgPSBpbnRlbF9zZXRfbW9k ZShjcnRjLCBzdGF0ZSk7Cj4gKwkJcmV0ID0gaW50ZWxfc2V0X21vZGUoY3J0Yywgc3RhdGUsIHRy dWUpOwo+ICAJCWlmIChyZXQpCj4gIAkJCWdvdG8gZmFpbDsKPiAgCj4gQEAgLTEyODMyLDIwICsx MjgzMywyMiBAQCBzdGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICpt b2Rlc2V0X2NydGMsCj4gIH0KPiAgCj4gIHN0YXRpYyBpbnQgaW50ZWxfc2V0X21vZGVfd2l0aF9j b25maWcoc3RydWN0IGRybV9jcnRjICpjcnRjLAo+IC0JCQkJICAgICAgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKnBpcGVfY29uZmlnKQo+ICsJCQkJICAgICAgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKnBpcGVfY29uZmlnLAo+ICsJCQkJICAgICAgYm9vbCBjaGVjaykKPiAgewo+ICAJaW50IHJl dDsKPiAgCj4gIAlyZXQgPSBfX2ludGVsX3NldF9tb2RlKGNydGMsIHBpcGVfY29uZmlnKTsKPiAg Cj4gLQlpZiAocmV0ID09IDApCj4gKwlpZiAocmV0ID09IDAgJiYgY2hlY2spCj4gIAkJaW50ZWxf bW9kZXNldF9jaGVja19zdGF0ZShjcnRjLT5kZXYpOwo+ICAKPiAgCXJldHVybiByZXQ7Cj4gIH0K PiAgCj4gIHN0YXRpYyBpbnQgaW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ IC0JCQkgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKPiArCQkJICBzdHJ1Y3QgZHJt X2F0b21pY19zdGF0ZSAqc3RhdGUsCj4gKwkJCSAgYm9vbCBjaGVjaykKPiAgewo+ICAJc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnOwo+ICAJaW50IHJldCA9IDA7Cj4gQEAgLTEy ODU2LDcgKzEyODU5LDcgQEAgc3RhdGljIGludCBpbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMsCj4gIAkJZ290byBvdXQ7Cj4gIAl9Cj4gIAo+IC0JcmV0ID0gaW50ZWxfc2V0X21v ZGVfd2l0aF9jb25maWcoY3J0YywgcGlwZV9jb25maWcpOwo+ICsJcmV0ID0gaW50ZWxfc2V0X21v ZGVfd2l0aF9jb25maWcoY3J0YywgcGlwZV9jb25maWcsIGNoZWNrKTsKPiAgCWlmIChyZXQpCj4g IAkJZ290byBvdXQ7Cj4gIAo+IEBAIC0xMjkzMyw3ICsxMjkzNiw3IEBAIHZvaWQgaW50ZWxfY3J0 Y19yZXN0b3JlX21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQo+ICAJaW50ZWxfbW9kZXNldF9z ZXR1cF9wbGFuZV9zdGF0ZShzdGF0ZSwgY3J0YywgJmNydGMtPm1vZGUsCj4gIAkJCQkJY3J0Yy0+ cHJpbWFyeS0+ZmIsIGNydGMtPngsIGNydGMtPnkpOwo+ICAKPiAtCXJldCA9IGludGVsX3NldF9t b2RlKGNydGMsIHN0YXRlKTsKPiArCXJldCA9IGludGVsX3NldF9tb2RlKGNydGMsIHN0YXRlLCBm YWxzZSk7Cj4gIAlpZiAocmV0KQo+ICAJCWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7Cj4g IH0KPiBAQCAtMTMxMzMsNyArMTMxMzYsNyBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfc2V0X2Nv bmZpZyhzdHJ1Y3QgZHJtX21vZGVfc2V0ICpzZXQpCj4gIAo+ICAJcHJpbWFyeV9wbGFuZV93YXNf dmlzaWJsZSA9IHByaW1hcnlfcGxhbmVfdmlzaWJsZShzZXQtPmNydGMpOwo+ICAKPiAtCXJldCA9 IGludGVsX3NldF9tb2RlX3dpdGhfY29uZmlnKHNldC0+Y3J0YywgcGlwZV9jb25maWcpOwo+ICsJ cmV0ID0gaW50ZWxfc2V0X21vZGVfd2l0aF9jb25maWcoc2V0LT5jcnRjLCBwaXBlX2NvbmZpZywg dHJ1ZSk7Cj4gIAo+ICAJaWYgKHJldCA9PSAwICYmCj4gIAkgICAgcGlwZV9jb25maWctPmJhc2Uu ZW5hYmxlICYmCj4gLS0gCj4gMi4xLjAKPgo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4CgotLSAKSmFuaSBOaWt1bGEsIEludGVsIE9wZW4gU291cmNl IFRlY2hub2xvZ3kgQ2VudGVyCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==