From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 12/42] drm/i915: move swap_state to the right place Date: Tue, 12 May 2015 10:25:11 +0200 Message-ID: <20150512082511.GY15256@phenom.ffwll.local> References: <1431354318-11995-1-git-send-email-maarten.lankhorst@linux.intel.com> <1431354318-11995-13-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by gabe.freedesktop.org (Postfix) with ESMTP id 1E0056E598 for ; Tue, 12 May 2015 01:22:50 -0700 (PDT) Received: by widdi4 with SMTP id di4so4019905wid.0 for ; Tue, 12 May 2015 01:22:49 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1431354318-11995-13-git-send-email-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Maarten Lankhorst Cc: Ander Conselvan de Oliveira , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gTW9uLCBNYXkgMTEsIDIwMTUgYXQgMDQ6MjQ6NDhQTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gRG9uZSBhcyBhIHNlcGFyYXRlIGNvbW1pdCB0byBhbGxvdyBiZXR0ZXIgYmlz ZWN0aW5nLgoKQXNzdW1pbmcgbXkgY29tbWVudHMgb24gcGF0Y2ggMTAgcGFuIG91dCB0aGlzIHdv dWxkIGJvaWwgZG93biB0byBqdXN0Cm1vdmluZyB0aGUgc3dhcF9zdGF0ZSBjYWxsIHVwIGEgYml0 LCBwbHVzIGFkanVzdGluZyB0aGUgbG9vcCBvdmVyIHRoZQpvbGRfc3RhdGUgaW4gdGhlIGRpc2Fi bGUgbG9vcHMgbGlrZSB0aGlzIHBhdGNoIGRvZXMgYWxyZWFkeS4gR2l2ZW4gdGhhdAp0aGluZ3Mg YXJlIHN0aWxsIGEgYml0IHVuY2xlYXIgSSBkaWRuJ3QgY2FyZWZ1bGx5IHJldmlldyB3aGV0aGVy IHlvdSd2ZQptaXNzZWQgYW55IG9mIHRob3NlLCBidXQgbWFrZXMgc2Vuc2Ugb3RoZXJ3aXNlLgot RGFuaWVsCgo+IAo+IFNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxh bmtob3JzdEBsaW51eC5pbnRlbC5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyB8IDUwICsrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+ ICAxIGZpbGUgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCA0MyBkZWxldGlvbnMoLSkKPiAKPiBk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gaW5kZXggYTkwZWJjOGVmZjZmLi4yNTNk OWNkNDE1NGEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gQEAgLTEx NDM3LDI4ICsxMTQzNyw5IEBAIGludGVsX21vZGVzZXRfdXBkYXRlX3N0YXRlKHN0cnVjdCBkcm1f YXRvbWljX3N0YXRlICpzdGF0ZSkKPiAgCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKPiAgCXN0cnVj dCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKPiAgCXN0cnVjdCBkcm1fY29ubmVjdG9yICpj b25uZWN0b3I7Cj4gLQlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubmVjdG9yX3N0YXRl Owo+IC0JaW50IGk7Cj4gIAo+ICAJaW50ZWxfc2hhcmVkX2RwbGxfY29tbWl0KGRldl9wcml2KTsK PiAgCj4gLQkvKgo+IC0JICogc3dhcCBjcnRjIGFuZCBjb25uZWN0b3Igc3RhdGUsIHBsYW5lIHN0 YXRlIGlzIGFscmVhZHkgc3dhcHBlZCBpbgo+IC0JICogX19pbnRlbF9zZXRfbW9kZV91cGRhdGVf cGxhbmVzLiBPbmNlIC5jcnRjX2Rpc2FibGUgaXMgZml4ZWQKPiAtCSAqIGFsbCBzdGF0ZSBzaG91 bGQgYmUgc3dhcHBlZCBiZWZvcmUgZGlzYWJsaW5nIGNydGMncy4KPiAtCSAqLwo+IC0JZm9yX2Vh Y2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewo+IC0JCWNydGMt PnN0YXRlLT5zdGF0ZSA9IHN0YXRlOwo+IC0JCXN3YXAoc3RhdGUtPmNydGNfc3RhdGVzW2ldLCBj cnRjLT5zdGF0ZSk7Cj4gLQkJY3J0Yy0+c3RhdGUtPnN0YXRlID0gTlVMTDsKPiAtCX0KPiAtCj4g LQlmb3JfZWFjaF9jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3RvciwgY29ubmVjdG9y X3N0YXRlLCBpKSB7Cj4gLQkJY29ubmVjdG9yLT5zdGF0ZS0+c3RhdGUgPSBzdGF0ZTsKPiAtCQlz d2FwKHN0YXRlLT5jb25uZWN0b3Jfc3RhdGVzW2ldLCBjb25uZWN0b3ItPnN0YXRlKTsKPiAtCQlj b25uZWN0b3ItPnN0YXRlLT5zdGF0ZSA9IE5VTEw7Cj4gLQl9Cj4gLQo+ICAJZm9yX2VhY2hfaW50 ZWxfZW5jb2RlcihkZXYsIGludGVsX2VuY29kZXIpIHsKPiAgCQlpZiAoIWludGVsX2VuY29kZXIt PmJhc2UuY3J0YykKPiAgCQkJY29udGludWU7Cj4gQEAgLTEyMTgzLDIxICsxMjE2NCw2IEBAIHN0 YXRpYyB2b2lkIF9faW50ZWxfc2V0X21vZGVfdXBkYXRlX3BsYW5lcyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAo+ICAJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7Cj4gIAlzdHJ1Y3QgZHJtX2NydGMg KmNydGM7Cj4gIAo+IC0JLyoKPiAtCSAqIEZvciBub3cgb25seSBzd2FwIHBsYW5lIHN0YXRlLCB3 aWxsIGJlIHJlcGxhY2VkIHdpdGggYQo+IC0JICogY2FsbCB0byBkcm1fYXRvbWljX2hlbHBlcl9z d2FwX3N0YXRlCj4gLQkgKi8KPiAtCWZvcl9lYWNoX3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFu ZSwgb2xkX3BsYW5lX3N0YXRlLCBpKSB7Cj4gLQkJc3RydWN0IGRybV9wbGFuZSAqcGxhbmUgPSBz dGF0ZS0+cGxhbmVzW2ldOwo+IC0KPiAtCQlpZiAoIXBsYW5lKQo+IC0JCQljb250aW51ZTsKPiAt Cj4gLQkJcGxhbmUtPnN0YXRlLT5zdGF0ZSA9IHN0YXRlOwo+IC0JCXN3YXAoc3RhdGUtPnBsYW5l X3N0YXRlc1tpXSwgcGxhbmUtPnN0YXRlKTsKPiAtCQlwbGFuZS0+c3RhdGUtPnN0YXRlID0gTlVM TDsKPiAtCX0KPiAtCj4gIAlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRj X3N0YXRlLCBpKSB7Cj4gIAkJY29uc3Qgc3RydWN0IGRybV9jcnRjX2hlbHBlcl9mdW5jcyAqZnVu Y3M7Cj4gIAo+IEBAIC0xMjIwNiwxMCArMTIxNzIsNiBAQCBzdGF0aWMgdm9pZCBfX2ludGVsX3Nl dF9tb2RlX3VwZGF0ZV9wbGFuZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgCQlpZiAoIWZ1 bmNzIHx8ICFmdW5jcy0+YXRvbWljX2JlZ2luKQo+ICAJCQljb250aW51ZTsKPiAgCj4gLQkJLyog WFhYOiBIYWNrIGJlY2F1c2UgY3J0YyBzdGF0ZSBpcyBub3Qgc3dhcHBlZCAqLwo+IC0JCWNydGMt PnN0YXRlLT5tb2RlX2NoYW5nZWQgPSBjcnRjX3N0YXRlLT5tb2RlX2NoYW5nZWQ7Cj4gLQkJY3J0 Yy0+c3RhdGUtPmFjdGl2ZV9jaGFuZ2VkID0gY3J0Y19zdGF0ZS0+YWN0aXZlX2NoYW5nZWQ7Cj4g LQo+ICAJCURSTV9ERUJVR19BVE9NSUMoIkNhbGxpbmcgYXRvbWljX2JlZ2luIG9uIGNydGMgJWlc biIsIGkpOwo+ICAJCWZ1bmNzLT5hdG9taWNfYmVnaW4oY3J0Yyk7Cj4gIAl9Cj4gQEAgLTEyMjg3 LDcgKzEyMjQ5LDcgQEAgc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0 YyAqbW9kZXNldF9jcnRjLAo+ICAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKPiAgCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IHBp cGVfY29uZmlnLT5iYXNlLnN0YXRlOwo+ICAJc3RydWN0IGRybV9jcnRjICpjcnRjOwo+IC0Jc3Ry dWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwo+ICsJc3RydWN0IGRybV9jcnRjX3N0YXRl ICpvbGRfY3J0Y19zdGF0ZTsKPiAgCWludCByZXQ7Cj4gIAlpbnQgaTsKPiAgCj4gQEAgLTEyMjk5 LDE1ICsxMjI2MSwxNyBAQCBzdGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9j cnRjICptb2Rlc2V0X2NydGMsCj4gIAlpZiAocmV0KQo+ICAJCXJldHVybiByZXQ7Cj4gIAo+ICsJ ZHJtX2F0b21pY19oZWxwZXJfc3dhcF9zdGF0ZShkZXYsIHN0YXRlKTsKPiArCj4gIAlfX2ludGVs X3NldF9tb2RlX3VwZGF0ZV9wbGFuZXMoZGV2LCBzdGF0ZSk7Cj4gIAo+IC0JZm9yX2VhY2hfY3J0 Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewo+ICsJZm9yX2VhY2hfY3J0 Y19pbl9zdGF0ZShzdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIGkpIHsKPiAgCQlzdHJ1Y3Qg aW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Cj4gIAo+IC0JCWlm ICghbmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKSkKPiArCQlpZiAoIW5lZWRzX21vZGVzZXQoY3J0 Yy0+c3RhdGUpKQo+ICAJCQljb250aW51ZTsKPiAgCj4gLQkJaWYgKCFjcnRjLT5zdGF0ZS0+YWN0 aXZlKQo+ICsJCWlmICghb2xkX2NydGNfc3RhdGUtPmFjdGl2ZSkKPiAgCQkJY29udGludWU7Cj4g IAo+ICAJCWludGVsX2NydGNfZHBtc19vdmVybGF5X2Rpc2FibGUodG9faW50ZWxfY3J0YyhjcnRj KSk7Cj4gQEAgLTEyMzI5LDcgKzEyMjkzLDcgQEAgc3RhdGljIGludCBfX2ludGVsX3NldF9tb2Rl KHN0cnVjdCBkcm1fY3J0YyAqbW9kZXNldF9jcnRjLAo+ICAJbW9kZXNldF91cGRhdGVfY3J0Y19w b3dlcl9kb21haW5zKHN0YXRlKTsKPiAgCj4gIAkvKiBOb3cgZW5hYmxlIHRoZSBjbG9ja3MsIHBs YW5lLCBwaXBlLCBhbmQgY29ubmVjdG9ycyB0aGF0IHdlIHNldCB1cC4gKi8KPiAtCWZvcl9lYWNo X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKPiArCWZvcl9lYWNo X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBpKSB7Cj4gIAkJaWYg KCFjcnRjLT5zdGF0ZS0+YWN0aXZlKSB7Cj4gIAkJCWlmIChuZWVkc19tb2Rlc2V0KGNydGMtPnN0 YXRlKSkKPiAgCQkJCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGNydGMpOwo+IC0tIAo+IDIuMS4w Cj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBJ bnRlbC1nZnggbWFpbGluZyBsaXN0Cj4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+ IGh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK Ci0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3JhdGlvbgpo dHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=