From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 10/12] drm/i915: Rename intel_{enable, disable}_plane to intel_{enable, disable}_primary_plane Date: Tue, 1 Oct 2013 18:02:19 +0300 Message-ID: <1380639741-5276-11-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 8C19DE75A1 for ; Tue, 1 Oct 2013 08:03:07 -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 ZSBuZXcgbmFtZXMgbWFrZSBpdCBjbGVhcmVyIHdoaWNoIHBsYW5lIHdlJ3JlIHRhbGtpbmcgYWJv dXQuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXgu aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDI2 ICsrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTMgaW5zZXJ0aW9u cygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmlu ZGV4IGJlNmExOWQuLjc2YTc3ZjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK QEAgLTE3OTksMTUgKzE3OTksMTUgQEAgdm9pZCBpbnRlbF9mbHVzaF9wcmltYXJ5X3BsYW5lKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIH0KIAogLyoqCi0gKiBpbnRlbF9lbmFi bGVfcGxhbmUgLSBlbmFibGUgYSBkaXNwbGF5IHBsYW5lIG9uIGEgZ2l2ZW4gcGlwZQorICogaW50 ZWxfZW5hYmxlX3ByaW1hcnlfcGxhbmUgLSBlbmFibGUgdGhlIHByaW1hcnkgcGxhbmUgb24gYSBn aXZlbiBwaXBlCiAgKiBAZGV2X3ByaXY6IGk5MTUgcHJpdmF0ZSBzdHJ1Y3R1cmUKICAqIEBwbGFu ZTogcGxhbmUgdG8gZW5hYmxlCiAgKiBAcGlwZTogcGlwZSBiZWluZyBmZWQKICAqCiAgKiBFbmFi bGUgQHBsYW5lIG9uIEBwaXBlLCBtYWtpbmcgc3VyZSB0aGF0IEBwaXBlIGlzIHJ1bm5pbmcgZmly c3QuCiAgKi8KLXN0YXRpYyB2b2lkIGludGVsX2VuYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgICAgICAgZW51bSBwbGFuZSBwbGFuZSwgZW51bSBwaXBl IHBpcGUpCitzdGF0aWMgdm9pZCBpbnRlbF9lbmFibGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJICAgICAgIGVudW0gcGxhbmUgcGxhbmUsIGVu dW0gcGlwZSBwaXBlKQogewogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0KIAkJdG9f aW50ZWxfY3J0YyhkZXZfcHJpdi0+cGlwZV90b19jcnRjX21hcHBpbmdbcGlwZV0pOwpAQCAtMTgz MCwxNSArMTgzMCwxNSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9lbmFibGVfcGxhbmUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogfQogCiAvKioKLSAqIGludGVsX2Rpc2FibGVfcGxh bmUgLSBkaXNhYmxlIGEgZGlzcGxheSBwbGFuZQorICogaW50ZWxfZGlzYWJsZV9wcmltYXJ5X3Bs YW5lIC0gZGlzYWJsZSB0aGUgcHJpbWFyeSBwbGFuZQogICogQGRldl9wcml2OiBpOTE1IHByaXZh dGUgc3RydWN0dXJlCiAgKiBAcGxhbmU6IHBsYW5lIHRvIGRpc2FibGUKICAqIEBwaXBlOiBwaXBl IGNvbnN1bWluZyB0aGUgZGF0YQogICoKICAqIERpc2FibGUgQHBsYW5lOyBzaG91bGQgYmUgYW4g aW5kZXBlbmRlbnQgb3BlcmF0aW9uLgogICovCi1zdGF0aWMgdm9pZCBpbnRlbF9kaXNhYmxlX3Bs YW5lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCQllbnVtIHBsYW5lIHBs YW5lLCBlbnVtIHBpcGUgcGlwZSkKK3N0YXRpYyB2b2lkIGludGVsX2Rpc2FibGVfcHJpbWFyeV9w bGFuZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJCWVudW0gcGxhbmUg cGxhbmUsIGVudW0gcGlwZSBwaXBlKQogewogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj ID0KIAkJdG9faW50ZWxfY3J0YyhkZXZfcHJpdi0+cGlwZV90b19jcnRjX21hcHBpbmdbcGlwZV0p OwpAQCAtMzQxMyw3ICszNDEzLDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfY3J0Y19lbmFibGUo c3RydWN0IGRybV9jcnRjICpjcnRjKQogCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGNydGMpOwog CWludGVsX2VuYWJsZV9waXBlKGRldl9wcml2LCBwaXBlLAogCQkJICBpbnRlbF9jcnRjLT5jb25m aWcuaGFzX3BjaF9lbmNvZGVyLCBmYWxzZSk7Ci0JaW50ZWxfZW5hYmxlX3BsYW5lKGRldl9wcml2 LCBwbGFuZSwgcGlwZSk7CisJaW50ZWxfZW5hYmxlX3ByaW1hcnlfcGxhbmUoZGV2X3ByaXYsIHBs YW5lLCBwaXBlKTsKIAlpbnRlbF9lbmFibGVfcGxhbmVzKGNydGMpOwogCWludGVsX2NydGNfdXBk YXRlX2N1cnNvcihjcnRjLCB0cnVlKTsKIApAQCAtMzQ5MCw3ICszNDkwLDcgQEAgc3RhdGljIHZv aWQgaGFzd2VsbF9jcnRjX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJaW50ZWxfdXBk YXRlX3dhdGVybWFya3MoY3J0Yyk7CiAJaW50ZWxfZW5hYmxlX3BpcGUoZGV2X3ByaXYsIHBpcGUs CiAJCQkgIGludGVsX2NydGMtPmNvbmZpZy5oYXNfcGNoX2VuY29kZXIsIGZhbHNlKTsKLQlpbnRl bF9lbmFibGVfcGxhbmUoZGV2X3ByaXYsIHBsYW5lLCBwaXBlKTsKKwlpbnRlbF9lbmFibGVfcHJp bWFyeV9wbGFuZShkZXZfcHJpdiwgcGxhbmUsIHBpcGUpOwogCWludGVsX2VuYWJsZV9wbGFuZXMo Y3J0Yyk7CiAJaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKGNydGMsIHRydWUpOwogCkBAIC0zNTU5 LDcgKzM1NTksNyBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9jcnRjX2Rpc2FibGUoc3RydWN0IGRy bV9jcnRjICpjcnRjKQogCiAJaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKGNydGMsIGZhbHNlKTsK IAlpbnRlbF9kaXNhYmxlX3BsYW5lcyhjcnRjKTsKLQlpbnRlbF9kaXNhYmxlX3BsYW5lKGRldl9w cml2LCBwbGFuZSwgcGlwZSk7CisJaW50ZWxfZGlzYWJsZV9wcmltYXJ5X3BsYW5lKGRldl9wcml2 LCBwbGFuZSwgcGlwZSk7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLmhhc19wY2hfZW5jb2Rl cikKIAkJaW50ZWxfc2V0X3BjaF9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXYsIHBpcGUsIGZh bHNlKTsKQEAgLTM2MzYsNyArMzYzNiw3IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfY3J0Y19kaXNh YmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCWludGVsX2NydGNfdXBkYXRlX2N1cnNvcihj cnRjLCBmYWxzZSk7CiAJaW50ZWxfZGlzYWJsZV9wbGFuZXMoY3J0Yyk7Ci0JaW50ZWxfZGlzYWJs ZV9wbGFuZShkZXZfcHJpdiwgcGxhbmUsIHBpcGUpOworCWludGVsX2Rpc2FibGVfcHJpbWFyeV9w bGFuZShkZXZfcHJpdiwgcGxhbmUsIHBpcGUpOwogCiAJaWYgKGludGVsX2NydGMtPmNvbmZpZy5o YXNfcGNoX2VuY29kZXIpCiAJCWludGVsX3NldF9wY2hfZmlmb191bmRlcnJ1bl9yZXBvcnRpbmco ZGV2LCBUUkFOU0NPREVSX0EsIGZhbHNlKTsKQEAgLTM3NzksNyArMzc3OSw3IEBAIHN0YXRpYyB2 b2lkIHZhbGxleXZpZXdfY3J0Y19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJaW50 ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7CiAJaW50ZWxfZW5hYmxlX3BpcGUoZGV2X3ByaXYs IHBpcGUsIGZhbHNlLCBpc19kc2kpOwotCWludGVsX2VuYWJsZV9wbGFuZShkZXZfcHJpdiwgcGxh bmUsIHBpcGUpOworCWludGVsX2VuYWJsZV9wcmltYXJ5X3BsYW5lKGRldl9wcml2LCBwbGFuZSwg cGlwZSk7CiAJaW50ZWxfZW5hYmxlX3BsYW5lcyhjcnRjKTsKIAlpbnRlbF9jcnRjX3VwZGF0ZV9j dXJzb3IoY3J0YywgdHJ1ZSk7CiAKQEAgLTM4MTcsNyArMzgxNyw3IEBAIHN0YXRpYyB2b2lkIGk5 eHhfY3J0Y19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJaW50ZWxfdXBkYXRlX3dh dGVybWFya3MoY3J0Yyk7CiAJaW50ZWxfZW5hYmxlX3BpcGUoZGV2X3ByaXYsIHBpcGUsIGZhbHNl LCBmYWxzZSk7Ci0JaW50ZWxfZW5hYmxlX3BsYW5lKGRldl9wcml2LCBwbGFuZSwgcGlwZSk7CisJ aW50ZWxfZW5hYmxlX3ByaW1hcnlfcGxhbmUoZGV2X3ByaXYsIHBsYW5lLCBwaXBlKTsKIAlpbnRl bF9lbmFibGVfcGxhbmVzKGNydGMpOwogCS8qIFRoZSBmaXh1cCBuZWVkcyB0byBoYXBwZW4gYmVm b3JlIGN1cnNvciBpcyBlbmFibGVkICovCiAJaWYgKElTX0c0WChkZXYpKQpAQCAtMzg3Myw3ICsz ODczLDcgQEAgc3RhdGljIHZvaWQgaTl4eF9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpj cnRjKQogCWludGVsX2NydGNfZHBtc19vdmVybGF5KGludGVsX2NydGMsIGZhbHNlKTsKIAlpbnRl bF9jcnRjX3VwZGF0ZV9jdXJzb3IoY3J0YywgZmFsc2UpOwogCWludGVsX2Rpc2FibGVfcGxhbmVz KGNydGMpOwotCWludGVsX2Rpc2FibGVfcGxhbmUoZGV2X3ByaXYsIHBsYW5lLCBwaXBlKTsKKwlp bnRlbF9kaXNhYmxlX3ByaW1hcnlfcGxhbmUoZGV2X3ByaXYsIHBsYW5lLCBwaXBlKTsKIAogCWlu dGVsX2Rpc2FibGVfcGlwZShkZXZfcHJpdiwgcGlwZSk7CiAKLS0gCjEuOC4xLjUKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==