From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 11/55] drm/i915: Update move_to_gpu() to take a request structure Date: Fri, 29 May 2015 17:43:32 +0100 Message-ID: <1432917856-12261-12-git-send-email-John.C.Harrison@Intel.com> References: <1432917856-12261-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 198DE6EDED for ; Fri, 29 May 2015 09:44:30 -0700 (PDT) In-Reply-To: <1432917856-12261-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBwbGFu IGlzIHRvIHBhc3MgcmVxdWVzdHMgYXJvdW5kIGFzIHRoZSBiYXNpYyBzdWJtaXNzaW9uIHRyYWNr aW5nIHN0cnVjdHVyZQpyYXRoZXIgdGhhbiByaW5ncyBhbmQgY29udGV4dHMuIFRoaXMgcGF0Y2gg dXBkYXRlcyB0aGUgbW92ZV90b19ncHUoKSBjb2RlIHBhdGhzLgoKRm9yOiBWSVotNTExNQpTaWdu ZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgpSZXZp ZXdlZC1ieTogVG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8ICAgMTIgKysrKysrLS0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAgIDEyICsrKysrLS0tLS0t LQogMiBmaWxlcyBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggNjNiNWRkMy4u Y2M0ZDI1ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1 ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpA QCAtODg2LDEwICs4ODYsMTAgQEAgZXJyOgogfQogCiBzdGF0aWMgaW50Ci1pOTE1X2dlbV9leGVj YnVmZmVyX21vdmVfdG9fZ3B1KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCitpOTE1X2dl bV9leGVjYnVmZmVyX21vdmVfdG9fZ3B1KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx LAogCQkJCXN0cnVjdCBsaXN0X2hlYWQgKnZtYXMpCiB7Ci0JY29uc3QgdW5zaWduZWQgb3RoZXJf cmluZ3MgPSB+aW50ZWxfcmluZ19mbGFnKHJpbmcpOworCWNvbnN0IHVuc2lnbmVkIG90aGVyX3Jp bmdzID0gfmludGVsX3JpbmdfZmxhZyhyZXEtPnJpbmcpOwogCXN0cnVjdCBpOTE1X3ZtYSAqdm1h OwogCXVpbnQzMl90IGZsdXNoX2RvbWFpbnMgPSAwOwogCWJvb2wgZmx1c2hfY2hpcHNldCA9IGZh bHNlOwpAQCAtODk5LDcgKzg5OSw3IEBAIGk5MTVfZ2VtX2V4ZWNidWZmZXJfbW92ZV90b19ncHUo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKm9iaiA9IHZtYS0+b2JqOwogCiAJCWlmIChvYmotPmFjdGl2ZSAmIG90aGVyX3JpbmdzKSB7 Ci0JCQlyZXQgPSBpOTE1X2dlbV9vYmplY3Rfc3luYyhvYmosIHJpbmcpOworCQkJcmV0ID0gaTkx NV9nZW1fb2JqZWN0X3N5bmMob2JqLCByZXEtPnJpbmcpOwogCQkJaWYgKHJldCkKIAkJCQlyZXR1 cm4gcmV0OwogCQl9CkBAIC05MTEsNyArOTExLDcgQEAgaTkxNV9nZW1fZXhlY2J1ZmZlcl9tb3Zl X3RvX2dwdShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCX0KIAogCWlmIChmbHVzaF9j aGlwc2V0KQotCQlpOTE1X2dlbV9jaGlwc2V0X2ZsdXNoKHJpbmctPmRldik7CisJCWk5MTVfZ2Vt X2NoaXBzZXRfZmx1c2gocmVxLT5yaW5nLT5kZXYpOwogCiAJaWYgKGZsdXNoX2RvbWFpbnMgJiBJ OTE1X0dFTV9ET01BSU5fR1RUKQogCQl3bWIoKTsKQEAgLTkxOSw3ICs5MTksNyBAQCBpOTE1X2dl bV9leGVjYnVmZmVyX21vdmVfdG9fZ3B1KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJ LyogVW5jb25kaXRpb25hbGx5IGludmFsaWRhdGUgZ3B1IGNhY2hlcyBhbmQgZW5zdXJlIHRoYXQg d2UgZG8gZmx1c2gKIAkgKiBhbnkgcmVzaWR1YWwgd3JpdGVzIGZyb20gdGhlIHByZXZpb3VzIGJh dGNoLgogCSAqLwotCXJldHVybiBpbnRlbF9yaW5nX2ludmFsaWRhdGVfYWxsX2NhY2hlcyhyaW5n KTsKKwlyZXR1cm4gaW50ZWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMocmVxLT5yaW5nKTsK IH0KIAogc3RhdGljIGJvb2wKQEAgLTEyMzgsNyArMTIzOCw3IEBAIGk5MTVfZ2VtX3JpbmdidWZm ZXJfc3VibWlzc2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCQl9 CiAJfQogCi0JcmV0ID0gaTkxNV9nZW1fZXhlY2J1ZmZlcl9tb3ZlX3RvX2dwdShyaW5nLCB2bWFz KTsKKwlyZXQgPSBpOTE1X2dlbV9leGVjYnVmZmVyX21vdmVfdG9fZ3B1KHBhcmFtcy0+cmVxdWVz dCwgdm1hcyk7CiAJaWYgKHJldCkKIAkJZ290byBlcnJvcjsKIApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuYwppbmRleCAyMTY0MGI4Li5hOThjOWNlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpA QCAtNjI1LDEyICs2MjUsMTAgQEAgc3RhdGljIGludCBsb2dpY2FsX3JpbmdfaW52YWxpZGF0ZV9h bGxfY2FjaGVzKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCXJldHVybiAwOwog fQogCi1zdGF0aWMgaW50IGV4ZWNsaXN0c19tb3ZlX3RvX2dwdShzdHJ1Y3QgaW50ZWxfcmluZ2J1 ZmZlciAqcmluZ2J1ZiwKLQkJCQkgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKK3N0YXRpYyBp bnQgZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx LAogCQkJCSBzdHJ1Y3QgbGlzdF9oZWFkICp2bWFzKQogewotCXN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcgPSByaW5nYnVmLT5yaW5nOwotCWNvbnN0IHVuc2lnbmVkIG90aGVyX3JpbmdzID0g fmludGVsX3JpbmdfZmxhZyhyaW5nKTsKKwljb25zdCB1bnNpZ25lZCBvdGhlcl9yaW5ncyA9IH5p bnRlbF9yaW5nX2ZsYWcocmVxLT5yaW5nKTsKIAlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAl1aW50 MzJfdCBmbHVzaF9kb21haW5zID0gMDsKIAlib29sIGZsdXNoX2NoaXBzZXQgPSBmYWxzZTsKQEAg LTY0MCw3ICs2MzgsNyBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0c19tb3ZlX3RvX2dwdShzdHJ1Y3Qg aW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Km9iaiA9IHZtYS0+b2JqOwogCiAJCWlmIChvYmotPmFjdGl2ZSAmIG90aGVyX3JpbmdzKSB7Ci0J CQlyZXQgPSBpOTE1X2dlbV9vYmplY3Rfc3luYyhvYmosIHJpbmcpOworCQkJcmV0ID0gaTkxNV9n ZW1fb2JqZWN0X3N5bmMob2JqLCByZXEtPnJpbmcpOwogCQkJaWYgKHJldCkKIAkJCQlyZXR1cm4g cmV0OwogCQl9CkBAIC02NTcsNyArNjU1LDcgQEAgc3RhdGljIGludCBleGVjbGlzdHNfbW92ZV90 b19ncHUoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAJLyogVW5jb25kaXRpb25h bGx5IGludmFsaWRhdGUgZ3B1IGNhY2hlcyBhbmQgZW5zdXJlIHRoYXQgd2UgZG8gZmx1c2gKIAkg KiBhbnkgcmVzaWR1YWwgd3JpdGVzIGZyb20gdGhlIHByZXZpb3VzIGJhdGNoLgogCSAqLwotCXJl dHVybiBsb2dpY2FsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHJpbmdidWYsIGN0eCk7CisJ cmV0dXJuIGxvZ2ljYWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMocmVxLT5yaW5nYnVmLCBy ZXEtPmN0eCk7CiB9CiAKIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRy YXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQpAQCAtOTA3LDcgKzkwNSw3 IEBAIGludCBpbnRlbF9leGVjbGlzdHNfc3VibWlzc2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVmZmVy X3BhcmFtcyAqcGFyYW1zLAogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKLQlyZXQgPSBleGVjbGlz dHNfbW92ZV90b19ncHUocmluZ2J1ZiwgcGFyYW1zLT5jdHgsIHZtYXMpOworCXJldCA9IGV4ZWNs aXN0c19tb3ZlX3RvX2dwdShwYXJhbXMtPnJlcXVlc3QsIHZtYXMpOwogCWlmIChyZXQpCiAJCXJl dHVybiByZXQ7CiAKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==