From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Conselvan De Oliveira, Ander" Subject: Re: [PATCH] drm/i915: Don't check modeset state in the hw state force restore path Date: Mon, 1 Jun 2015 12:45:45 +0000 Message-ID: <1433162750.10913.6.camel@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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 18DE06E13C for ; Mon, 1 Jun 2015 05:45:48 -0700 (PDT) In-Reply-To: <1433162483-25476-1-git-send-email-ander.conselvan.de.oliveira@intel.com> Content-Language: en-US Content-ID: 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 T24gTW9uLCAyMDE1LTA2LTAxIGF0IDE1OjQxICswMzAwLCBBbmRlciBDb25zZWx2YW4gZGUgT2xp dmVpcmEgd3JvdGU6DQo+IFNpbmNlIHRoZSBmb3JjZSByZXN0b3JlIGxvZ2ljIHdpbGwgcmVzdG9y ZSB0aGUgQ1JUQ3Mgc3RhdGUgb25lIGF0IGENCj4gdGltZSwgaXQgaXMgcG9zc2libGUgdGhhdCB0 aGUgc3RhdGUgd2lsbCBiZSBpbmNvbnNpc3RlbnQgdW50aWwgdGhlIHdob2xlDQo+IG9wZXJhdGlv biBmaW5pc2hlcy4gQSBjYWxsIHRvIGludGVsX21vZGVzZXRfY2hlY2tfc3RhdGUoKSBpcyBkb25l IG9uY2UNCj4gaXQncyBvdmVyLCBzbyBkb24ndCBjaGVjayB0aGUgc3RhdGUgbXVsdGlwbGUgdGlt ZXMgaW4gYmV0d2Vlbi4gVGhpcw0KPiByZWdyZXNzaW9uIHdhcyBpbnRyb2R1Y2VkIGluOg0KPiAN Cj4gY29tbWl0IDdmMjcxMjZlYTNkYjZhZGU4ODZmMThmZDM5Y2FmMGZmMGNkMWQzN2YNCj4gQXV0 aG9yOiBKZXNzZSBCYXJuZXMgPGpiYXJuZXNAdmlydHVvdXNnZWVrLm9yZz4NCj4gRGF0ZTogICBX ZWQgTm92IDUgMTQ6MjY6MDYgMjAxNCAtMDgwMA0KPiANCj4gICAgIGRybS9pOTE1OiBmYWN0b3Ig b3V0IGNvbXB1dGVfY29uZmlnIGZyb20gX19pbnRlbF9zZXRfbW9kZSB2Mw0KPiANCj4gQnVnemls bGE6IGh0dHBzOi8vYnVnemlsbGEua2VybmVsLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ0MzENCj4g Q2M6IEplc3NlIEJhcm5lcyA8amJhcm5lc0B2aXJ0dW91c2dlZWsub3JnPg0KPiBTaWduZWQtb2Zm LWJ5OiBBbmRlciBDb25zZWx2YW4gZGUgT2xpdmVpcmEgPGFuZGVyLmNvbnNlbHZhbi5kZS5vbGl2 ZWlyYUBpbnRlbC5jb20+DQo+IC0tLQ0KPiANCj4gSGksDQo+IA0KPiBUaGlzIHBhdGNoIGFwcGxp ZXMgb24gdG9wIG9mIG5pZ2h0bHksIGJ1dCBpdCBpcyBvbmx5IHJlbGV2YW50IHdpdGhvdXQNCj4g TWFhcnRlbidzICJkcm0vaTkxNTogQ29udmVydCB0byBhdG9taWMsIHBhcnQgMiIgc2VyaWVzLCBi ZWNhdXNlIG9mIHRoZQ0KPiBjaGFuZ2VzIHRvIHRoZSBodyBzdGF0ZSByZWFkIG91dCBhbmQgZm9y Y2UgcmVzdG9yZSBsb2dpYy4NCj4gDQo+IFRoZSByZWdyZXNzaW9uIGV4aXN0cyBzaW5jZSAzLjE5 Lg0KDQpTYW1lIHBhdGNoIGFkYXBhdGVkIGZvciA0LjEtcmM2IGhlcmU6DQpodHRwczovL2J1Z3pp bGxhLmtlcm5lbC5vcmcvYXR0YWNobWVudC5jZ2k/aWQ9MTc4NDYxDQoNCkFuZGVyDQoNCj4gLS0t DQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAyMSArKysrKysrKysr KystLS0tLS0tLS0NCj4gIDEgZmlsZSBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCA5IGRlbGV0 aW9ucygtKQ0KPiANCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYw0KPiBpbmRleCAx NmUxNTlkLi4yNGZiN2NlIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMNCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j DQo+IEBAIC04Nyw3ICs4Nyw4IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3BjaF9jbG9ja19nZXQo c3RydWN0IGludGVsX2NydGMgKmNydGMsDQo+ICAJCQkJICAgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKnBpcGVfY29uZmlnKTsNCj4gIA0KPiAgc3RhdGljIGludCBpbnRlbF9zZXRfbW9kZShzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsDQo+IC0JCQkgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSk7DQo+ICsJCQkgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwNCj4gKwkJCSAgYm9v bCBjaGVjayk7DQo+ICBzdGF0aWMgaW50IGludGVsX2ZyYW1lYnVmZmVyX2luaXQoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwNCj4gIAkJCQkgIHN0cnVjdCBpbnRlbF9mcmFtZWJ1ZmZlciAqaWZiLA0K PiAgCQkJCSAgc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgKm1vZGVfY21kLA0KPiBAQCAtMTAyODIs NyArMTAyODMsNyBAQCByZXRyeToNCj4gIA0KPiAgCWRybV9tb2RlX2NvcHkoJmNydGNfc3RhdGUt PmJhc2UubW9kZSwgbW9kZSk7DQo+ICANCj4gLQlpZiAoaW50ZWxfc2V0X21vZGUoY3J0Yywgc3Rh dGUpKSB7DQo+ICsJaWYgKGludGVsX3NldF9tb2RlKGNydGMsIHN0YXRlLCB0cnVlKSkgew0KPiAg CQlEUk1fREVCVUdfS01TKCJmYWlsZWQgdG8gc2V0IG1vZGUgb24gbG9hZC1kZXRlY3QgcGlwZVxu Iik7DQo+ICAJCWlmIChvbGQtPnJlbGVhc2VfZmIpDQo+ICAJCQlvbGQtPnJlbGVhc2VfZmItPmZ1 bmNzLT5kZXN0cm95KG9sZC0+cmVsZWFzZV9mYik7DQo+IEBAIC0xMDM1Niw3ICsxMDM1Nyw3IEBA IHZvaWQgaW50ZWxfcmVsZWFzZV9sb2FkX2RldGVjdF9waXBlKHN0cnVjdCBkcm1fY29ubmVjdG9y ICpjb25uZWN0b3IsDQo+ICAJCWlmIChyZXQpDQo+ICAJCQlnb3RvIGZhaWw7DQo+ICANCj4gLQkJ cmV0ID0gaW50ZWxfc2V0X21vZGUoY3J0Yywgc3RhdGUpOw0KPiArCQlyZXQgPSBpbnRlbF9zZXRf bW9kZShjcnRjLCBzdGF0ZSwgdHJ1ZSk7DQo+ICAJCWlmIChyZXQpDQo+ICAJCQlnb3RvIGZhaWw7 DQo+ICANCj4gQEAgLTEyODMyLDIwICsxMjgzMywyMiBAQCBzdGF0aWMgaW50IF9faW50ZWxfc2V0 X21vZGUoc3RydWN0IGRybV9jcnRjICptb2Rlc2V0X2NydGMsDQo+ICB9DQo+ICANCj4gIHN0YXRp YyBpbnQgaW50ZWxfc2V0X21vZGVfd2l0aF9jb25maWcoc3RydWN0IGRybV9jcnRjICpjcnRjLA0K PiAtCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZykNCj4gKwkJ CQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsDQo+ICsJCQkJICAg ICAgYm9vbCBjaGVjaykNCj4gIHsNCj4gIAlpbnQgcmV0Ow0KPiAgDQo+ICAJcmV0ID0gX19pbnRl bF9zZXRfbW9kZShjcnRjLCBwaXBlX2NvbmZpZyk7DQo+ICANCj4gLQlpZiAocmV0ID09IDApDQo+ ICsJaWYgKHJldCA9PSAwICYmIGNoZWNrKQ0KPiAgCQlpbnRlbF9tb2Rlc2V0X2NoZWNrX3N0YXRl KGNydGMtPmRldik7DQo+ICANCj4gIAlyZXR1cm4gcmV0Ow0KPiAgfQ0KPiAgDQo+ICBzdGF0aWMg aW50IGludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywNCj4gLQkJCSAgc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQ0KPiArCQkJICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0 ZSAqc3RhdGUsDQo+ICsJCQkgIGJvb2wgY2hlY2spDQo+ICB7DQo+ICAJc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKnBpcGVfY29uZmlnOw0KPiAgCWludCByZXQgPSAwOw0KPiBAQCAtMTI4NTYsNyAr MTI4NTksNyBAQCBzdGF0aWMgaW50IGludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0 YywNCj4gIAkJZ290byBvdXQ7DQo+ICAJfQ0KPiAgDQo+IC0JcmV0ID0gaW50ZWxfc2V0X21vZGVf d2l0aF9jb25maWcoY3J0YywgcGlwZV9jb25maWcpOw0KPiArCXJldCA9IGludGVsX3NldF9tb2Rl X3dpdGhfY29uZmlnKGNydGMsIHBpcGVfY29uZmlnLCBjaGVjayk7DQo+ICAJaWYgKHJldCkNCj4g IAkJZ290byBvdXQ7DQo+ICANCj4gQEAgLTEyOTMzLDcgKzEyOTM2LDcgQEAgdm9pZCBpbnRlbF9j cnRjX3Jlc3RvcmVfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpDQo+ICAJaW50ZWxfbW9kZXNl dF9zZXR1cF9wbGFuZV9zdGF0ZShzdGF0ZSwgY3J0YywgJmNydGMtPm1vZGUsDQo+ICAJCQkJCWNy dGMtPnByaW1hcnktPmZiLCBjcnRjLT54LCBjcnRjLT55KTsNCj4gIA0KPiAtCXJldCA9IGludGVs X3NldF9tb2RlKGNydGMsIHN0YXRlKTsNCj4gKwlyZXQgPSBpbnRlbF9zZXRfbW9kZShjcnRjLCBz dGF0ZSwgZmFsc2UpOw0KPiAgCWlmIChyZXQpDQo+ICAJCWRybV9hdG9taWNfc3RhdGVfZnJlZShz dGF0ZSk7DQo+ICB9DQo+IEBAIC0xMzEzMyw3ICsxMzEzNiw3IEBAIHN0YXRpYyBpbnQgaW50ZWxf Y3J0Y19zZXRfY29uZmlnKHN0cnVjdCBkcm1fbW9kZV9zZXQgKnNldCkNCj4gIA0KPiAgCXByaW1h cnlfcGxhbmVfd2FzX3Zpc2libGUgPSBwcmltYXJ5X3BsYW5lX3Zpc2libGUoc2V0LT5jcnRjKTsN Cj4gIA0KPiAtCXJldCA9IGludGVsX3NldF9tb2RlX3dpdGhfY29uZmlnKHNldC0+Y3J0YywgcGlw ZV9jb25maWcpOw0KPiArCXJldCA9IGludGVsX3NldF9tb2RlX3dpdGhfY29uZmlnKHNldC0+Y3J0 YywgcGlwZV9jb25maWcsIHRydWUpOw0KPiAgDQo+ICAJaWYgKHJldCA9PSAwICYmDQo+ICAJICAg IHBpcGVfY29uZmlnLT5iYXNlLmVuYWJsZSAmJg0KDQotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KSW50ZWwgRmlubGFu ZCBPeQpSZWdpc3RlcmVkIEFkZHJlc3M6IFBMIDI4MSwgMDAxODEgSGVsc2lua2kgCkJ1c2luZXNz IElkZW50aXR5IENvZGU6IDAzNTc2MDYgLSA0IApEb21pY2lsZWQgaW4gSGVsc2lua2kgCgpUaGlz IGUtbWFpbCBhbmQgYW55IGF0dGFjaG1lbnRzIG1heSBjb250YWluIGNvbmZpZGVudGlhbCBtYXRl cmlhbCBmb3IKdGhlIHNvbGUgdXNlIG9mIHRoZSBpbnRlbmRlZCByZWNpcGllbnQocykuIEFueSBy ZXZpZXcgb3IgZGlzdHJpYnV0aW9uCmJ5IG90aGVycyBpcyBzdHJpY3RseSBwcm9oaWJpdGVkLiBJ ZiB5b3UgYXJlIG5vdCB0aGUgaW50ZW5kZWQKcmVjaXBpZW50LCBwbGVhc2UgY29udGFjdCB0aGUg c2VuZGVyIGFuZCBkZWxldGUgYWxsIGNvcGllcy4KX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK