From mboxrd@z Thu Jan 1 00:00:00 1970 From: Neil Roberts Subject: [PATCH] intel: Merge latest i915_drm.h Date: Thu, 5 Mar 2015 14:11:12 +0000 Message-ID: <1425564672-9962-1-git-send-email-neil@linux.intel.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id EC1D96E07D for ; Thu, 5 Mar 2015 06:11:32 -0800 (PST) In-Reply-To: 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 T04uCi0tLQogaW5jbHVkZS9kcm0vaTkxNV9kcm0uaCB8IDQ4ICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQyIGluc2VydGlv bnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vaTkxNV9kcm0u aCBiL2luY2x1ZGUvZHJtL2k5MTVfZHJtLmgKaW5kZXggMTVkZDAxZC4uYWZhMTEwYyAxMDA2NDQK LS0tIGEvaW5jbHVkZS9kcm0vaTkxNV9kcm0uaAorKysgYi9pbmNsdWRlL2RybS9pOTE1X2RybS5o CkBAIC0yMjQsNiArMjI0LDggQEAgdHlwZWRlZiBzdHJ1Y3QgX2RybV9pOTE1X3NhcmVhIHsKICNk ZWZpbmUgRFJNX0k5MTVfUkVHX1JFQUQJCTB4MzEKICNkZWZpbmUgRFJNX0k5MTVfR0VUX1JFU0VU X1NUQVRTCTB4MzIKICNkZWZpbmUgRFJNX0k5MTVfR0VNX1VTRVJQVFIJCTB4MzMKKyNkZWZpbmUg RFJNX0k5MTVfR0VNX0NPTlRFWFRfR0VUUEFSQU0JMHgzNAorI2RlZmluZSBEUk1fSTkxNV9HRU1f Q09OVEVYVF9TRVRQQVJBTQkweDM1CiAKICNkZWZpbmUgRFJNX0lPQ1RMX0k5MTVfSU5JVAkJRFJN X0lPVyggRFJNX0NPTU1BTkRfQkFTRSArIERSTV9JOTE1X0lOSVQsIGRybV9pOTE1X2luaXRfdCkK ICNkZWZpbmUgRFJNX0lPQ1RMX0k5MTVfRkxVU0gJCURSTV9JTyAoIERSTV9DT01NQU5EX0JBU0Ug KyBEUk1fSTkxNV9GTFVTSCkKQEAgLTI3NCw3ICsyNzYsOSBAQCB0eXBlZGVmIHN0cnVjdCBfZHJt X2k5MTVfc2FyZWEgewogI2RlZmluZSBEUk1fSU9DVExfSTkxNV9HRU1fQ09OVEVYVF9ERVNUUk9Z CURSTV9JT1cgKERSTV9DT01NQU5EX0JBU0UgKyBEUk1fSTkxNV9HRU1fQ09OVEVYVF9ERVNUUk9Z LCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2NvbnRleHRfZGVzdHJveSkKICNkZWZpbmUgRFJNX0lPQ1RM X0k5MTVfUkVHX1JFQUQJCQlEUk1fSU9XUiAoRFJNX0NPTU1BTkRfQkFTRSArIERSTV9JOTE1X1JF R19SRUFELCBzdHJ1Y3QgZHJtX2k5MTVfcmVnX3JlYWQpCiAjZGVmaW5lIERSTV9JT0NUTF9JOTE1 X0dFVF9SRVNFVF9TVEFUUwkJRFJNX0lPV1IgKERSTV9DT01NQU5EX0JBU0UgKyBEUk1fSTkxNV9H RVRfUkVTRVRfU1RBVFMsIHN0cnVjdCBkcm1faTkxNV9yZXNldF9zdGF0cykKLSNkZWZpbmUgRFJN X0lPQ1RMX0k5MTVfR0VNX1VTRVJQVFIJCURSTV9JT1dSKERSTV9DT01NQU5EX0JBU0UgKyBEUk1f STkxNV9HRU1fVVNFUlBUUiwgIHN0cnVjdCBkcm1faTkxNV9nZW1fdXNlcnB0cikKKyNkZWZpbmUg RFJNX0lPQ1RMX0k5MTVfR0VNX1VTRVJQVFIJCQlEUk1fSU9XUiAoRFJNX0NPTU1BTkRfQkFTRSAr IERSTV9JOTE1X0dFTV9VU0VSUFRSLCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3VzZXJwdHIpCisjZGVm aW5lIERSTV9JT0NUTF9JOTE1X0dFTV9DT05URVhUX0dFVFBBUkFNCURSTV9JT1dSIChEUk1fQ09N TUFORF9CQVNFICsgRFJNX0k5MTVfR0VNX0NPTlRFWFRfR0VUUEFSQU0sIHN0cnVjdCBkcm1faTkx NV9nZW1fY29udGV4dF9wYXJhbSkKKyNkZWZpbmUgRFJNX0lPQ1RMX0k5MTVfR0VNX0NPTlRFWFRf U0VUUEFSQU0JRFJNX0lPV1IgKERSTV9DT01NQU5EX0JBU0UgKyBEUk1fSTkxNV9HRU1fQ09OVEVY VF9TRVRQQVJBTSwgc3RydWN0IGRybV9pOTE1X2dlbV9jb250ZXh0X3BhcmFtKQogCiAvKiBBbGxv dyBkcml2ZXJzIHRvIHN1Ym1pdCBiYXRjaGJ1ZmZlcnMgZGlyZWN0bHkgdG8gaGFyZHdhcmUsIHJl bHlpbmcKICAqIG9uIHRoZSBzZWN1cml0eSBtZWNoYW5pc21zIHByb3ZpZGVkIGJ5IGhhcmR3YXJl LgpAQCAtMzQwLDYgKzM0NCwxMCBAQCB0eXBlZGVmIHN0cnVjdCBkcm1faTkxNV9pcnFfd2FpdCB7 CiAjZGVmaW5lIEk5MTVfUEFSQU1fSEFTX0VYRUNfSEFORExFX0xVVCAgIDI2CiAjZGVmaW5lIEk5 MTVfUEFSQU1fSEFTX1dUICAgICAJIAkgMjcKICNkZWZpbmUgSTkxNV9QQVJBTV9DTURfUEFSU0VS X1ZFUlNJT04JIDI4CisjZGVmaW5lIEk5MTVfUEFSQU1fSEFTX0NPSEVSRU5UX1BIWVNfR1RUIDI5 CisjZGVmaW5lIEk5MTVfUEFSQU1fTU1BUF9WRVJTSU9OICAgICAgICAgIDMwCisjZGVmaW5lIEk5 MTVfUEFSQU1fSEFTX0JTRDIJCSAzMQorI2RlZmluZSBJOTE1X1BBUkFNX1JFVklTSU9OICAgICAg ICAgICAgICAzMgogCiB0eXBlZGVmIHN0cnVjdCBkcm1faTkxNV9nZXRwYXJhbSB7CiAJaW50IHBh cmFtOwpAQCAtNDg3LDYgKzQ5NSwxNCBAQCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX21tYXAgewogCSAq IFRoaXMgaXMgYSBmaXhlZC1zaXplIHR5cGUgZm9yIDMyLzY0IGNvbXBhdGliaWxpdHkuCiAJICov CiAJX191NjQgYWRkcl9wdHI7CisKKwkvKioKKwkgKiBGbGFncyBmb3IgZXh0ZW5kZWQgYmVoYXZp b3VyLgorCSAqCisJICogQWRkZWQgaW4gdmVyc2lvbiAyLgorCSAqLworCV9fdTY0IGZsYWdzOwor I2RlZmluZSBJOTE1X01NQVBfV0MgMHgxCiB9OwogCiBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX21tYXBf Z3R0IHsKQEAgLTczNiw3ICs3NTIsMTMgQEAgc3RydWN0IGRybV9pOTE1X2dlbV9leGVjYnVmZmVy MiB7CiAgKi8KICNkZWZpbmUgSTkxNV9FWEVDX0hBTkRMRV9MVVQJCSgxPDwxMikKIAotI2RlZmlu ZSBfX0k5MTVfRVhFQ19VTktOT1dOX0ZMQUdTIC0oSTkxNV9FWEVDX0hBTkRMRV9MVVQ8PDEpCisv KiogVXNlZCBmb3Igc3dpdGNoaW5nIEJTRCByaW5ncyBvbiB0aGUgcGxhdGZvcm1zIHdpdGggdHdv IEJTRCByaW5ncyAqLworI2RlZmluZSBJOTE1X0VYRUNfQlNEX01BU0sJCSgzPDwxMykKKyNkZWZp bmUgSTkxNV9FWEVDX0JTRF9ERUZBVUxUCQkoMDw8MTMpIC8qIGRlZmF1bHQgcGluZy1wb25nIG1v ZGUgKi8KKyNkZWZpbmUgSTkxNV9FWEVDX0JTRF9SSU5HMQkJKDE8PDEzKQorI2RlZmluZSBJOTE1 X0VYRUNfQlNEX1JJTkcyCQkoMjw8MTMpCisKKyNkZWZpbmUgX19JOTE1X0VYRUNfVU5LTk9XTl9G TEFHUyAtKDE8PDE1KQogCiAjZGVmaW5lIEk5MTVfRVhFQ19DT05URVhUX0lEX01BU0sJKDB4ZmZm ZmZmZmYpCiAjZGVmaW5lIGk5MTVfZXhlY2J1ZmZlcjJfc2V0X2NvbnRleHRfaWQoZWIyLCBjb250 ZXh0KSBcCkBAIC04NzYsNiArODk4LDEyIEBAIHN0cnVjdCBkcm1faTkxNV9nZW1fZ2V0X3RpbGlu ZyB7CiAJICogbW1hcCBtYXBwaW5nLgogCSAqLwogCV9fdTMyIHN3aXp6bGVfbW9kZTsKKworCS8q KgorCSAqIFJldHVybmVkIGFkZHJlc3MgYml0IDYgc3dpenpsaW5nIHJlcXVpcmVkIGZvciBDUFUg YWNjZXNzIHRocm91Z2gKKwkgKiBtbWFwIG1hcHBpbmcgd2hpbHN0IGJvdW5kLgorCSAqLworCV9f dTMyIHBoeXNfc3dpenpsZV9tb2RlOwogfTsKIAogc3RydWN0IGRybV9pOTE1X2dlbV9nZXRfYXBl cnR1cmUgewpAQCAtMTA1OSwxMSArMTA4NywxOSBAQCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3VzZXJw dHIgewogI2RlZmluZSBJOTE1X1VTRVJQVFJfUkVBRF9PTkxZIDB4MQogI2RlZmluZSBJOTE1X1VT RVJQVFJfVU5TWU5DSFJPTklaRUQgMHg4MDAwMDAwMAogCS8qKgotCSogUmV0dXJuZWQgaGFuZGxl IGZvciB0aGUgb2JqZWN0LgotCSoKLQkqIE9iamVjdCBoYW5kbGVzIGFyZSBub256ZXJvLgotCSov CisJICogUmV0dXJuZWQgaGFuZGxlIGZvciB0aGUgb2JqZWN0LgorCSAqCisJICogT2JqZWN0IGhh bmRsZXMgYXJlIG5vbnplcm8uCisJICovCiAJX191MzIgaGFuZGxlOwogfTsKIAorc3RydWN0IGRy bV9pOTE1X2dlbV9jb250ZXh0X3BhcmFtIHsKKwlfX3UzMiBjdHhfaWQ7CisJX191MzIgc2l6ZTsK KwlfX3U2NCBwYXJhbTsKKyNkZWZpbmUgSTkxNV9DT05URVhUX1BBUkFNX0JBTl9QRVJJT0QgMHgx CisJX191NjQgdmFsdWU7Cit9OworCiAjZW5kaWYgLyogX0k5MTVfRFJNX0hfICovCi0tIAoxLjku MwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK