From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 11/53] drm/i915: Update move_to_gpu() to take a request structure Date: Thu, 19 Feb 2015 17:17:23 +0000 Message-ID: <1424366285-29232-12-git-send-email-John.C.Harrison@Intel.com> References: <1423828140-10653-1-git-send-email-John.C.Harrison@Intel.com> <1424366285-29232-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 1699472060 for ; Thu, 19 Feb 2015 09:18:19 -0800 (PST) In-Reply-To: <1424366285-29232-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 ZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8ICAgMTAgKysrKyst LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgICAgIHwgICAxMCAr KysrLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZl ci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IDg4 M2NhYmQuLmRhMWUyMzIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVm ZmVyLmMKQEAgLTgyOCw3ICs4MjgsNyBAQCBlcnI6CiB9CiAKIHN0YXRpYyBpbnQKLWk5MTVfZ2Vt X2V4ZWNidWZmZXJfbW92ZV90b19ncHUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKK2k5 MTVfZ2VtX2V4ZWNidWZmZXJfbW92ZV90b19ncHUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXEsCiAJCQkJc3RydWN0IGxpc3RfaGVhZCAqdm1hcykKIHsKIAlzdHJ1Y3QgaTkxNV92bWEg KnZtYTsKQEAgLTgzOCw3ICs4MzgsNyBAQCBpOTE1X2dlbV9leGVjYnVmZmVyX21vdmVfdG9fZ3B1 KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZt YSwgdm1hcywgZXhlY19saXN0KSB7CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmog PSB2bWEtPm9iajsKLQkJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X3N5bmMob2JqLCByaW5nKTsKKwkJ cmV0ID0gaTkxNV9nZW1fb2JqZWN0X3N5bmMob2JqLCByZXEtPnJpbmcpOwogCQlpZiAocmV0KQog CQkJcmV0dXJuIHJldDsKIApAQCAtODQ5LDcgKzg0OSw3IEBAIGk5MTVfZ2VtX2V4ZWNidWZmZXJf bW92ZV90b19ncHUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAl9CiAKIAlpZiAoZmx1 c2hfY2hpcHNldCkKLQkJaTkxNV9nZW1fY2hpcHNldF9mbHVzaChyaW5nLT5kZXYpOworCQlpOTE1 X2dlbV9jaGlwc2V0X2ZsdXNoKHJlcS0+cmluZy0+ZGV2KTsKIAogCWlmIChmbHVzaF9kb21haW5z ICYgSTkxNV9HRU1fRE9NQUlOX0dUVCkKIAkJd21iKCk7CkBAIC04NTcsNyArODU3LDcgQEAgaTkx NV9nZW1fZXhlY2J1ZmZlcl9tb3ZlX3RvX2dwdShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n LAogCS8qIFVuY29uZGl0aW9uYWxseSBpbnZhbGlkYXRlIGdwdSBjYWNoZXMgYW5kIGVuc3VyZSB0 aGF0IHdlIGRvIGZsdXNoCiAJICogYW55IHJlc2lkdWFsIHdyaXRlcyBmcm9tIHRoZSBwcmV2aW91 cyBiYXRjaC4KIAkgKi8KLQlyZXR1cm4gaW50ZWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMo cmluZyk7CisJcmV0dXJuIGludGVsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHJlcS0+cmlu Zyk7CiB9CiAKIHN0YXRpYyBib29sCkBAIC0xMTg2LDcgKzExODYsNyBAQCBpOTE1X2dlbV9yaW5n YnVmZmVyX3N1Ym1pc3Npb24oc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcywK IAkJfQogCX0KIAotCXJldCA9IGk5MTVfZ2VtX2V4ZWNidWZmZXJfbW92ZV90b19ncHUocmluZywg dm1hcyk7CisJcmV0ID0gaTkxNV9nZW1fZXhlY2J1ZmZlcl9tb3ZlX3RvX2dwdShwYXJhbXMtPnJl cXVlc3QsIHZtYXMpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyb3I7CiAKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMKaW5kZXggYzQyYWYwOC4uZWZlOTcwZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmMKQEAgLTU3OCwxMSArNTc4LDkgQEAgc3RhdGljIGludCBsb2dpY2FsX3JpbmdfaW52YWxpZGF0 ZV9hbGxfY2FjaGVzKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCXJldHVybiAw OwogfQogCi1zdGF0aWMgaW50IGV4ZWNsaXN0c19tb3ZlX3RvX2dwdShzdHJ1Y3QgaW50ZWxfcmlu Z2J1ZmZlciAqcmluZ2J1ZiwKLQkJCQkgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKK3N0YXRp YyBpbnQgZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxLAogCQkJCSBzdHJ1Y3QgbGlzdF9oZWFkICp2bWFzKQogewotCXN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcgPSByaW5nYnVmLT5yaW5nOwogCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwogCXVp bnQzMl90IGZsdXNoX2RvbWFpbnMgPSAwOwogCWJvb2wgZmx1c2hfY2hpcHNldCA9IGZhbHNlOwpA QCAtNTkxLDcgKzU4OSw3IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHN0cnVj dCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCB2 bWFzLCBleGVjX2xpc3QpIHsKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IHZt YS0+b2JqOwogCi0JCXJldCA9IGk5MTVfZ2VtX29iamVjdF9zeW5jKG9iaiwgcmluZyk7CisJCXJl dCA9IGk5MTVfZ2VtX29iamVjdF9zeW5jKG9iaiwgcmVxLT5yaW5nKTsKIAkJaWYgKHJldCkKIAkJ CXJldHVybiByZXQ7CiAKQEAgLTYwNyw3ICs2MDUsNyBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0c19t b3ZlX3RvX2dwdShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIAkvKiBVbmNvbmRp dGlvbmFsbHkgaW52YWxpZGF0ZSBncHUgY2FjaGVzIGFuZCBlbnN1cmUgdGhhdCB3ZSBkbyBmbHVz aAogCSAqIGFueSByZXNpZHVhbCB3cml0ZXMgZnJvbSB0aGUgcHJldmlvdXMgYmF0Y2guCiAJICov Ci0JcmV0dXJuIGxvZ2ljYWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMocmluZ2J1ZiwgY3R4 KTsKKwlyZXR1cm4gbG9naWNhbF9yaW5nX2ludmFsaWRhdGVfYWxsX2NhY2hlcyhyZXEtPnJpbmdi dWYsIHJlcS0+Y3R4KTsKIH0KIAogLyoqCkBAIC02ODYsNyArNjg0LDcgQEAgaW50IGludGVsX2V4 ZWNsaXN0c19zdWJtaXNzaW9uKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMs CiAJCXJldHVybiAtRUlOVkFMOwogCX0KIAotCXJldCA9IGV4ZWNsaXN0c19tb3ZlX3RvX2dwdShy aW5nYnVmLCBwYXJhbXMtPmN0eCwgdm1hcyk7CisJcmV0ID0gZXhlY2xpc3RzX21vdmVfdG9fZ3B1 KHBhcmFtcy0+cmVxdWVzdCwgdm1hcyk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotLSAK MS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK