From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 4/6] drm/i915: Record the default hw state after reset upon load Date: Thu, 2 Nov 2017 16:23:00 +0200 Message-ID: <20171102142300.GN10981@intel.com> References: <20171102124226.30086-1-chris@chris-wilson.co.uk> <20171102124226.30086-5-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id D73496E91C for ; Thu, 2 Nov 2017 14:23:09 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20171102124226.30086-5-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBOb3YgMDIsIDIwMTcgYXQgMTI6NDI6MjRQTSArMDAwMCwgQ2hyaXMgV2lsc29uIHdy b3RlOgo+IFRha2UgYSBjb3B5IG9mIHRoZSBIVyBzdGF0ZSBhZnRlciBhIHJlc2V0IHVwb24gbW9k dWxlIGxvYWRpbmcgYnkKPiBleGVjdXRpbmcgYSBjb250ZXh0IHN3aXRjaCBmcm9tIGEgYmxhbmsg Y29udGV4dCB0byB0aGUga2VybmVsIGNvbnRleHQsCj4gdGh1cyBzYXZpbmcgdGhlIGRlZmF1bHQg aHcgc3RhdGUgb3ZlciB0aGUgYmxhbmsgY29udGV4dCBpbWFnZS4KPiBXZSBjYW4gdGhlbiB1c2Ug dGhlIGRlZmF1bHQgaHcgc3RhdGUgdG8gaW5pdGlhbGlzZSBhbnkgZnV0dXJlIGNvbnRleHQsCj4g ZW5zdXJpbmcgdGhhdCBlYWNoIHN0YXJ0cyB3aXRoIHRoZSBkZWZhdWx0IHZpZXcgb2YgaHcgc3Rh dGUuCj4gCj4gU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24u Y28udWs+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9zY2hlZHVsZXIuYyAgICB8 ICAyIC0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgICAgIHwgIDEgLQo+ ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgfCA2OSArKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysKPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Y29udGV4dC5jIHwgNTAgKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tCj4gIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuaCB8ICA0ICstCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2VuZ2luZV9jcy5jICB8ICAzICsrCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2xyYy5jICAgICAgICB8IDM1ICsrKysrKysrKystLS0tLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDQ3ICsrKysrKysrKysrKysrKy0tLS0tLS0KPiAgZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgIDEgKwo+ICA5IGZpbGVzIGNo YW5nZWQsIDEzNyBpbnNlcnRpb25zKCspLCA3NSBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L3NjaGVkdWxlci5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvZ3Z0L3NjaGVkdWxlci5jCj4gaW5kZXggZjZkZWQ0NzViYjJjLi40MmNjNjEyMzBjYTcg MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L3NjaGVkdWxlci5jCj4gKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L3NjaGVkdWxlci5jCj4gQEAgLTcyMyw4ICs3MjMs NiBAQCBpbnQgaW50ZWxfdmdwdV9pbml0X2d2dF9jb250ZXh0KHN0cnVjdCBpbnRlbF92Z3B1ICp2 Z3B1KQo+ICAJaWYgKElTX0VSUih2Z3B1LT5zaGFkb3dfY3R4KSkKPiAgCQlyZXR1cm4gUFRSX0VS Uih2Z3B1LT5zaGFkb3dfY3R4KTsKPiAgCj4gLQl2Z3B1LT5zaGFkb3dfY3R4LT5lbmdpbmVbUkNT XS5pbml0aWFsaXNlZCA9IHRydWU7Cj4gLQo+ICAJYml0bWFwX3plcm8odmdwdS0+c2hhZG93X2N0 eF9kZXNjX3VwZGF0ZWQsIEk5MTVfTlVNX0VOR0lORVMpOwo+ICAKPiAgCXJldHVybiAwOwo+IGRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCj4gaW5kZXggMzk4ODNjZDkxNWRiLi5jZmNlZjE4 OTlkYTggMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMK PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwo+IEBAIC0xOTc0LDcg KzE5NzQsNiBAQCBzdGF0aWMgaW50IGk5MTVfY29udGV4dF9zdGF0dXMoc3RydWN0IHNlcV9maWxl ICptLCB2b2lkICp1bnVzZWQpCj4gIAkJCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjZSA9ICZjdHgt PmVuZ2luZVtlbmdpbmUtPmlkXTsKPiAgCj4gIAkJCXNlcV9wcmludGYobSwgIiVzOiAiLCBlbmdp bmUtPm5hbWUpOwo+IC0JCQlzZXFfcHV0YyhtLCBjZS0+aW5pdGlhbGlzZWQgPyAnSScgOiAnaScp Owo+ICAJCQlpZiAoY2UtPnN0YXRlKQo+ICAJCQkJZGVzY3JpYmVfb2JqKG0sIGNlLT5zdGF0ZS0+ b2JqKTsKPiAgCQkJaWYgKGNlLT5yaW5nKQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+IGluZGV4 IGUzNmEzYTg0MDU1Mi4uZWQ0YjE3MDhmZWM1IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j Cj4gQEAgLTQ5NjcsNiArNDk2Nyw3MSBAQCBib29sIGludGVsX3Nhbml0aXplX3NlbWFwaG9yZXMo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgdmFsdWUpCj4gIAlyZXR1cm4g dHJ1ZTsKPiAgfQo+ICAKPiArc3RhdGljIGludCBfX2ludGVsX2VuZ2luZXNfcmVjb3JkX2RlZmF1 bHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQo+ICt7Cj4gKwlzdHJ1Y3QgaTkxNV9n ZW1fY29udGV4dCAqY3R4Owo+ICsJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwo+ICsJ ZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7Cj4gKwlpbnQgZXJyOwo+ICsKPiArCS8qCj4gKwkgKiBB cyB3ZSByZXNldCB0aGUgZ3B1IGR1cmluZyB2ZXJ5IGVhcmx5IHNhbml0aXNhdGlvbiwgdGhlIGN1 cnJlbnQKPiArCSAqIHJlZ2lzdGVyIHN0YXRlIG9uIHRoZSBHUFUgc2hvdWxkIHJlZmxlY3QgaXRz IGRlZmF1bHRzIHZhbHVlcy4KPiArCSAqIFdlIGxvYWQgYSBjb250ZXh0IG9udG8gdGhlIGh3ICh3 aXRoIHJlc3RvcmUtaW5oaWJpdCksIHRoZW4gc3dpdGNoCj4gKwkgKiBvdmVyIHRvIGEgc2Vjb25k IGNvbnRleHQgdG8gc2F2ZSB0aGF0IGRlZmF1bHQgcmVnaXN0ZXIgc3RhdGUuIFdlCj4gKwkgKiBj YW4gdGhlbiBwcmltZSBldmVyeSBuZXcgY29udGV4dCB3aXRoIHRoYXQgc3RhdGUgc28gdGhleSBh bGwgc3RhcnQKPiArCSAqIGZyb20gZGVmYXVsdHMuCj4gKwkgKi8KPiArCj4gKwljdHggPSBpOTE1 X2dlbV9jb250ZXh0X2NyZWF0ZV9rZXJuZWwoaTkxNSwgMCk7Cj4gKwlpZiAoSVNfRVJSKGN0eCkp Cj4gKwkJcmV0dXJuIFBUUl9FUlIoY3R4KTsKPiArCj4gKwlmb3JfZWFjaF9lbmdpbmUoZW5naW5l LCBpOTE1LCBpZCkgewo+ICsJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnE7Cj4gKwo+ ICsJCXJxID0gaTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhlbmdpbmUsIGN0eCk7Cj4gKwkJaWYgKElT X0VSUihycSkpIHsKPiArCQkJZXJyID0gUFRSX0VSUihycSk7Cj4gKwkJCWdvdG8gb3V0X2N0eDsK PiArCQl9Cj4gKwo+ICsJCWVyciA9IGk5MTVfc3dpdGNoX2NvbnRleHQocnEpOwo+ICsJCWlmIChl bmdpbmUtPmluaXRfY29udGV4dCkKPiArCQkJZXJyID0gZW5naW5lLT5pbml0X2NvbnRleHQocnEp Owo+ICsKPiArCQlfX2k5MTVfYWRkX3JlcXVlc3QocnEsIHRydWUpOwo+ICsJCWlmIChlcnIpCj4g KwkJCWdvdG8gb3V0X2N0eDsKPiArCX0KPiArCj4gKwllcnIgPSBpOTE1X2dlbV9zd2l0Y2hfdG9f a2VybmVsX2NvbnRleHQoaTkxNSk7Cj4gKwlpZiAoZXJyKQo+ICsJCWdvdG8gb3V0X2N0eDsKPiAr Cj4gKwllcnIgPSBpOTE1X2dlbV93YWl0X2Zvcl9pZGxlKGk5MTUsIEk5MTVfV0FJVF9MT0NLRUQp Owo+ICsJaWYgKGVycikKPiArCQlnb3RvIG91dF9jdHg7Cj4gKwo+ICsJZm9yX2VhY2hfZW5naW5l KGVuZ2luZSwgaTkxNSwgaWQpIHsKPiArCQlpZiAoIWN0eC0+ZW5naW5lW2lkXS5zdGF0ZSkKPiAr CQkJY29udGludWU7Cj4gKwo+ICsJCWVuZ2luZS0+ZGVmYXVsdF9zdGF0ZSA9Cj4gKwkJCWk5MTVf Z2VtX29iamVjdF9nZXQoY3R4LT5lbmdpbmVbaWRdLnN0YXRlLT5vYmopOwo+ICsKPiArCQllcnIg PSBpOTE1X2dlbV9vYmplY3Rfc2V0X3RvX2NwdV9kb21haW4oZW5naW5lLT5kZWZhdWx0X3N0YXRl LAo+ICsJCQkJCQkJZmFsc2UpOwo+ICsJCWlmIChlcnIpCj4gKwkJCWdvdG8gb3V0X2N0eDsKClNo b3VsZCB3ZSB1bm1hcCB0aGUgZGVmYXVsdCBjb250ZXh0IGZyb20gdGhlIEdUVCBoZXJlIHRvIG1h a2Ugc3VyZQp0aGUgR1BVIG5ldmVyIGdldHMgYSBjaGFuY2UgdG8gY2xvYmJlciBpdD8KCkkgYWxz byBoYWQgdGhlIG5vdGlvbiB0aGF0IGNvbnRleHQgbWlnaHQgc2F2ZSBhIGNvcHkgb2YgaXRzIEND SUQsIGFuZAp0aGF0IHdlJ2QgcG90ZW50aWFsbHkgaGF2ZSB0byBhZGp1c3QgaXQgaW4gZXZlcnkg bmV3IGNvbnRleHQgaW1hZ2UuIEJ1dApub3cgdGhhdCBJIGxvb2sgYXQgdGhlIGRvY3MgaXQgc2Vl bXMgcHJlLUhTVyBDQ0lEIHdhcyBwYXJ0IG9mIHRoZQpydW5saXN0IHBhcnQgb2YgdGhlIGNvbnRl eHQgd2hpY2ggd2UgZG9uJ3QgdXNlLCBhbmQgb24gSFNXIGl0IHNlZW1zIHRvCmJlIHNhdmVkIGlu IHRoZSBwb3dlciBjb250ZXh0LiBBbmQgSSBwcmVzdW1lIGl0IG11c3QgYWxzbyBiZSBwYXJ0IG9m CnRoZSBwb3dlciBjb250ZXh0IG9uIHByZS1IU1cgaW4gcmluZ2J1ZmZlciBtb2RlLCBvdGhlcndp c2UgaXQgd291bGQgZ2V0Cmxvc3Qgd2hlbiBlbnRlcmluZyByYzYuCgpBbmQgaW5kZWVkIG5vdCBo YXZpbmcgQ0NJRCBpbiB0aGUgY29udGV4dCBtYWtlcyBwZXJmZWN0IHNlbnNlIHNpbmNlCk1JX1NF VF9DT05URVhUIHByb3ZpZGVzIHRoZSBuZXcgdmFsdWUuIFRodXMgYWxzbyBnZXR0aW5nIGl0IGZy b20KdGhlIGNvbnRleHQgaXRzZWxmIHdvdWxkIGJlIHJlZHVuZGFudCwgYW5kIHBvdGVudGlhbGx5 IGRhbmdlcm91cyBpZgp0aGUgY29udGV4dCBoYXMgbW92ZWQgdG8gYW5vdGhlciBsb2NhdGlvbiB3 aXRoaW4gdGhlIEdUVCBzaW5jZSB0aGUKbGFzdCB0aW1lIGl0IHdhcyB1c2VkLgoKLS0gClZpbGxl IFN5cmrDpGzDpApJbnRlbCBPVEMKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==