From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 09/12] drm/i915: Rename intel_flush_display_plane to intel_flush_primary_plane Date: Tue, 1 Oct 2013 18:02:18 +0300 Message-ID: <1380639741-5276-10-git-send-email-ville.syrjala@linux.intel.com> References: <1380639741-5276-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id BD8AFE75A5 for ; Tue, 1 Oct 2013 08:03:05 -0700 (PDT) In-Reply-To: <1380639741-5276-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRo ZSBpbnRlbF9mbHVzaF9wcmltYXJ5X3BsYW5lIG5hbWUgYWN0dWFsbHkgdGVsbHMgdXMgd2hpY2gg cGxhbmUKd2UncmUgdGFsa2luZyBhYm91dC4KCkFsc28gcmVvcmdhbml6ZSB0aGUgaW50ZXJuYWxz IGEgYml0IGFuZCBhZGQgYSBtaXNzaW5nIFBPU1RJTkdfUkVBRCgpCnRvIG1ha2Ugc3VyZSB0aGUg aGFyZHdhcmUgaGFzIHNlZW4gdGhlIGNoYW5nZXMgYnkgdGhlIHRpbWUgd2UKcmV0dXJuIGZyb20g dGhlIGZ1bmN0aW9uLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJq YWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgfCAxNiArKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaCAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgIHwg IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3R2LmMgICAgICB8ICA0ICsrLS0KIDQg ZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGVlZjRmZGMuLmJlNmExOWQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTE3ODksMTMgKzE3ODksMTMgQEAgc3RhdGlj IHZvaWQgaW50ZWxfZGlzYWJsZV9waXBlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKICAqIFBsYW5lIHJlZ3MgYXJlIGRvdWJsZSBidWZmZXJlZCwgZ29pbmcgZnJvbSBlbmFibGVk LT5kaXNhYmxlZCBuZWVkcyBhCiAgKiB0cmlnZ2VyIGluIG9yZGVyIHRvIGxhdGNoLiAgVGhlIGRp c3BsYXkgYWRkcmVzcyByZWcgcHJvdmlkZXMgdGhpcy4KICAqLwotdm9pZCBpbnRlbF9mbHVzaF9k aXNwbGF5X3BsYW5lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCQkgICAg ICBlbnVtIHBsYW5lIHBsYW5lKQordm9pZCBpbnRlbF9mbHVzaF9wcmltYXJ5X3BsYW5lKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCSAgICAgICBlbnVtIHBsYW5lIHBsYW5l KQogewotCWlmIChkZXZfcHJpdi0+aW5mby0+Z2VuID49IDQpCi0JCUk5MTVfV1JJVEUoRFNQU1VS RihwbGFuZSksIEk5MTVfUkVBRChEU1BTVVJGKHBsYW5lKSkpOwotCWVsc2UKLQkJSTkxNV9XUklU RShEU1BBRERSKHBsYW5lKSwgSTkxNV9SRUFEKERTUEFERFIocGxhbmUpKSk7CisJdTMyIHJlZyA9 IGRldl9wcml2LT5pbmZvLT5nZW4gPj0gNCA/IERTUFNVUkYocGxhbmUpIDogRFNQQUREUihwbGFu ZSk7CisKKwlJOTE1X1dSSVRFKHJlZywgSTkxNV9SRUFEKHJlZykpOworCVBPU1RJTkdfUkVBRChy ZWcpOwogfQogCiAvKioKQEAgLTE4MjUsNyArMTgyNSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2Vu YWJsZV9wbGFuZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCXJldHVybjsK IAogCUk5MTVfV1JJVEUocmVnLCB2YWwgfCBESVNQTEFZX1BMQU5FX0VOQUJMRSk7Ci0JaW50ZWxf Zmx1c2hfZGlzcGxheV9wbGFuZShkZXZfcHJpdiwgcGxhbmUpOworCWludGVsX2ZsdXNoX3ByaW1h cnlfcGxhbmUoZGV2X3ByaXYsIHBsYW5lKTsKIAlpbnRlbF93YWl0X2Zvcl92YmxhbmsoZGV2X3By aXYtPmRldiwgcGlwZSk7CiB9CiAKQEAgLTE4NTMsNyArMTg1Myw3IEBAIHN0YXRpYyB2b2lkIGlu dGVsX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQly ZXR1cm47CiAKIAlJOTE1X1dSSVRFKHJlZywgdmFsICYgfkRJU1BMQVlfUExBTkVfRU5BQkxFKTsK LQlpbnRlbF9mbHVzaF9kaXNwbGF5X3BsYW5lKGRldl9wcml2LCBwbGFuZSk7CisJaW50ZWxfZmx1 c2hfcHJpbWFyeV9wbGFuZShkZXZfcHJpdiwgcGxhbmUpOwogCWludGVsX3dhaXRfZm9yX3ZibGFu ayhkZXZfcHJpdi0+ZGV2LCBwaXBlKTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRl eCAxYmExYTkyLi45OTk3N2I2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtODE0LDcg KzgxNCw3IEBAIGJvb2wgaW50ZWxfc2R2b19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVp bnQzMl90IHNkdm9fcmVnLCBib29sIGlzX3Nkdm9iKTsKIAogLyogaW50ZWxfc3ByaXRlLmMgKi8K IGludCBpbnRlbF9wbGFuZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcGlwZSBw aXBlLCBpbnQgcGxhbmUpOwotdm9pZCBpbnRlbF9mbHVzaF9kaXNwbGF5X3BsYW5lKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKK3ZvaWQgaW50ZWxfZmx1c2hfcHJpbWFyeV9wbGFu ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgICAgICAgZW51bSBwbGFu ZSBwbGFuZSk7CiB2b2lkIGludGVsX3BsYW5lX3Jlc3RvcmUoc3RydWN0IGRybV9wbGFuZSAqcGxh bmUpOwogdm9pZCBpbnRlbF9wbGFuZV9kaXNhYmxlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDY5ODI1N2MuLjQzYmFiZTkgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYwpAQCAtNDcwNCw3ICs0NzA0LDcgQEAgc3RhdGljIHZvaWQgZzR4X2Rpc2Fi bGVfdHJpY2tsZV9mZWVkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCUk5MTVfV1JJVEUoRFNQ Q05UUihwaXBlKSwKIAkJCSAgIEk5MTVfUkVBRChEU1BDTlRSKHBpcGUpKSB8CiAJCQkgICBESVNQ UExBTkVfVFJJQ0tMRV9GRUVEX0RJU0FCTEUpOwotCQlpbnRlbF9mbHVzaF9kaXNwbGF5X3BsYW5l KGRldl9wcml2LCBwaXBlKTsKKwkJaW50ZWxfZmx1c2hfcHJpbWFyeV9wbGFuZShkZXZfcHJpdiwg cGlwZSk7CiAJfQogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF90 di5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdHYuYwppbmRleCA5Mjg5NWY5Li4xZjdl OGNhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF90di5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3R2LmMKQEAgLTEwOTQsNyArMTA5NCw3IEBAIHN0YXRp YyB2b2lkIGludGVsX3R2X21vZGVfc2V0KHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQog CQl1bnNpZ25lZCBpbnQgeHNpemUsIHlzaXplOwogCQkvKiBQaXBlIG11c3QgYmUgb2ZmIGhlcmUg Ki8KIAkJSTkxNV9XUklURShkc3BjbnRyX3JlZywgZHNwY250ciAmIH5ESVNQTEFZX1BMQU5FX0VO QUJMRSk7Ci0JCWludGVsX2ZsdXNoX2Rpc3BsYXlfcGxhbmUoZGV2X3ByaXYsIGludGVsX2NydGMt PnBsYW5lKTsKKwkJaW50ZWxfZmx1c2hfcHJpbWFyeV9wbGFuZShkZXZfcHJpdiwgaW50ZWxfY3J0 Yy0+cGxhbmUpOwogCiAJCS8qIFdhaXQgZm9yIHZibGFuayBmb3IgdGhlIGRpc2FibGUgdG8gdGFr ZSBlZmZlY3QgKi8KIAkJaWYgKElTX0dFTjIoZGV2KSkKQEAgLTExMjMsNyArMTEyMyw3IEBAIHN0 YXRpYyB2b2lkIGludGVsX3R2X21vZGVfc2V0KHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVy KQogCiAJCUk5MTVfV1JJVEUocGlwZWNvbmZfcmVnLCBwaXBlY29uZik7CiAJCUk5MTVfV1JJVEUo ZHNwY250cl9yZWcsIGRzcGNudHIpOwotCQlpbnRlbF9mbHVzaF9kaXNwbGF5X3BsYW5lKGRldl9w cml2LCBpbnRlbF9jcnRjLT5wbGFuZSk7CisJCWludGVsX2ZsdXNoX3ByaW1hcnlfcGxhbmUoZGV2 X3ByaXYsIGludGVsX2NydGMtPnBsYW5lKTsKIAl9CiAKIAlqID0gMDsKLS0gCjEuOC4xLjUKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==