From mboxrd@z Thu Jan 1 00:00:00 1970 From: Neil Roberts Subject: [PATCH v2] intel: Merge latest i915_drm.h Date: Thu, 19 Mar 2015 17:11:08 +0000 Message-ID: <1426785068-11115-1-git-send-email-neil@linux.intel.com> References: <1425564672-9962-1-git-send-email-neil@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 5E9A96E2E5 for ; Thu, 19 Mar 2015 10:15:15 -0700 (PDT) In-Reply-To: <1425564672-9962-1-git-send-email-neil@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhlIG1haW4gaW5jZW50aXZlIHRvIGRvIHRoaXMgaXMgdG8gZ2V0IEk5MTVfUEFSQU1fUkVWSVNJ T04uCgp2MjogUmViYXNlIG9uIHRvcCBvZiBzb21lIGNoYW5nZXMgdGhhdCB3ZXJlIG1hZGUgdG8g dGhlIGhlYWRlciB3aXRob3V0CiAgICBjb3B5aW5nIHRoZSB3aG9sZSBmaWxlIGZyb20gdGhlIGtl cm5lbCBzb3VyY2UuCgpTaWduZWQtb2ZmLWJ5OiBOZWlsIFJvYmVydHMgPG5laWxAbGludXguaW50 ZWwuY29tPgotLS0KCkhlcmUgaXMgYSB2MiBvZiB0aGUgcGF0Y2gganVzdCB0byByZWJhc2UgaXQg b24gdGhlIGNoYW5nZXMgdGhhdCB3ZXJlCmFkZGVkIG1hbnVhbGx5IGluIGNvbW1pdCBkNTU2ZTA2 OGE3ZTRlOWQuCgogaW5jbHVkZS9kcm0vaTkxNV9kcm0uaCB8IDQ4ICsrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQyIGluc2Vy dGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vaTkxNV9k cm0uaCBiL2luY2x1ZGUvZHJtL2k5MTVfZHJtLmgKaW5kZXggYjAzN2U1Ni4uZGVkNDNiMSAxMDA2 NDQKLS0tIGEvaW5jbHVkZS9kcm0vaTkxNV9kcm0uaAorKysgYi9pbmNsdWRlL2RybS9pOTE1X2Ry bS5oCkBAIC0yMjQsNiArMjI0LDggQEAgdHlwZWRlZiBzdHJ1Y3QgX2RybV9pOTE1X3NhcmVhIHsK ICNkZWZpbmUgRFJNX0k5MTVfUkVHX1JFQUQJCTB4MzEKICNkZWZpbmUgRFJNX0k5MTVfR0VUX1JF U0VUX1NUQVRTCTB4MzIKICNkZWZpbmUgRFJNX0k5MTVfR0VNX1VTRVJQVFIJCTB4MzMKKyNkZWZp bmUgRFJNX0k5MTVfR0VNX0NPTlRFWFRfR0VUUEFSQU0JMHgzNAorI2RlZmluZSBEUk1fSTkxNV9H RU1fQ09OVEVYVF9TRVRQQVJBTQkweDM1CiAKICNkZWZpbmUgRFJNX0lPQ1RMX0k5MTVfSU5JVAkJ RFJNX0lPVyggRFJNX0NPTU1BTkRfQkFTRSArIERSTV9JOTE1X0lOSVQsIGRybV9pOTE1X2luaXRf dCkKICNkZWZpbmUgRFJNX0lPQ1RMX0k5MTVfRkxVU0gJCURSTV9JTyAoIERSTV9DT01NQU5EX0JB U0UgKyBEUk1fSTkxNV9GTFVTSCkKQEAgLTI3NCw3ICsyNzYsOSBAQCB0eXBlZGVmIHN0cnVjdCBf ZHJtX2k5MTVfc2FyZWEgewogI2RlZmluZSBEUk1fSU9DVExfSTkxNV9HRU1fQ09OVEVYVF9ERVNU Uk9ZCURSTV9JT1cgKERSTV9DT01NQU5EX0JBU0UgKyBEUk1fSTkxNV9HRU1fQ09OVEVYVF9ERVNU Uk9ZLCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2NvbnRleHRfZGVzdHJveSkKICNkZWZpbmUgRFJNX0lP Q1RMX0k5MTVfUkVHX1JFQUQJCQlEUk1fSU9XUiAoRFJNX0NPTU1BTkRfQkFTRSArIERSTV9JOTE1 X1JFR19SRUFELCBzdHJ1Y3QgZHJtX2k5MTVfcmVnX3JlYWQpCiAjZGVmaW5lIERSTV9JT0NUTF9J OTE1X0dFVF9SRVNFVF9TVEFUUwkJRFJNX0lPV1IgKERSTV9DT01NQU5EX0JBU0UgKyBEUk1fSTkx NV9HRVRfUkVTRVRfU1RBVFMsIHN0cnVjdCBkcm1faTkxNV9yZXNldF9zdGF0cykKLSNkZWZpbmUg RFJNX0lPQ1RMX0k5MTVfR0VNX1VTRVJQVFIJCURSTV9JT1dSKERSTV9DT01NQU5EX0JBU0UgKyBE Uk1fSTkxNV9HRU1fVVNFUlBUUiwgIHN0cnVjdCBkcm1faTkxNV9nZW1fdXNlcnB0cikKKyNkZWZp bmUgRFJNX0lPQ1RMX0k5MTVfR0VNX1VTRVJQVFIJCQlEUk1fSU9XUiAoRFJNX0NPTU1BTkRfQkFT RSArIERSTV9JOTE1X0dFTV9VU0VSUFRSLCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3VzZXJwdHIpCisj ZGVmaW5lIERSTV9JT0NUTF9JOTE1X0dFTV9DT05URVhUX0dFVFBBUkFNCURSTV9JT1dSIChEUk1f Q09NTUFORF9CQVNFICsgRFJNX0k5MTVfR0VNX0NPTlRFWFRfR0VUUEFSQU0sIHN0cnVjdCBkcm1f aTkxNV9nZW1fY29udGV4dF9wYXJhbSkKKyNkZWZpbmUgRFJNX0lPQ1RMX0k5MTVfR0VNX0NPTlRF WFRfU0VUUEFSQU0JRFJNX0lPV1IgKERSTV9DT01NQU5EX0JBU0UgKyBEUk1fSTkxNV9HRU1fQ09O VEVYVF9TRVRQQVJBTSwgc3RydWN0IGRybV9pOTE1X2dlbV9jb250ZXh0X3BhcmFtKQogCiAvKiBB bGxvdyBkcml2ZXJzIHRvIHN1Ym1pdCBiYXRjaGJ1ZmZlcnMgZGlyZWN0bHkgdG8gaGFyZHdhcmUs IHJlbHlpbmcKICAqIG9uIHRoZSBzZWN1cml0eSBtZWNoYW5pc21zIHByb3ZpZGVkIGJ5IGhhcmR3 YXJlLgpAQCAtMzQwLDYgKzM0NCwxMCBAQCB0eXBlZGVmIHN0cnVjdCBkcm1faTkxNV9pcnFfd2Fp dCB7CiAjZGVmaW5lIEk5MTVfUEFSQU1fSEFTX0VYRUNfSEFORExFX0xVVCAgIDI2CiAjZGVmaW5l IEk5MTVfUEFSQU1fSEFTX1dUICAgICAJIAkgMjcKICNkZWZpbmUgSTkxNV9QQVJBTV9DTURfUEFS U0VSX1ZFUlNJT04JIDI4CisjZGVmaW5lIEk5MTVfUEFSQU1fSEFTX0NPSEVSRU5UX1BIWVNfR1RU IDI5CisjZGVmaW5lIEk5MTVfUEFSQU1fTU1BUF9WRVJTSU9OICAgICAgICAgIDMwCisjZGVmaW5l IEk5MTVfUEFSQU1fSEFTX0JTRDIJCSAzMQorI2RlZmluZSBJOTE1X1BBUkFNX1JFVklTSU9OICAg ICAgICAgICAgICAzMgogI2RlZmluZSBJOTE1X1BBUkFNX1NVQlNMSUNFX1RPVEFMCSAzMwogI2Rl ZmluZSBJOTE1X1BBUkFNX0VVX1RPVEFMCQkgMzQKIApAQCAtNDg5LDYgKzQ5NywxNCBAQCBzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX21tYXAgewogCSAqIFRoaXMgaXMgYSBmaXhlZC1zaXplIHR5cGUgZm9y IDMyLzY0IGNvbXBhdGliaWxpdHkuCiAJICovCiAJX191NjQgYWRkcl9wdHI7CisKKwkvKioKKwkg KiBGbGFncyBmb3IgZXh0ZW5kZWQgYmVoYXZpb3VyLgorCSAqCisJICogQWRkZWQgaW4gdmVyc2lv biAyLgorCSAqLworCV9fdTY0IGZsYWdzOworI2RlZmluZSBJOTE1X01NQVBfV0MgMHgxCiB9Owog CiBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX21tYXBfZ3R0IHsKQEAgLTczOCw3ICs3NTQsMTMgQEAgc3Ry dWN0IGRybV9pOTE1X2dlbV9leGVjYnVmZmVyMiB7CiAgKi8KICNkZWZpbmUgSTkxNV9FWEVDX0hB TkRMRV9MVVQJCSgxPDwxMikKIAotI2RlZmluZSBfX0k5MTVfRVhFQ19VTktOT1dOX0ZMQUdTIC0o STkxNV9FWEVDX0hBTkRMRV9MVVQ8PDEpCisvKiogVXNlZCBmb3Igc3dpdGNoaW5nIEJTRCByaW5n cyBvbiB0aGUgcGxhdGZvcm1zIHdpdGggdHdvIEJTRCByaW5ncyAqLworI2RlZmluZSBJOTE1X0VY RUNfQlNEX01BU0sJCSgzPDwxMykKKyNkZWZpbmUgSTkxNV9FWEVDX0JTRF9ERUZBVUxUCQkoMDw8 MTMpIC8qIGRlZmF1bHQgcGluZy1wb25nIG1vZGUgKi8KKyNkZWZpbmUgSTkxNV9FWEVDX0JTRF9S SU5HMQkJKDE8PDEzKQorI2RlZmluZSBJOTE1X0VYRUNfQlNEX1JJTkcyCQkoMjw8MTMpCisKKyNk ZWZpbmUgX19JOTE1X0VYRUNfVU5LTk9XTl9GTEFHUyAtKDE8PDE1KQogCiAjZGVmaW5lIEk5MTVf RVhFQ19DT05URVhUX0lEX01BU0sJKDB4ZmZmZmZmZmYpCiAjZGVmaW5lIGk5MTVfZXhlY2J1ZmZl cjJfc2V0X2NvbnRleHRfaWQoZWIyLCBjb250ZXh0KSBcCkBAIC04NzgsNiArOTAwLDEyIEBAIHN0 cnVjdCBkcm1faTkxNV9nZW1fZ2V0X3RpbGluZyB7CiAJICogbW1hcCBtYXBwaW5nLgogCSAqLwog CV9fdTMyIHN3aXp6bGVfbW9kZTsKKworCS8qKgorCSAqIFJldHVybmVkIGFkZHJlc3MgYml0IDYg c3dpenpsaW5nIHJlcXVpcmVkIGZvciBDUFUgYWNjZXNzIHRocm91Z2gKKwkgKiBtbWFwIG1hcHBp bmcgd2hpbHN0IGJvdW5kLgorCSAqLworCV9fdTMyIHBoeXNfc3dpenpsZV9tb2RlOwogfTsKIAog c3RydWN0IGRybV9pOTE1X2dlbV9nZXRfYXBlcnR1cmUgewpAQCAtMTA2MSwxMSArMTA4OSwxOSBA QCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3VzZXJwdHIgewogI2RlZmluZSBJOTE1X1VTRVJQVFJfUkVB RF9PTkxZIDB4MQogI2RlZmluZSBJOTE1X1VTRVJQVFJfVU5TWU5DSFJPTklaRUQgMHg4MDAwMDAw MAogCS8qKgotCSogUmV0dXJuZWQgaGFuZGxlIGZvciB0aGUgb2JqZWN0LgotCSoKLQkqIE9iamVj dCBoYW5kbGVzIGFyZSBub256ZXJvLgotCSovCisJICogUmV0dXJuZWQgaGFuZGxlIGZvciB0aGUg b2JqZWN0LgorCSAqCisJICogT2JqZWN0IGhhbmRsZXMgYXJlIG5vbnplcm8uCisJICovCiAJX191 MzIgaGFuZGxlOwogfTsKIAorc3RydWN0IGRybV9pOTE1X2dlbV9jb250ZXh0X3BhcmFtIHsKKwlf X3UzMiBjdHhfaWQ7CisJX191MzIgc2l6ZTsKKwlfX3U2NCBwYXJhbTsKKyNkZWZpbmUgSTkxNV9D T05URVhUX1BBUkFNX0JBTl9QRVJJT0QgMHgxCisJX191NjQgdmFsdWU7Cit9OworCiAjZW5kaWYg LyogX0k5MTVfRFJNX0hfICovCi0tIAoxLjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwK