From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: [PATCH] intel: merge latest i915_drm.h Date: Fri, 11 Dec 2015 13:55:40 -0800 Message-ID: <1449870940-14246-1-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org UGljayB1cCBjb250ZXh0IGZsYWdzLCBzb2Z0cGluLCBldGMuCgpTaWduZWQtb2ZmLWJ5OiBKZXNz ZSBCYXJuZXMgPGpiYXJuZXNAdmlydHVvdXNnZWVrLm9yZz4KLS0tCiBpbmNsdWRlL2RybS9pOTE1 X2RybS5oIHwgNTcgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2k5MTVfZHJtLmggYi9pbmNsdWRlL2RybS9pOTE1X2Ry bS5oCmluZGV4IGRlZDQzYjEuLjRjZTFmZTkgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2k5MTVf ZHJtLmgKKysrIGIvaW5jbHVkZS9kcm0vaTkxNV9kcm0uaApAQCAtMTcxLDggKzE3MSwxMiBAQCB0 eXBlZGVmIHN0cnVjdCBfZHJtX2k5MTVfc2FyZWEgewogI2RlZmluZSBJOTE1X0JPWF9URVhUVVJF X0xPQUQgIDB4OAogI2RlZmluZSBJOTE1X0JPWF9MT1NUX0NPTlRFWFQgIDB4MTAKIAotLyogSTkx NSBzcGVjaWZpYyBpb2N0bHMKLSAqIFRoZSBkZXZpY2Ugc3BlY2lmaWMgaW9jdGwgcmFuZ2UgaXMg MHg0MCB0byAweDc5LgorLyoKKyAqIGk5MTUgc3BlY2lmaWMgaW9jdGxzLgorICoKKyAqIFRoZSBk ZXZpY2Ugc3BlY2lmaWMgaW9jdGwgcmFuZ2UgaXMgW0RSTV9DT01NQU5EX0JBU0UsIERSTV9DT01N QU5EX0VORCkgaWUKKyAqIFsweDQwLCAweGEwKSAoYTAgaXMgZXhjbHVkZWQpLiBUaGUgbnVtYmVy cyBiZWxvdyBhcmUgZGVmaW5lZCBhcyBvZmZzZXQKKyAqIGFnYWluc3QgRFJNX0NPTU1BTkRfQkFT RSBhbmQgc2hvdWxkIGJlIGJldHdlZW4gWzB4MCwgMHg2MCkuCiAgKi8KICNkZWZpbmUgRFJNX0k5 MTVfSU5JVAkJMHgwMAogI2RlZmluZSBEUk1fSTkxNV9GTFVTSAkJMHgwMQpAQCAtMjcwLDcgKzI3 NCw3IEBAIHR5cGVkZWYgc3RydWN0IF9kcm1faTkxNV9zYXJlYSB7CiAjZGVmaW5lIERSTV9JT0NU TF9JOTE1X09WRVJMQVlfUFVUX0lNQUdFCURSTV9JT1coRFJNX0NPTU1BTkRfQkFTRSArIERSTV9J OTE1X09WRVJMQVlfUFVUX0lNQUdFLCBzdHJ1Y3QgZHJtX2ludGVsX292ZXJsYXlfcHV0X2ltYWdl KQogI2RlZmluZSBEUk1fSU9DVExfSTkxNV9PVkVSTEFZX0FUVFJTCURSTV9JT1dSKERSTV9DT01N QU5EX0JBU0UgKyBEUk1fSTkxNV9PVkVSTEFZX0FUVFJTLCBzdHJ1Y3QgZHJtX2ludGVsX292ZXJs YXlfYXR0cnMpCiAjZGVmaW5lIERSTV9JT0NUTF9JOTE1X1NFVF9TUFJJVEVfQ09MT1JLRVkgRFJN X0lPV1IoRFJNX0NPTU1BTkRfQkFTRSArIERSTV9JOTE1X1NFVF9TUFJJVEVfQ09MT1JLRVksIHN0 cnVjdCBkcm1faW50ZWxfc3ByaXRlX2NvbG9ya2V5KQotI2RlZmluZSBEUk1fSU9DVExfSTkxNV9H RVRfU1BSSVRFX0NPTE9SS0VZIERSTV9JT1dSKERSTV9DT01NQU5EX0JBU0UgKyBEUk1fSTkxNV9T RVRfU1BSSVRFX0NPTE9SS0VZLCBzdHJ1Y3QgZHJtX2ludGVsX3Nwcml0ZV9jb2xvcmtleSkKKyNk ZWZpbmUgRFJNX0lPQ1RMX0k5MTVfR0VUX1NQUklURV9DT0xPUktFWSBEUk1fSU9XUihEUk1fQ09N TUFORF9CQVNFICsgRFJNX0k5MTVfR0VUX1NQUklURV9DT0xPUktFWSwgc3RydWN0IGRybV9pbnRl bF9zcHJpdGVfY29sb3JrZXkpCiAjZGVmaW5lIERSTV9JT0NUTF9JOTE1X0dFTV9XQUlUCQlEUk1f SU9XUihEUk1fQ09NTUFORF9CQVNFICsgRFJNX0k5MTVfR0VNX1dBSVQsIHN0cnVjdCBkcm1faTkx NV9nZW1fd2FpdCkKICNkZWZpbmUgRFJNX0lPQ1RMX0k5MTVfR0VNX0NPTlRFWFRfQ1JFQVRFCURS TV9JT1dSIChEUk1fQ09NTUFORF9CQVNFICsgRFJNX0k5MTVfR0VNX0NPTlRFWFRfQ1JFQVRFLCBz dHJ1Y3QgZHJtX2k5MTVfZ2VtX2NvbnRleHRfY3JlYXRlKQogI2RlZmluZSBEUk1fSU9DVExfSTkx NV9HRU1fQ09OVEVYVF9ERVNUUk9ZCURSTV9JT1cgKERSTV9DT01NQU5EX0JBU0UgKyBEUk1fSTkx NV9HRU1fQ09OVEVYVF9ERVNUUk9ZLCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2NvbnRleHRfZGVzdHJv eSkKQEAgLTM1MCw5ICszNTQsMTYgQEAgdHlwZWRlZiBzdHJ1Y3QgZHJtX2k5MTVfaXJxX3dhaXQg ewogI2RlZmluZSBJOTE1X1BBUkFNX1JFVklTSU9OICAgICAgICAgICAgICAzMgogI2RlZmluZSBJ OTE1X1BBUkFNX1NVQlNMSUNFX1RPVEFMCSAzMwogI2RlZmluZSBJOTE1X1BBUkFNX0VVX1RPVEFM CQkgMzQKKyNkZWZpbmUgSTkxNV9QQVJBTV9IQVNfR1BVX1JFU0VUCSAzNQorI2RlZmluZSBJOTE1 X1BBUkFNX0hBU19SRVNPVVJDRV9TVFJFQU1FUiAzNgorI2RlZmluZSBJOTE1X1BBUkFNX0hBU19F WEVDX1NPRlRQSU4JIDM3CiAKIHR5cGVkZWYgc3RydWN0IGRybV9pOTE1X2dldHBhcmFtIHsKLQlp bnQgcGFyYW07CisJX19zMzIgcGFyYW07CisJLyoKKwkgKiBXQVJOSU5HOiBVc2luZyBwb2ludGVy cyBpbnN0ZWFkIG9mIGZpeGVkLXNpemUgdTY0IG1lYW5zIHdlIG5lZWQgdG8gd3JpdGUKKwkgKiBj b21wYXQzMiBjb2RlLiBEb24ndCByZXBlYXQgdGhpcyBtaXN0YWtlLgorCSAqLwogCWludCAqdmFs dWU7CiB9IGRybV9pOTE1X2dldHBhcmFtX3Q7CiAKQEAgLTY3MiwxNSArNjgzLDIxIEBAIHN0cnVj dCBkcm1faTkxNV9nZW1fZXhlY19vYmplY3QyIHsKIAlfX3U2NCBhbGlnbm1lbnQ7CiAKIAkvKioK LQkgKiBSZXR1cm5lZCB2YWx1ZSBvZiB0aGUgdXBkYXRlZCBvZmZzZXQgb2YgdGhlIG9iamVjdCwg Zm9yIGZ1dHVyZQotCSAqIHByZXN1bWVkX29mZnNldCB3cml0ZXMuCisJICogV2hlbiB0aGUgRVhF Q19PQkpFQ1RfUElOTkVEIGZsYWcgaXMgc3BlY2lmaWVkIHRoaXMgaXMgcG9wdWxhdGVkIGJ5CisJ ICogdGhlIHVzZXIgd2l0aCB0aGUgR1RUIG9mZnNldCBhdCB3aGljaCB0aGlzIG9iamVjdCB3aWxs IGJlIHBpbm5lZC4KKwkgKiBXaGVuIHRoZSBJOTE1X0VYRUNfTk9fUkVMT0MgZmxhZyBpcyBzcGVj aWZpZWQgdGhpcyBtdXN0IGNvbnRhaW4gdGhlCisJICogcHJlc3VtZWRfb2Zmc2V0IG9mIHRoZSBv YmplY3QuCisJICogRHVyaW5nIGV4ZWNidWZmZXIyIHRoZSBrZXJuZWwgcG9wdWxhdGVzIGl0IHdp dGggdGhlIHZhbHVlIG9mIHRoZQorCSAqIGN1cnJlbnQgR1RUIG9mZnNldCBvZiB0aGUgb2JqZWN0 LCBmb3IgZnV0dXJlIHByZXN1bWVkX29mZnNldCB3cml0ZXMuCiAJICovCiAJX191NjQgb2Zmc2V0 OwogCiAjZGVmaW5lIEVYRUNfT0JKRUNUX05FRURTX0ZFTkNFICgxPDwwKQogI2RlZmluZSBFWEVD X09CSkVDVF9ORUVEU19HVFQJKDE8PDEpCiAjZGVmaW5lIEVYRUNfT0JKRUNUX1dSSVRFCSgxPDwy KQotI2RlZmluZSBfX0VYRUNfT0JKRUNUX1VOS05PV05fRkxBR1MgLShFWEVDX09CSkVDVF9XUklU RTw8MSkKKyNkZWZpbmUgRVhFQ19PQkpFQ1RfU1VQUE9SVFNfNDhCX0FERFJFU1MgKDE8PDMpCisj ZGVmaW5lIEVYRUNfT0JKRUNUX1BJTk5FRAkoMTw8NCkKKyNkZWZpbmUgX19FWEVDX09CSkVDVF9V TktOT1dOX0ZMQUdTIC0oRVhFQ19PQkpFQ1RfUElOTkVEPDwxKQogCV9fdTY0IGZsYWdzOwogCiAJ X191NjQgcnN2ZDE7CkBAIC03NjAsNyArNzc3LDEyIEBAIHN0cnVjdCBkcm1faTkxNV9nZW1fZXhl Y2J1ZmZlcjIgewogI2RlZmluZSBJOTE1X0VYRUNfQlNEX1JJTkcxCQkoMTw8MTMpCiAjZGVmaW5l IEk5MTVfRVhFQ19CU0RfUklORzIJCSgyPDwxMykKIAotI2RlZmluZSBfX0k5MTVfRVhFQ19VTktO T1dOX0ZMQUdTIC0oMTw8MTUpCisvKiogVGVsbCB0aGUga2VybmVsIHRoYXQgdGhlIGJhdGNoYnVm ZmVyIGlzIHByb2Nlc3NlZCBieQorICogIHRoZSByZXNvdXJjZSBzdHJlYW1lci4KKyAqLworI2Rl ZmluZSBJOTE1X0VYRUNfUkVTT1VSQ0VfU1RSRUFNRVIgICAgICgxPDwxNSkKKworI2RlZmluZSBf X0k5MTVfRVhFQ19VTktOT1dOX0ZMQUdTIC0oSTkxNV9FWEVDX1JFU09VUkNFX1NUUkVBTUVSPDwx KQogCiAjZGVmaW5lIEk5MTVfRVhFQ19DT05URVhUX0lEX01BU0sJKDB4ZmZmZmZmZmYpCiAjZGVm aW5lIGk5MTVfZXhlY2J1ZmZlcjJfc2V0X2NvbnRleHRfaWQoZWIyLCBjb250ZXh0KSBcCkBAIC05 OTYsNiArMTAxOCw3IEBAIHN0cnVjdCBkcm1faW50ZWxfb3ZlcmxheV9wdXRfaW1hZ2UgewogLyog ZmxhZ3MgKi8KICNkZWZpbmUgSTkxNV9PVkVSTEFZX1VQREFURV9BVFRSUwkoMTw8MCkKICNkZWZp bmUgSTkxNV9PVkVSTEFZX1VQREFURV9HQU1NQQkoMTw8MSkKKyNkZWZpbmUgSTkxNV9PVkVSTEFZ X0RJU0FCTEVfREVTVF9DT0xPUktFWQkoMTw8MikKIHN0cnVjdCBkcm1faW50ZWxfb3ZlcmxheV9h dHRycyB7CiAJX191MzIgZmxhZ3M7CiAJX191MzIgY29sb3Jfa2V5OwpAQCAtMTA2Miw5ICsxMDg1 LDIzIEBAIHN0cnVjdCBkcm1faTkxNV9nZW1fY29udGV4dF9kZXN0cm95IHsKIH07CiAKIHN0cnVj dCBkcm1faTkxNV9yZWdfcmVhZCB7CisJLyoKKwkgKiBSZWdpc3RlciBvZmZzZXQuCisJICogRm9y IDY0Yml0IHdpZGUgcmVnaXN0ZXJzIHdoZXJlIHRoZSB1cHBlciAzMmJpdHMgZG9uJ3QgaW1tZWRp YXRlbHkKKwkgKiBmb2xsb3cgdGhlIGxvd2VyIDMyYml0cywgdGhlIG9mZnNldCBvZiB0aGUgbG93 ZXIgMzJiaXRzIG11c3QKKwkgKiBiZSBzcGVjaWZpZWQKKwkgKi8KIAlfX3U2NCBvZmZzZXQ7CiAJ X191NjQgdmFsOyAvKiBSZXR1cm4gdmFsdWUgKi8KIH07CisvKiBLbm93biByZWdpc3RlcnM6Cisg KgorICogUmVuZGVyIGVuZ2luZSB0aW1lc3RhbXAgLSAweDIzNTggKyA2NGJpdCAtIGdlbjcrCisg KiAtIE5vdGUgdGhpcyByZWdpc3RlciByZXR1cm5zIGFuIGludmFsaWQgdmFsdWUgaWYgdXNpbmcg dGhlIGRlZmF1bHQKKyAqICAgc2luZ2xlIGluc3RydWN0aW9uIDhieXRlIHJlYWQsIGluIG9yZGVy IHRvIHdvcmthcm91bmQgdGhhdCB1c2UKKyAqICAgb2Zmc2V0ICgweDI1MzggfCAxKSBpbnN0ZWFk LgorICoKKyAqLwogCiBzdHJ1Y3QgZHJtX2k5MTVfcmVzZXRfc3RhdHMgewogCV9fdTMyIGN0eF9p ZDsKQEAgLTExMDAsNyArMTEzNyw5IEBAIHN0cnVjdCBkcm1faTkxNV9nZW1fY29udGV4dF9wYXJh bSB7CiAJX191MzIgY3R4X2lkOwogCV9fdTMyIHNpemU7CiAJX191NjQgcGFyYW07Ci0jZGVmaW5l IEk5MTVfQ09OVEVYVF9QQVJBTV9CQU5fUEVSSU9EIDB4MQorI2RlZmluZSBJOTE1X0NPTlRFWFRf UEFSQU1fQkFOX1BFUklPRAkweDEKKyNkZWZpbmUgSTkxNV9DT05URVhUX1BBUkFNX05PX1pFUk9N QVAJMHgyCisjZGVmaW5lIEk5MTVfQ09OVEVYVF9QQVJBTV9HVFRfU0laRQkweDMKIAlfX3U2NCB2 YWx1ZTsKIH07CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=