From: Robert Bragg Subject: [PATCH v3 02/11] drm/i915: rename OACONTROL GEN7_OACONTROL Date: Mon, 15 Aug 2016 15:41:19 +0100 Message-ID: <20160815144128.7847-3-robert@sixbynine.org> References: <20160815144128.7847-1-robert@sixbynine.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20160815144128.7847-1-robert@sixbynine.org> 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: David Airlie , dri-devel@lists.freedesktop.org, Sourab Gupta , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org T0FDT05UUk9MIGNoYW5nZXMgcXVpdGUgYSBiaXQgZm9yIGdlbjgsIHdpdGggc29tZSBiaXRzIHNw bGl0IG91dCBpbnRvIGEKcGVyLWNvbnRleHQgT0FDVFhDT05UUk9MIHJlZ2lzdGVyLiBSZW5hbWUg bm93IGJlZm9yZSBhZGRpbmcgbW9yZSBnZW43IE9BCnJlZ2lzdGVycwoKU2lnbmVkLW9mZi1ieTog Um9iZXJ0IEJyYWdnIDxyb2JlcnRAc2l4YnluaW5lLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2NtZF9wYXJzZXIuYyB8IDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9yZWcuaCAgICAgICAgfCAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwg MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Nt ZF9wYXJzZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfY21kX3BhcnNlci5jCmluZGV4 IDFkYjgyOWMuLmNmZTNlN2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Y21kX3BhcnNlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfY21kX3BhcnNlci5j CkBAIC00NDYsNyArNDQ2LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1faTkxNV9yZWdfZGVz Y3JpcHRvciBnZW43X3JlbmRlcl9yZWdzW10gPSB7CiAJUkVHNjQoUFNfSU5WT0NBVElPTl9DT1VO VCksCiAJUkVHNjQoUFNfREVQVEhfQ09VTlQpLAogCVJFRzY0X0lEWChSSU5HX1RJTUVTVEFNUCwg UkVOREVSX1JJTkdfQkFTRSksCi0JUkVHMzIoT0FDT05UUk9MKSwgLyogT25seSBhbGxvd2VkIGZv ciBMUkkgYW5kIFNSTS4gU2VlIGJlbG93LiAqLworCVJFRzMyKEdFTjdfT0FDT05UUk9MKSwgLyog T25seSBhbGxvd2VkIGZvciBMUkkgYW5kIFNSTS4gU2VlIGJlbG93LiAqLwogCVJFRzY0KE1JX1BS RURJQ0FURV9TUkMwKSwKIAlSRUc2NChNSV9QUkVESUNBVEVfU1JDMSksCiAJUkVHMzIoR0VON18z RFBSSU1fRU5EX09GRlNFVCksCkBAIC0xMDk3LDcgKzEwOTcsNyBAQCBzdGF0aWMgYm9vbCBjaGVj a19jbWQoY29uc3Qgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQkJICogdG8gdGhl IHJlZ2lzdGVyLiBIZW5jZSwgbGltaXQgT0FDT05UUk9MIHdyaXRlcyB0bwogCQkJICogb25seSBN SV9MT0FEX1JFR0lTVEVSX0lNTSBjb21tYW5kcy4KIAkJCSAqLwotCQkJaWYgKHJlZ19hZGRyID09 IGk5MTVfbW1pb19yZWdfb2Zmc2V0KE9BQ09OVFJPTCkpIHsKKwkJCWlmIChyZWdfYWRkciA9PSBp OTE1X21taW9fcmVnX29mZnNldChHRU43X09BQ09OVFJPTCkpIHsKIAkJCQlpZiAoZGVzYy0+Y21k LnZhbHVlID09IE1JX0xPQURfUkVHSVNURVJfTUVNKSB7CiAJCQkJCURSTV9ERUJVR19EUklWRVIo IkNNRDogUmVqZWN0ZWQgTFJNIHRvIE9BQ09OVFJPTFxuIik7CiAJCQkJCXJldHVybiBmYWxzZTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X3JlZy5oCmluZGV4IDkzOTdkZGUuLmJhOTFlZmYgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9yZWcuaApAQCAtNjE2LDcgKzYxNiw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpOTE1 X21taW9fcmVnX3ZhbGlkKGk5MTVfcmVnX3QgcmVnKQogI2RlZmluZSBIU1dfQ1NfR1BSKG4pICAg ICAgICAgICAgICAgICAgIF9NTUlPKDB4MjYwMCArIChuKSAqIDgpCiAjZGVmaW5lIEhTV19DU19H UFJfVURXKG4pICAgICAgICAgICAgICAgX01NSU8oMHgyNjAwICsgKG4pICogOCArIDQpCiAKLSNk ZWZpbmUgT0FDT05UUk9MIF9NTUlPKDB4MjM2MCkKKyNkZWZpbmUgR0VON19PQUNPTlRST0wgX01N SU8oMHgyMzYwKQogCiAjZGVmaW5lIF9HRU43X1BJUEVBX0RFX0xPQURfU0wJMHg3MDA2OAogI2Rl ZmluZSBfR0VON19QSVBFQl9ERV9MT0FEX1NMCTB4NzEwNjgKLS0gCjIuOS4yCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK