From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 09/42] drm/i915: Make intel_modeset_fixup_state similar to the atomic helper. Date: Tue, 12 May 2015 08:59:28 +0200 Message-ID: <20150512065928.GV15256@phenom.ffwll.local> References: <1431354318-11995-1-git-send-email-maarten.lankhorst@linux.intel.com> <1431354318-11995-10-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-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by gabe.freedesktop.org (Postfix) with ESMTP id 814726E562 for ; Mon, 11 May 2015 23:57:07 -0700 (PDT) Received: by wgic8 with SMTP id c8so127587754wgi.1 for ; Mon, 11 May 2015 23:57:06 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1431354318-11995-10-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 T24gTW9uLCBNYXkgMTEsIDIwMTUgYXQgMDQ6MjQ6NDVQTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gVGhpcyBzaG91bGQgYmUgc2FmZS4KClVzdWFsIHJlcXVlc3Q6IEEgZmV3IG1v cmUgZGV0YWlscyBhYm91dCB3aGF0IHlvdSd2ZSBjaGFuZ2VkIHRvIGhlbHAgZ3VpZGUKdGhlIHJl dmlldyB3b3VsZCBiZSBncmVhdC4gRS5nLiB3aGljaCBmdW5jdGlvbnMgZnJvbSB0aGUgYXRvbWlj IGhlbHBlcnMKeW91J3JlIHRyeWluZyB0byBjb3B5IGhlcmUgZXhhY3RseS4KCkl0IGxvb2tzIGxp a2UgdGhpcyBtb2RlbHMgc2V0X3JvdXRpbmdfbGlua3MuIEkgdGhpbmsgaXQgd291bGQgYmUgcmF0 aGVyCnVzZWZ1bCB0byBleHBvc2UgdGhpcyB0byBkcml2ZXJzIGFzIGEgaGVscGVyIGZ1bmN0aW9u LCBtYXliZSB3aXRoIGEgbW9yZQp1c2VmdWwgbmFtZSBsaWtlIGRybV9hdG9taWNfaGVscGVyX3Vw ZGF0ZV9sZWdhY3lfc3RhdGUgb3Igc2ltaWxhci4KCkFub3RoZXIgdGhpbmcgSSd2ZSBub3RpY2Vk IGlzIHRoYXQgYXRvbWljIGhlbHBlcnMgbG9zdCB0aGUgY2FsbCB0bwpkcm1fY2FsY190aW1lc3Rh bXBpbmdfY29uc3RhbnRzLiBXb3VsZCBiZSBnb29kIHRvIGFkZCB0aGF0IHRvIHRoZSBzYW1lCmZ1 bmN0aW9uLgotRGFuaWVsCgo+IAo+IFNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxt YWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDgyICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgNDEgaW5zZXJ0aW9ucygrKSwgNDEgZGVsZXRpb25z KC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+IGluZGV4IGEyMWIyZTUx YzA1NC4uOTU2Yzk5NjQyNzVkIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku Ywo+IEBAIC0xMTA4NCwzNiArMTEwODQsNDggQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF91 cGRhdGVfY29ubmVjdG9yX2F0b21pY19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAJ fQo+ICB9Cj4gIAo+IC0vKiBGaXh1cCBsZWdhY3kgc3RhdGUgYWZ0ZXIgYW4gYXRvbWljIHN0YXRl IHN3YXAuCj4gKy8qCj4gKyAqIEZpeHVwIGxlZ2FjeSBzdGF0ZSBpbiBhIHNpbWlsYXIgd2F5IHRv Cj4gKyAqIGRybV9hdG9taWNfaGVscGVyLmM6c2V0X3JvdXRpbmdfbGlua3MuCj4gICAqLwo+ICBz dGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X2ZpeHVwX3N0YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpzdGF0ZSkKPiAgewo+IC0Jc3RydWN0IGludGVsX2NydGMgKmNydGM7Cj4gLQlzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKPiAtCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5l Y3RvcjsKPiArCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7Cj4gKwlzdHJ1Y3QgZHJt X2NydGNfc3RhdGUgKmNydGNfc3RhdGU7Cj4gKwlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAq Y29ubl9zdGF0ZTsKPiArCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKPiArCWludCBpOwo+ICAKPiAt CWZvcl9lYWNoX2ludGVsX2Nvbm5lY3RvcihzdGF0ZS0+ZGV2LCBjb25uZWN0b3IpIHsKPiAtCQlj b25uZWN0b3ItPmJhc2UuZW5jb2RlciA9IGNvbm5lY3Rvci0+YmFzZS5zdGF0ZS0+YmVzdF9lbmNv ZGVyOwo+IC0JCWlmIChjb25uZWN0b3ItPmJhc2UuZW5jb2RlcikKPiAtCQkJY29ubmVjdG9yLT5i YXNlLmVuY29kZXItPmNydGMgPQo+IC0JCQkJY29ubmVjdG9yLT5iYXNlLnN0YXRlLT5jcnRjOwo+ ICsJLyoKPiArCSAqIHN3YXAgY3J0YyBhbmQgY29ubmVjdG9yIGFuZCB1cGRhdGUgbGVnYWN5IHN0 YXRlLAo+ICsJICogcGxhbmUgc3RhdGUgYWxyZWFkeSBnZXRzIHN3YXBwZWQKPiArCSAqIGJ5IHRo ZSBwbGFuZSBoZWxwZXJzLiBPbmNlIC5jcnRjX2Rpc2FibGUgaXMgZml4ZWQKPiArCSAqIGFsbCBz dGF0ZSBzaG91bGQgYmUgc3dhcHBlZCBiZWZvcmUgZGlzYWJsaW5nIGNydGMncy4KPiArCSAqLwo+ ICsJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewo+ ICsJCWNydGMtPmVuYWJsZWQgPSBjcnRjLT5zdGF0ZS0+ZW5hYmxlOwo+ICsJCWNydGMtPm1vZGUg PSBjcnRjLT5zdGF0ZS0+bW9kZTsKPiAgCX0KPiAgCj4gLQkvKiBVcGRhdGUgY3J0YyBvZiBkaXNh YmxlZCBlbmNvZGVycyAqLwo+IC0JZm9yX2VhY2hfaW50ZWxfZW5jb2RlcihzdGF0ZS0+ZGV2LCBl bmNvZGVyKSB7Cj4gLQkJaW50IG51bV9jb25uZWN0b3JzID0gMDsKPiAtCj4gLQkJZm9yX2VhY2hf aW50ZWxfY29ubmVjdG9yKHN0YXRlLT5kZXYsIGNvbm5lY3RvcikKPiAtCQkJaWYgKGNvbm5lY3Rv ci0+YmFzZS5lbmNvZGVyID09ICZlbmNvZGVyLT5iYXNlKQo+IC0JCQkJbnVtX2Nvbm5lY3RvcnMr KzsKPiArCS8qIGNsZWFyIG91dCBleGlzdGluZyBsaW5rcyAqLwo+ICsJZm9yX2VhY2hfY29ubmVj dG9yX2luX3N0YXRlKHN0YXRlLCBjb25uZWN0b3IsIGNvbm5fc3RhdGUsIGkpIHsKPiArCQlpZiAo IWNvbm5lY3Rvci0+ZW5jb2RlcikKPiArCQkJY29udGludWU7Cj4gIAo+IC0JCWlmIChudW1fY29u bmVjdG9ycyA9PSAwKQo+IC0JCQllbmNvZGVyLT5iYXNlLmNydGMgPSBOVUxMOwo+ICsJCVdBUk5f T04oIWNvbm5lY3Rvci0+ZW5jb2Rlci0+Y3J0Yyk7Cj4gKwkJY29ubmVjdG9yLT5lbmNvZGVyLT5j cnRjID0gTlVMTDsKPiArCQljb25uZWN0b3ItPmVuY29kZXIgPSBOVUxMOwo+ICAJfQo+ICAKPiAt CWZvcl9lYWNoX2ludGVsX2NydGMoc3RhdGUtPmRldiwgY3J0Yykgewo+IC0JCWNydGMtPmJhc2Uu ZW5hYmxlZCA9IGNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZTsKPiAtCQljcnRjLT5jb25maWcgPSB0 b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPmJhc2Uuc3RhdGUpOwo+ICsJZm9yX2VhY2hfY29ubmVj dG9yX2luX3N0YXRlKHN0YXRlLCBjb25uZWN0b3IsIGNvbm5fc3RhdGUsIGkpIHsKPiArCQlpZiAo IWNvbm5lY3Rvci0+c3RhdGUtPmNydGMpCj4gKwkJCWNvbnRpbnVlOwo+ICsKPiArCQlpZiAoV0FS Tl9PTighY29ubmVjdG9yLT5zdGF0ZS0+YmVzdF9lbmNvZGVyKSkKPiArCQkJY29udGludWU7Cj4g Kwo+ICsJCWNvbm5lY3Rvci0+ZW5jb2RlciA9IGNvbm5lY3Rvci0+c3RhdGUtPmJlc3RfZW5jb2Rl cjsKPiArCQljb25uZWN0b3ItPmVuY29kZXItPmNydGMgPSBjb25uZWN0b3ItPnN0YXRlLT5jcnRj Owo+ICAJfQo+ICB9Cj4gIAo+IEBAIC0xMTU1OSw5ICsxMTU3MSwxNiBAQCBpbnRlbF9tb2Rlc2V0 X3VwZGF0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCj4gIAo+ICAJaW50 ZWxfbW9kZXNldF9maXh1cF9zdGF0ZShzdGF0ZSk7Cj4gIAo+IC0JLyogRG91YmxlIGNoZWNrIHN0 YXRlLiAqLwo+ICAJZm9yX2VhY2hfY3J0YyhkZXYsIGNydGMpIHsKPiArCQkvKiBEb3VibGUgY2hl Y2sgc3RhdGUuICovCj4gIAkJV0FSTl9PTihjcnRjLT5zdGF0ZS0+ZW5hYmxlICE9IGludGVsX2Ny dGNfaW5fdXNlKGNydGMpKTsKPiArCj4gKwkJaWYgKCFzdGF0ZS0+Y3J0Y3NbZHJtX2NydGNfaW5k ZXgoY3J0YyldKQo+ICsJCQljb250aW51ZTsKPiArCj4gKwkJdG9faW50ZWxfY3J0YyhjcnRjKS0+ Y29uZmlnID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7Cj4gKwkJaWYgKGNydGMt PnN0YXRlLT5hY3RpdmUgJiYgbmVlZHNfbW9kZXNldChjcnRjLT5zdGF0ZSkpCj4gKwkJCWRybV9j YWxjX3RpbWVzdGFtcGluZ19jb25zdGFudHMoY3J0YywgJmNydGMtPnN0YXRlLT5hZGp1c3RlZF9t b2RlKTsKPiAgCX0KPiAgCj4gIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNvbm5lY3RvciwgJmRldi0+ bW9kZV9jb25maWcuY29ubmVjdG9yX2xpc3QsIGhlYWQpIHsKPiBAQCAtMTIyNzcsMjUgKzEyMjk2 LDYgQEAgc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqbW9kZXNl dF9jcnRjLAo+ICAJCQlkcm1fcGxhbmVfaGVscGVyX2Rpc2FibGUoY3J0Yy0+cHJpbWFyeSk7Cj4g IAl9Cj4gIAo+IC0JLyogY3J0Yy0+bW9kZSBpcyBhbHJlYWR5IHVzZWQgYnkgdGhlIC0+bW9kZV9z ZXQgY2FsbGJhY2tzLCBoZW5jZSB3ZSBuZWVkCj4gLQkgKiB0byBzZXQgaXQgaGVyZSBhbHJlYWR5 IGRlc3BpdGUgdGhhdCB3ZSBwYXNzIGl0IGRvd24gdGhlIGNhbGxjaGFpbi4KPiAtCSAqCj4gLQkg KiBOb3RlIHdlJ2xsIG5lZWQgdG8gZml4IHRoaXMgdXAgd2hlbiB3ZSBzdGFydCB0cmFja2luZyBt dWx0aXBsZQo+IC0JICogcGlwZXM7IGhlcmUgd2UgYXNzdW1lIGEgc2luZ2xlIG1vZGVzZXRfcGlw ZSBhbmQgb25seSB0cmFjayB0aGUKPiAtCSAqIHNpbmdsZSBjcnRjIGFuZCBtb2RlLgo+IC0JICov Cj4gLQlpZiAocGlwZV9jb25maWctPmJhc2UuYWN0aXZlICYmIG5lZWRzX21vZGVzZXQoJnBpcGVf Y29uZmlnLT5iYXNlKSkgewo+IC0JCW1vZGVzZXRfY3J0Yy0+bW9kZSA9IHBpcGVfY29uZmlnLT5i YXNlLm1vZGU7Cj4gLQo+IC0JCS8qCj4gLQkJICogQ2FsY3VsYXRlIGFuZCBzdG9yZSB2YXJpb3Vz IGNvbnN0YW50cyB3aGljaAo+IC0JCSAqIGFyZSBsYXRlciBuZWVkZWQgYnkgdmJsYW5rIGFuZCBz d2FwLWNvbXBsZXRpb24KPiAtCQkgKiB0aW1lc3RhbXBpbmcuIFRoZXkgYXJlIGRlcml2ZWQgZnJv bSB0cnVlIGh3bW9kZS4KPiAtCQkgKi8KPiAtCQlkcm1fY2FsY190aW1lc3RhbXBpbmdfY29uc3Rh bnRzKG1vZGVzZXRfY3J0YywKPiAtCQkJCQkJJnBpcGVfY29uZmlnLT5iYXNlLmFkanVzdGVkX21v ZGUpOwo+IC0JfQo+IC0KPiAgCS8qIE9ubHkgYWZ0ZXIgZGlzYWJsaW5nIGFsbCBvdXRwdXQgcGlw ZWxpbmVzIHRoYXQgd2lsbCBiZSBjaGFuZ2VkIGNhbiB3ZQo+ICAJICogdXBkYXRlIHRoZSB0aGUg b3V0cHV0IGNvbmZpZ3VyYXRpb24uICovCj4gIAlpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9zdGF0ZShz dGF0ZSk7Cj4gLS0gCj4gMi4xLjAKPiAKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwo+IEludGVsLWdmeCBtYWlsaW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAoKLS0gCkRhbmllbCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIs IEludGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==