From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 42/59] drm/i915: Update ring->add_request() to take a request structure Date: Thu, 19 Mar 2015 12:30:47 +0000 Message-ID: <1426768264-16996-43-git-send-email-John.C.Harrison@Intel.com> References: <1426768264-16996-1-git-send-email-John.C.Harrison@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 47FC16EA0C for ; Thu, 19 Mar 2015 05:31:57 -0700 (PDT) In-Reply-To: <1426768264-16996-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClVwZGF0ZWQg dGhlIHZhcmlvdXMgcmluZy0+YWRkX3JlcXVlc3QoKSBpbXBsZW1lbnRhdGlvbnMgdG8gdGFrZSBh IHJlcXVlc3QKaW5zdGVhZCBvZiBhIHJpbmcuIFRoaXMgcmVtb3ZlcyB0aGVpciByZWxpYW5jZSBv biB0aGUgT0xSIHRvIG9idGFpbiB0aGUgc2Vxbm8KdmFsdWUgdGhhdCB0aGUgcmVxdWVzdCBzaG91 bGQgYmUgdGFnZ2VkIHdpdGguCgpGb3I6IFZJWi01MTE1ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFy cmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+ClJldmlld2VkLWJ5OiBUb21hcyBFbGYg PHRvbWFzLmVsZkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YyAgICAgICAgIHwgICAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5jIHwgICAyNiArKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgICAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNl cnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA5 NWVkM2E4Li5kZDVjMWQ4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTIzODAsNyArMjM4 MCw3IEBAIHZvaWQgX19pOTE1X2FkZF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxdWVzdCwKIAlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKQogCQlyZXQgPSByaW5nLT5l bWl0X3JlcXVlc3QocmluZ2J1ZiwgcmVxdWVzdCk7CiAJZWxzZQotCQlyZXQgPSByaW5nLT5hZGRf cmVxdWVzdChyaW5nKTsKKwkJcmV0ID0gcmluZy0+YWRkX3JlcXVlc3QocmVxdWVzdCk7CiAJLyog Tm90IGFsbG93ZWQgdG8gZmFpbCEgKi8KIAlXQVJOX09OKHJldCk7CiAKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCBiYmJhMjdkLi4wZTU1YmFmIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0xMjM5LDE2ICsxMjM5LDE2IEBAIHN0 YXRpYyBpbnQgZ2VuNl9zaWduYWwoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqc2lnbmFsbGVyLAog CiAvKioKICAqIGdlbjZfYWRkX3JlcXVlc3QgLSBVcGRhdGUgdGhlIHNlbWFwaG9yZSBtYWlsYm94 IHJlZ2lzdGVycwotICogCi0gKiBAcmluZyAtIHJpbmcgdGhhdCBpcyBhZGRpbmcgYSByZXF1ZXN0 Ci0gKiBAc2Vxbm8gLSByZXR1cm4gc2Vxbm8gc3R1Y2sgaW50byB0aGUgcmluZworICoKKyAqIEBy ZXF1ZXN0IC0gcmVxdWVzdCB0byB3cml0ZSB0byB0aGUgcmluZwogICoKICAqIFVwZGF0ZSB0aGUg bWFpbGJveCByZWdpc3RlcnMgaW4gdGhlICpvdGhlciogcmluZ3Mgd2l0aCB0aGUgY3VycmVudCBz ZXFuby4KICAqIFRoaXMgYWN0cyBsaWtlIGEgc2lnbmFsIGluIHRoZSBjYW5vbmljYWwgc2VtYXBo b3JlLgogICovCiBzdGF0aWMgaW50Ci1nZW42X2FkZF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcpCitnZW42X2FkZF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxKQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXEtPnJpbmc7CiAJ aW50IHJldDsKIAogCWlmIChyaW5nLT5zZW1hcGhvcmUuc2lnbmFsKQpAQCAtMTI2MSw4ICsxMjYx LDcgQEAgZ2VuNl9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCiAJ aW50ZWxfcmluZ19lbWl0KHJpbmcsIE1JX1NUT1JFX0RXT1JEX0lOREVYKTsKIAlpbnRlbF9yaW5n X2VtaXQocmluZywgSTkxNV9HRU1fSFdTX0lOREVYIDw8IE1JX1NUT1JFX0RXT1JEX0lOREVYX1NI SUZUKTsKLQlpbnRlbF9yaW5nX2VtaXQocmluZywKLQkJICAgIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0 X3NlcW5vKHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCkpOworCWludGVsX3JpbmdfZW1p dChyaW5nLCBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhyZXEpKTsKIAlpbnRlbF9yaW5nX2Vt aXQocmluZywgTUlfVVNFUl9JTlRFUlJVUFQpOwogCV9faW50ZWxfcmluZ19hZHZhbmNlKHJpbmcp OwogCkBAIC0xMzU5LDggKzEzNTgsOSBAQCBkbyB7CQkJCQkJCQkJXAogfSB3aGlsZSAoMCkKIAog c3RhdGljIGludAotcGNfcmVuZGVyX2FkZF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcpCitwY19yZW5kZXJfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXEpCiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+cmluZzsKIAl1 MzIgc2NyYXRjaF9hZGRyID0gcmluZy0+c2NyYXRjaC5ndHRfb2Zmc2V0ICsgMiAqIENBQ0hFTElO RV9CWVRFUzsKIAlpbnQgcmV0OwogCkBAIC0xMzgwLDggKzEzODAsNyBAQCBwY19yZW5kZXJfYWRk X3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAkJCVBJUEVfQ09OVFJPTF9X UklURV9GTFVTSCB8CiAJCQlQSVBFX0NPTlRST0xfVEVYVFVSRV9DQUNIRV9JTlZBTElEQVRFKTsK IAlpbnRlbF9yaW5nX2VtaXQocmluZywgcmluZy0+c2NyYXRjaC5ndHRfb2Zmc2V0IHwgUElQRV9D T05UUk9MX0dMT0JBTF9HVFQpOwotCWludGVsX3JpbmdfZW1pdChyaW5nLAotCQkgICAgaTkxNV9n ZW1fcmVxdWVzdF9nZXRfc2Vxbm8ocmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KSk7CisJ aW50ZWxfcmluZ19lbWl0KHJpbmcsIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHJlcSkpOwog CWludGVsX3JpbmdfZW1pdChyaW5nLCAwKTsKIAlQSVBFX0NPTlRST0xfRkxVU0gocmluZywgc2Ny YXRjaF9hZGRyKTsKIAlzY3JhdGNoX2FkZHIgKz0gMiAqIENBQ0hFTElORV9CWVRFUzsgLyogd3Jp dGUgdG8gc2VwYXJhdGUgY2FjaGVsaW5lcyAqLwpAQCAtMTQwMCw4ICsxMzk5LDcgQEAgcGNfcmVu ZGVyX2FkZF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJCQlQSVBFX0NP TlRST0xfVEVYVFVSRV9DQUNIRV9JTlZBTElEQVRFIHwKIAkJCVBJUEVfQ09OVFJPTF9OT1RJRlkp OwogCWludGVsX3JpbmdfZW1pdChyaW5nLCByaW5nLT5zY3JhdGNoLmd0dF9vZmZzZXQgfCBQSVBF X0NPTlRST0xfR0xPQkFMX0dUVCk7Ci0JaW50ZWxfcmluZ19lbWl0KHJpbmcsCi0JCSAgICBpOTE1 X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhyaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QpKTsK KwlpbnRlbF9yaW5nX2VtaXQocmluZywgaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ocmVxKSk7 CiAJaW50ZWxfcmluZ19lbWl0KHJpbmcsIDApOwogCV9faW50ZWxfcmluZ19hZHZhbmNlKHJpbmcp OwogCkBAIC0xNTcwLDggKzE1NjgsOSBAQCBic2RfcmluZ19mbHVzaChzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSwKIH0KIAogc3RhdGljIGludAotaTl4eF9hZGRfcmVxdWVzdChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQoraTl4eF9hZGRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0g cmVxLT5yaW5nOwogCWludCByZXQ7CiAKIAlyZXQgPSBpbnRlbF9yaW5nX2JlZ2luKHJpbmcsIDQp OwpAQCAtMTU4MCw4ICsxNTc5LDcgQEAgaTl4eF9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpyaW5nKQogCiAJaW50ZWxfcmluZ19lbWl0KHJpbmcsIE1JX1NUT1JFX0RXT1JEX0lO REVYKTsKIAlpbnRlbF9yaW5nX2VtaXQocmluZywgSTkxNV9HRU1fSFdTX0lOREVYIDw8IE1JX1NU T1JFX0RXT1JEX0lOREVYX1NISUZUKTsKLQlpbnRlbF9yaW5nX2VtaXQocmluZywKLQkJICAgIGk5 MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCkp OworCWludGVsX3JpbmdfZW1pdChyaW5nLCBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhyZXEp KTsKIAlpbnRlbF9yaW5nX2VtaXQocmluZywgTUlfVVNFUl9JTlRFUlJVUFQpOwogCV9faW50ZWxf cmluZ19hZHZhbmNlKHJpbmcpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmgKaW5kZXggOTQxODJkZS4uOTY0MTYzNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuaApAQCAtMTUzLDcgKzE1Myw3IEBAIHN0cnVjdCAgaW50ZWxfZW5naW5lX2NzIHsK IAlpbnQgX19tdXN0X2NoZWNrICgqZmx1c2gpKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxLAogCQkJCSAgdTMyCWludmFsaWRhdGVfZG9tYWlucywKIAkJCQkgIHUzMglmbHVzaF9kb21h aW5zKTsKLQlpbnQJCSgqYWRkX3JlcXVlc3QpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcp OworCWludAkJKCphZGRfcmVxdWVzdCkoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEp OwogCS8qIFNvbWUgY2hpcHNldHMgYXJlIG5vdCBxdWl0ZSBhcyBjb2hlcmVudCBhcyBhZHZlcnRp c2VkIGFuZCBuZWVkCiAJICogYW4gZXhwZW5zaXZlIGtpY2sgdG8gZm9yY2UgYSB0cnVlIHJlYWQg b2YgdGhlIHVwLXRvLWRhdGUgc2Vxbm8uCiAJICogSG93ZXZlciwgdGhlIHVwLXRvLWRhdGUgc2Vx bm8gaXMgbm90IGFsd2F5cyByZXF1aXJlZCBhbmQgdGhlIGxhc3QKLS0gCjEuNy45LjUKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==