From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 11/42] drm/i915: Update less state during modeset. Date: Mon, 11 May 2015 16:24:47 +0200 Message-ID: <1431354318-11995-12-git-send-email-maarten.lankhorst@linux.intel.com> References: <1431354318-11995-1-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 mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTP id 228356E3F8 for ; Mon, 11 May 2015 07:25:44 -0700 (PDT) In-Reply-To: <1431354318-11995-1-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: intel-gfx@lists.freedesktop.org Cc: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org Tm8gbmVlZCB0byByZXBlYXRlZGx5IGNhbGwgdXBkYXRlX3dhdGVybWFya3MsIG9yIHVwZGF0ZV9m YmMuCkZvciB1cGRhdGVfd2F0ZXJtYXJrcyBvbmNlIHNob3VsZCBiZSBlbm91Z2ggYWZ0ZXIgZGlz YWJsaW5nIGNydGMncwphbmQgc3dhcHBpbmcgdGhlIHN0YXRlLgoKRG93biB0byBhIHNpbmdsZSBj YWxsIHRvIHVwZGF0ZV93YXRlcm1hcmtzIGluIC5jcnRjX2VuYWJsZQoKU2lnbmVkLW9mZi1ieTog TWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA3OSArKysrKysrKysrKysr LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCsp LCA1MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXgg OTYxMGY3NmEyNDg5Li5hOTBlYmM4ZWZmNmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKQEAgLTQ3MTksMTAgKzQ3MTksNiBAQCBpbnRlbF9wb3N0X2VuYWJsZV9wcmltYXJ5KHN0 cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkgKi8KIAloc3dfZW5hYmxlX2lwcyhpbnRlbF9jcnRjKTsK IAotCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQlpbnRlbF9mYmNfdXBkYXRlKGRl dik7Ci0JbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0KIAkvKgogCSAqIEdlbjIg cmVwb3J0cyBwaXBlIHVuZGVycnVucyB3aGVuZXZlciBhbGwgcGxhbmVzIGFyZSBkaXNhYmxlZC4K IAkgKiBTbyBkb24ndCBlbmFibGUgdW5kZXJydW4gcmVwb3J0aW5nIGJlZm9yZSBhdCBsZWFzdCBz b21lIHBsYW5lcwpAQCAtNDc3NywxMSArNDc3Myw2IEBAIGludGVsX3ByZV9kaXNhYmxlX3ByaW1h cnkoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWlmIChIQVNfR01DSF9ESVNQTEFZKGRldikpCiAJ CWludGVsX3NldF9tZW1vcnlfY3hzcihkZXZfcHJpdiwgZmFsc2UpOwogCi0JbXV0ZXhfbG9jaygm ZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCWlmIChkZXZfcHJpdi0+ZmJjLmNydGMgPT0gaW50ZWxfY3J0 YykKLQkJaW50ZWxfZmJjX2Rpc2FibGUoZGV2KTsKLQltdXRleF91bmxvY2soJmRldi0+c3RydWN0 X211dGV4KTsKLQogCS8qCiAJICogRklYTUUgSVBTIHNob3VsZCBiZSBmaW5lIGFzIGxvbmcgYXMg b25lIHBsYW5lIGlzCiAJICogZW5hYmxlZCwgYnV0IGluIHByYWN0aWNlIGl0IHNlZW1zIHRvIGhh dmUgcHJvYmxlbXMKQEAgLTUwMDksOSArNTAwMCw2IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX2Ny dGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJaW50IHBpcGUgPSBpbnRlbF9jcnRj LT5waXBlOwogCXUzMiByZWcsIHRlbXA7CiAKLQlpZiAoIWludGVsX2NydGMtPmFjdGl2ZSkKLQkJ cmV0dXJuOwotCiAJZm9yX2VhY2hfZW5jb2Rlcl9vbl9jcnRjKGRldiwgY3J0YywgZW5jb2RlcikK IAkJZW5jb2Rlci0+ZGlzYWJsZShlbmNvZGVyKTsKIApAQCAtNTA0OSwxOCArNTAzNyw4IEBAIHN0 YXRpYyB2b2lkIGlyb25sYWtlX2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJ CQlJOTE1X1dSSVRFKFBDSF9EUExMX1NFTCwgdGVtcCk7CiAJCX0KIAotCQkvKiBkaXNhYmxlIFBD SCBEUExMICovCi0JCWludGVsX2Rpc2FibGVfc2hhcmVkX2RwbGwoaW50ZWxfY3J0Yyk7Ci0KIAkJ aXJvbmxha2VfZmRpX3BsbF9kaXNhYmxlKGludGVsX2NydGMpOwogCX0KLQotCWludGVsX2NydGMt PmFjdGl2ZSA9IGZhbHNlOwotCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGNydGMpOwotCi0JbXV0 ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCWludGVsX2ZiY191cGRhdGUoZGV2KTsKLQlt dXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIH0KIAogc3RhdGljIHZvaWQgaGFzd2Vs bF9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQpAQCAtNTA3MSw5ICs1MDQ5LDYg QEAgc3RhdGljIHZvaWQgaGFzd2VsbF9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRj KQogCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOwogCWVudW0gdHJhbnNjb2RlciBjcHVf dHJhbnNjb2RlciA9IGludGVsX2NydGMtPmNvbmZpZy0+Y3B1X3RyYW5zY29kZXI7CiAKLQlpZiAo IWludGVsX2NydGMtPmFjdGl2ZSkKLQkJcmV0dXJuOwotCiAJZm9yX2VhY2hfZW5jb2Rlcl9vbl9j cnRjKGRldiwgY3J0YywgZW5jb2RlcikgewogCQlpbnRlbF9vcHJlZ2lvbl9ub3RpZnlfZW5jb2Rl cihlbmNvZGVyLCBmYWxzZSk7CiAJCWVuY29kZXItPmRpc2FibGUoZW5jb2Rlcik7CkBAIC01MTA5 LDE2ICs1MDg0LDYgQEAgc3RhdGljIHZvaWQgaGFzd2VsbF9jcnRjX2Rpc2FibGUoc3RydWN0IGRy bV9jcnRjICpjcnRjKQogCWZvcl9lYWNoX2VuY29kZXJfb25fY3J0YyhkZXYsIGNydGMsIGVuY29k ZXIpCiAJCWlmIChlbmNvZGVyLT5wb3N0X2Rpc2FibGUpCiAJCQllbmNvZGVyLT5wb3N0X2Rpc2Fi bGUoZW5jb2Rlcik7Ci0KLQlpbnRlbF9jcnRjLT5hY3RpdmUgPSBmYWxzZTsKLQlpbnRlbF91cGRh dGVfd2F0ZXJtYXJrcyhjcnRjKTsKLQotCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsK LQlpbnRlbF9mYmNfdXBkYXRlKGRldik7Ci0JbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRl eCk7Ci0KLQlpZiAoaW50ZWxfY3J0Y190b19zaGFyZWRfZHBsbChpbnRlbF9jcnRjKSkKLQkJaW50 ZWxfZGlzYWJsZV9zaGFyZWRfZHBsbChpbnRlbF9jcnRjKTsKIH0KIAogc3RhdGljIHZvaWQgaTl4 eF9wZml0X2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKQEAgLTU5NDMsOSArNTkwOCw2 IEBAIHN0YXRpYyB2b2lkIGk5eHhfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK IAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKIAlpbnQgcGlwZSA9IGludGVsX2NydGMt PnBpcGU7CiAKLQlpZiAoIWludGVsX2NydGMtPmFjdGl2ZSkKLQkJcmV0dXJuOwotCiAJLyoKIAkg KiBPbiBnZW4yIHBsYW5lcyBhcmUgZG91YmxlIGJ1ZmZlcmVkIGJ1dCB0aGUgcGlwZSBpc24ndCwg c28gd2UgbXVzdAogCSAqIHdhaXQgZm9yIHBsYW5lcyB0byBmdWxseSB0dXJuIG9mZiBiZWZvcmUg ZGlzYWJsaW5nIHRoZSBwaXBlLgpAQCAtNTk3OSwxMyArNTk0MSw2IEBAIHN0YXRpYyB2b2lkIGk5 eHhfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCWlmICghSVNfR0VOMihk ZXYpKQogCQlpbnRlbF9zZXRfY3B1X2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKGRldl9wcml2LCBw aXBlLCBmYWxzZSk7Ci0KLQlpbnRlbF9jcnRjLT5hY3RpdmUgPSBmYWxzZTsKLQlpbnRlbF91cGRh dGVfd2F0ZXJtYXJrcyhjcnRjKTsKLQotCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsK LQlpbnRlbF9mYmNfdXBkYXRlKGRldik7Ci0JbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRl eCk7CiB9CiAKIC8qIE1hc3RlciBmdW5jdGlvbiB0byBlbmFibGUvZGlzYWJsZSBDUlRDIGFuZCBj b3JyZXNwb25kaW5nIHBvd2VyIHdlbGxzICovCkBAIC0xMjM0NywxMSArMTIzMDIsMjEgQEAgc3Rh dGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqbW9kZXNldF9jcnRjLAog CV9faW50ZWxfc2V0X21vZGVfdXBkYXRlX3BsYW5lcyhkZXYsIHN0YXRlKTsKIAogCWZvcl9lYWNo X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKKwkJc3RydWN0IGlu dGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOworCiAJCWlmICghbmVl ZHNfbW9kZXNldChjcnRjX3N0YXRlKSkKIAkJCWNvbnRpbnVlOwogCisJCWlmICghY3J0Yy0+c3Rh dGUtPmFjdGl2ZSkKKwkJCWNvbnRpbnVlOworCiAJCWludGVsX2NydGNfZHBtc19vdmVybGF5X2Rp c2FibGUodG9faW50ZWxfY3J0YyhjcnRjKSk7CiAJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlz YWJsZShjcnRjKTsKKworCQlpbnRlbF9jcnRjLT5hY3RpdmUgPSBmYWxzZTsKKworCQlpZiAoaW50 ZWxfY3J0Y190b19zaGFyZWRfZHBsbChpbnRlbF9jcnRjKSkKKwkJCWludGVsX2Rpc2FibGVfc2hh cmVkX2RwbGwoaW50ZWxfY3J0Yyk7CiAJfQogCiAJLyogT25seSBhZnRlciBkaXNhYmxpbmcgYWxs IG91dHB1dCBwaXBlbGluZXMgdGhhdCB3aWxsIGJlIGNoYW5nZWQgY2FuIHdlCkBAIC0xMjM2NSw4 ICsxMjMzMCwxMSBAQCBzdGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRj ICptb2Rlc2V0X2NydGMsCiAKIAkvKiBOb3cgZW5hYmxlIHRoZSBjbG9ja3MsIHBsYW5lLCBwaXBl LCBhbmQgY29ubmVjdG9ycyB0aGF0IHdlIHNldCB1cC4gKi8KIAlmb3JfZWFjaF9jcnRjX2luX3N0 YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7Ci0JCWlmICghY3J0Yy0+c3RhdGUtPmFj dGl2ZSkKKwkJaWYgKCFjcnRjLT5zdGF0ZS0+YWN0aXZlKSB7CisJCQlpZiAobmVlZHNfbW9kZXNl dChjcnRjLT5zdGF0ZSkpCisJCQkJaW50ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7CiAJCQlj b250aW51ZTsKKwkJfQogCiAJCXVwZGF0ZV9zY2FubGluZV9vZmZzZXQodG9faW50ZWxfY3J0Yyhj cnRjKSk7CiAKQEAgLTEzMDMwLDYgKzEyOTk4LDcgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNf Y2hlY2tfY3J0YyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAltZW1zZXQoJmludGVsX2NydGMt PmF0b21pYywgMCwgc2l6ZW9mKGludGVsX2NydGMtPmF0b21pYykpOwogCWludGVsX2NydGMtPmF0 b21pYy51cGRhdGVfd20gPSBtb2RlX2NoYW5nZWQ7CisJaW50ZWxfY3J0Yy0+YXRvbWljLmRpc2Fi bGVfZmJjID0gbW9kZV9jaGFuZ2VkOwogCiAJaWR4ID0gY3J0Yy0+YmFzZS5pZDsKIAlJOTE1X1NU QVRFX1dBUk4oY3J0Yy0+c3RhdGUtPmFjdGl2ZSAhPSBpbnRlbF9jcnRjLT5hY3RpdmUsCkBAIC0x MzE2NSw2ICsxMzEzNCw5IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NoZWNrX2NydGMoc3Ry dWN0IGRybV9jcnRjICpjcnRjLAogCQkJYnJlYWs7CiAJCX0KIAl9CisKKwlpZiAobW9kZV9jaGFu Z2VkKQorCQlpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3dtID0gZmFsc2U7CiAJcmV0dXJuIDA7 CiB9CiAKQEAgLTEzMjA0LDggKzEzMTc2LDEzIEBAIHN0YXRpYyB2b2lkIGludGVsX2JlZ2luX2Ny dGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlpZiAoaW50ZWxfY3J0Yy0+YXRvbWlj LndhaXRfZm9yX2ZsaXBzKQogCQlpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoY3J0 Yyk7CiAKLQlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLmRpc2FibGVfZmJjKQotCQlpbnRlbF9mYmNf ZGlzYWJsZShkZXYpOworCWlmIChpbnRlbF9jcnRjLT5hdG9taWMuZGlzYWJsZV9mYmMgJiYKKwkg ICAgZGV2X3ByaXYtPmZiYy5jcnRjID09IGludGVsX2NydGMpIHsKKwkJbXV0ZXhfbG9jaygmZGV2 LT5zdHJ1Y3RfbXV0ZXgpOworCQlpZiAoZGV2X3ByaXYtPmZiYy5jcnRjID09IGludGVsX2NydGMp CisJCQlpbnRlbF9mYmNfZGlzYWJsZShkZXYpOworCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0 X211dGV4KTsKKwl9CiAKIAlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLnByZV9kaXNhYmxlX3ByaW1h cnkpCiAJCWludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoY3J0Yyk7CkBAIC0xMzI0NCwxNSArMTMy MjEsMTUgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmluaXNoX2NydGNfY29tbWl0KHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKIAogCWludGVsX2Zyb250YnVmZmVyX2ZsaXAoZGV2LCBpbnRlbF9jcnRjLT5h dG9taWMuZmJfYml0cyk7CiAKKwlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLnBvc3RfZW5hYmxlX3By aW1hcnkpCisJCWludGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoY3J0Yyk7CisKIAlpZiAoaW50ZWxf Y3J0Yy0+YXRvbWljLnVwZGF0ZV9mYmMpIHsKIAkJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0 ZXgpOwogCQlpbnRlbF9mYmNfdXBkYXRlKGRldik7CiAJCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1 Y3RfbXV0ZXgpOwogCX0KIAotCWlmIChpbnRlbF9jcnRjLT5hdG9taWMucG9zdF9lbmFibGVfcHJp bWFyeSkKLQkJaW50ZWxfcG9zdF9lbmFibGVfcHJpbWFyeShjcnRjKTsKLQogCXBsYW5lX21hc2sg PSBpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzOwogCWRybV9mb3Jf ZWFjaF9wbGFuZV9tYXNrKHAsIGRldiwgcGxhbmVfbWFzaykKIAkJaW50ZWxfdXBkYXRlX3Nwcml0 ZV93YXRlcm1hcmtzKHAsIGNydGMsIDAsIDAsIDAsIGZhbHNlLCBmYWxzZSk7Ci0tIAoyLjEuMAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK