From: Dave Gordon Subject: [PATCH 2/3] drm/i915: rename 'ring' where it refers to an engine or engine_id Date: Wed, 20 Jul 2016 18:16:06 +0100 Message-ID: <1469034967-15840-3-git-send-email-david.s.gordon@intel.com> References: <1469034967-15840-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 602276E890 for ; Wed, 20 Jul 2016 17:16:17 +0000 (UTC) In-Reply-To: <1469034967-15840-1-git-send-email-david.s.gordon@intel.com> 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 List-Id: intel-gfx@lists.freedesktop.org J3JpbmcnIGlzIGFuIG9sZCBkZXByZWNhdGVkIHRlcm0gZm9yIGEgR1BVIGVuZ2luZS4gQ2hyaXMg V2lsc29uIHdhbnRzIHRvCnVzZSB0aGUgbmFtZSBmb3Igd2hhdCBpcyBjdXJyZW50bHkga25vd24g YXMgYW4gaW50ZWxfcmluZ2J1ZmZlciwgYnV0IGl0CndpbGwgYmUgZHJlYWRmdWxseSBjb25mdXNp bmcgaWYgc29tZSByaW5ncyBhcmUgcmluZ2J1ZmZlcnMgYnV0IG90aGVyCnJpbmdzIGFyZSBzdGls bCBlbmdpbmVzLiBTbyB0aGlzIHBhdGNoIGNoYW5nZXMgdGhlIG5hbWVzIG9mIGEgYnVuY2ggb2YK cGFyYW1ldGVycyBjYWxsZWQgJ3JpbmcnIHRvIGVpdGhlciAnZW5naW5lJyBvciAnZW5naW5lX2lk JyBhY2NvcmRpbmcgdG8Kd2hhdCB0aGV5IGFjdHVhbGx5IGFyZS4KClNpZ25lZC1vZmYtYnk6IERh dmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbW9jcy5jICAgICAgIHwgIDYgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9tb2NzLmggICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuaCB8IDEyICsrKysrKy0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCsp LCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9tb2NzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9tb2NzLmMKaW5kZXggMjI4MGMz Mi4uYmQ0Njk2OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbW9jcy5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX21vY3MuYwpAQCAtMjA0LDkgKzIwNCw5 IEBAIHN0YXRpYyBib29sIGdldF9tb2NzX3NldHRpbmdzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAlyZXR1cm4gcmVzdWx0OwogfQogCi1zdGF0aWMgaTkxNV9yZWdfdCBtb2Nz X3JlZ2lzdGVyKGVudW0gaW50ZWxfZW5naW5lX2lkIHJpbmcsIGludCBpbmRleCkKK3N0YXRpYyBp OTE1X3JlZ190IG1vY3NfcmVnaXN0ZXIoZW51bSBpbnRlbF9lbmdpbmVfaWQgZW5naW5lX2lkLCBp bnQgaW5kZXgpCiB7Ci0Jc3dpdGNoIChyaW5nKSB7CisJc3dpdGNoIChlbmdpbmVfaWQpIHsKIAlj YXNlIFJDUzoKIAkJcmV0dXJuIEdFTjlfR0ZYX01PQ1MoaW5kZXgpOwogCWNhc2UgVkNTOgpAQCAt MjE4LDcgKzIxOCw3IEBAIHN0YXRpYyBpOTE1X3JlZ190IG1vY3NfcmVnaXN0ZXIoZW51bSBpbnRl bF9lbmdpbmVfaWQgcmluZywgaW50IGluZGV4KQogCWNhc2UgVkNTMjoKIAkJcmV0dXJuIEdFTjlf TUZYMV9NT0NTKGluZGV4KTsKIAlkZWZhdWx0OgotCQlNSVNTSU5HX0NBU0UocmluZyk7CisJCU1J U1NJTkdfQ0FTRShlbmdpbmVfaWQpOwogCQlyZXR1cm4gSU5WQUxJRF9NTUlPX1JFRzsKIAl9CiB9 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9tb2NzLmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9tb2NzLmgKaW5kZXggNDY0MDI5OS4uYThiZDlmNyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbW9jcy5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX21vY3MuaApAQCAtNTQsNiArNTQsNiBAQAogCiBpbnQgaW50ZWxfcmNz X2NvbnRleHRfaW5pdF9tb2NzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsKIHZv aWQgaW50ZWxfbW9jc19pbml0X2wzY2NfdGFibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci1p bnQgaW50ZWxfbW9jc19pbml0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsK K2ludCBpbnRlbF9tb2NzX2luaXRfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSk7CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4 IGI4NDRlNjkuLmE2ZjdkYjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmMKQEAgLTE1ODEsNyArMTU4MSw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpOTE1X2dlbV9oYXNf c2Vxbm9fd3JhcHBlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB9CiAKIHN0 YXRpYyB2b2lkCi1nZW41X3NlcW5vX2JhcnJpZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu ZykKK2dlbjVfc2Vxbm9fYmFycmllcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7 CiAJLyogTUlfU1RPUkUgYXJlIGludGVybmFsbHkgYnVmZmVyZWQgYnkgdGhlIEdQVSBhbmQgbm90 IGZsdXNoZWQKIAkgKiBlaXRoZXIgYnkgTUlfRkxVU0ggb3IgU3luY0ZsdXNoIG9yIGFueSBvdGhl ciBjb21iaW5hdGlvbiBvZgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmlu ZGV4IDQ2NzFmYjguLjBmODAxOTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmgKQEAgLTE5NywxNCArMTk3LDE0IEBAIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgewogCiAJ dTMyICAgICAgICAgICAgIGlycV9rZWVwX21hc2s7IC8qIGFsd2F5cyBrZWVwIHRoZXNlIGludGVy cnVwdHMgKi8KIAl1MzIJCWlycV9lbmFibGVfbWFzazsgLyogYml0bWFzayB0byBlbmFibGUgcmlu ZyBpbnRlcnJ1cHQgKi8KLQl2b2lkCQkoKmlycV9lbmFibGUpKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcpOwotCXZvaWQJCSgqaXJxX2Rpc2FibGUpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcpOworCXZvaWQJCSgqaXJxX2VuYWJsZSkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKTsKKwl2b2lkCQkoKmlycV9kaXNhYmxlKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpOwogCi0JaW50CQkoKmluaXRfaHcpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwor CWludAkJKCppbml0X2h3KShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogCiAJaW50 CQkoKmluaXRfY29udGV4dCkoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogCi0J dm9pZAkJKCp3cml0ZV90YWlsKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAorCXZvaWQJ CSgqd3JpdGVfdGFpbCkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQkJCSAgICAg IHUzMiB2YWx1ZSk7CiAJaW50IF9fbXVzdF9jaGVjayAoKmZsdXNoKShzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSwKIAkJCQkgIHUzMglpbnZhbGlkYXRlX2RvbWFpbnMsCkBAIC0yMTYs MTQgKzIxNiwxNCBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAkgKiBzZWVuIHZhbHVlIGlz IGdvb2QgZW5vdWdoLiBOb3RlIHRoYXQgdGhlIHNlcW5vIHdpbGwgYWx3YXlzIGJlCiAJICogbW9u b3RvbmljLCBldmVuIGlmIG5vdCBjb2hlcmVudC4KIAkgKi8KLQl2b2lkCQkoKmlycV9zZXFub19i YXJyaWVyKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKKwl2b2lkCQkoKmlycV9zZXFu b19iYXJyaWVyKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogCWludAkJKCpkaXNw YXRjaF9leGVjYnVmZmVyKShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCQkJ ICAgICAgIHU2NCBvZmZzZXQsIHUzMiBsZW5ndGgsCiAJCQkJCSAgICAgICB1bnNpZ25lZCBkaXNw YXRjaF9mbGFncyk7CiAjZGVmaW5lIEk5MTVfRElTUEFUQ0hfU0VDVVJFIDB4MQogI2RlZmluZSBJ OTE1X0RJU1BBVENIX1BJTk5FRCAweDIKICNkZWZpbmUgSTkxNV9ESVNQQVRDSF9SUyAgICAgMHg0 Ci0Jdm9pZAkJKCpjbGVhbnVwKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKKwl2b2lk CQkoKmNsZWFudXApKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiAKIAkvKiBHRU44 IHNpZ25hbC93YWl0IHRhYmxlIC0gbmV2ZXIgdHJ1c3QgY29tbWVudHMhCiAJICoJICBzaWduYWwg dG8Jc2lnbmFsIHRvICAgIHNpZ25hbCB0byAgIHNpZ25hbCB0byAgICAgIHNpZ25hbCB0bwotLSAK MS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=