From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 14/59] drm/i915: Update move_to_gpu() to take a request structure Date: Thu, 19 Mar 2015 12:30:19 +0000 Message-ID: <1426768264-16996-15-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 BB92D6EA14 for ; Thu, 19 Mar 2015 05:31:22 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBwbGFu IGlzIHRvIHBhc3MgcmVxdWVzdHMgYXJvdW5kIGFzIHRoZSBiYXNpYyBzdWJtaXNzaW9uIHRyYWNr aW5nIHN0cnVjdHVyZQpyYXRoZXIgdGhhbiByaW5ncyBhbmQgY29udGV4dHMuIFRoaXMgcGF0Y2gg dXBkYXRlcyB0aGUgbW92ZV90b19ncHUoKSBjb2RlIHBhdGhzLgoKRm9yOiBWSVotNTExNQpTaWdu ZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgpSZXZp ZXdlZC1ieTogVG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8ICAgMTAgKysrKystLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgICAgIHwgICAxMCArKysrLS0tLS0tCiAy IGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IDBiNzA1Y2IuLjdjN2Vj MGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKQEAgLTg5 Miw3ICs4OTIsNyBAQCBlcnI6CiB9CiAKIHN0YXRpYyBpbnQKLWk5MTVfZ2VtX2V4ZWNidWZmZXJf bW92ZV90b19ncHUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKK2k5MTVfZ2VtX2V4ZWNi dWZmZXJfbW92ZV90b19ncHUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCQkJ c3RydWN0IGxpc3RfaGVhZCAqdm1hcykKIHsKIAlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKQEAgLTkw Miw3ICs5MDIsNyBAQCBpOTE1X2dlbV9leGVjYnVmZmVyX21vdmVfdG9fZ3B1KHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcsCiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZtYSwgdm1hcywgZXhl Y19saXN0KSB7CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSB2bWEtPm9iajsK LQkJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X3N5bmMob2JqLCByaW5nKTsKKwkJcmV0ID0gaTkxNV9n ZW1fb2JqZWN0X3N5bmMob2JqLCByZXEtPnJpbmcpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJl dDsKIApAQCAtOTEzLDcgKzkxMyw3IEBAIGk5MTVfZ2VtX2V4ZWNidWZmZXJfbW92ZV90b19ncHUo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAl9CiAKIAlpZiAoZmx1c2hfY2hpcHNldCkK LQkJaTkxNV9nZW1fY2hpcHNldF9mbHVzaChyaW5nLT5kZXYpOworCQlpOTE1X2dlbV9jaGlwc2V0 X2ZsdXNoKHJlcS0+cmluZy0+ZGV2KTsKIAogCWlmIChmbHVzaF9kb21haW5zICYgSTkxNV9HRU1f RE9NQUlOX0dUVCkKIAkJd21iKCk7CkBAIC05MjEsNyArOTIxLDcgQEAgaTkxNV9nZW1fZXhlY2J1 ZmZlcl9tb3ZlX3RvX2dwdShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCS8qIFVuY29u ZGl0aW9uYWxseSBpbnZhbGlkYXRlIGdwdSBjYWNoZXMgYW5kIGVuc3VyZSB0aGF0IHdlIGRvIGZs dXNoCiAJICogYW55IHJlc2lkdWFsIHdyaXRlcyBmcm9tIHRoZSBwcmV2aW91cyBiYXRjaC4KIAkg Ki8KLQlyZXR1cm4gaW50ZWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMocmluZyk7CisJcmV0 dXJuIGludGVsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHJlcS0+cmluZyk7CiB9CiAKIHN0 YXRpYyBib29sCkBAIC0xMjM4LDcgKzEyMzgsNyBAQCBpOTE1X2dlbV9yaW5nYnVmZmVyX3N1Ym1p c3Npb24oc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcywKIAkJfQogCX0KIAot CXJldCA9IGk5MTVfZ2VtX2V4ZWNidWZmZXJfbW92ZV90b19ncHUocmluZywgdm1hcyk7CisJcmV0 ID0gaTkxNV9nZW1fZXhlY2J1ZmZlcl9tb3ZlX3RvX2dwdShwYXJhbXMtPnJlcXVlc3QsIHZtYXMp OwogCWlmIChyZXQpCiAJCWdvdG8gZXJyb3I7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5k ZXggNGM3MmMxMWIuLjRlZDM2MjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC01Nzks MTEgKzU3OSw5IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX2ludmFsaWRhdGVfYWxsX2NhY2hl cyhzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIAlyZXR1cm4gMDsKIH0KIAotc3Rh dGljIGludCBleGVjbGlzdHNfbW92ZV90b19ncHUoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJp bmdidWYsCi0JCQkJIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCitzdGF0aWMgaW50IGV4ZWNs aXN0c19tb3ZlX3RvX2dwdShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCQkg c3RydWN0IGxpc3RfaGVhZCAqdm1hcykKIHsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n ID0gcmluZ2J1Zi0+cmluZzsKIAlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAl1aW50MzJfdCBmbHVz aF9kb21haW5zID0gMDsKIAlib29sIGZsdXNoX2NoaXBzZXQgPSBmYWxzZTsKQEAgLTU5Miw3ICs1 OTAsNyBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0c19tb3ZlX3RvX2dwdShzdHJ1Y3QgaW50ZWxfcmlu Z2J1ZmZlciAqcmluZ2J1ZiwKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZtYSwgdm1hcywgZXhlY19s aXN0KSB7CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSB2bWEtPm9iajsKIAot CQlyZXQgPSBpOTE1X2dlbV9vYmplY3Rfc3luYyhvYmosIHJpbmcpOworCQlyZXQgPSBpOTE1X2dl bV9vYmplY3Rfc3luYyhvYmosIHJlcS0+cmluZyk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0 OwogCkBAIC02MDgsNyArNjA2LDcgQEAgc3RhdGljIGludCBleGVjbGlzdHNfbW92ZV90b19ncHUo c3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAJLyogVW5jb25kaXRpb25hbGx5IGlu dmFsaWRhdGUgZ3B1IGNhY2hlcyBhbmQgZW5zdXJlIHRoYXQgd2UgZG8gZmx1c2gKIAkgKiBhbnkg cmVzaWR1YWwgd3JpdGVzIGZyb20gdGhlIHByZXZpb3VzIGJhdGNoLgogCSAqLwotCXJldHVybiBs b2dpY2FsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHJpbmdidWYsIGN0eCk7CisJcmV0dXJu IGxvZ2ljYWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMocmVxLT5yaW5nYnVmLCByZXEtPmN0 eCk7CiB9CiAKIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQpAQCAtOTEzLDcgKzkxMSw3IEBAIGlu dCBpbnRlbF9leGVjbGlzdHNfc3VibWlzc2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFt cyAqcGFyYW1zLAogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKLQlyZXQgPSBleGVjbGlzdHNfbW92 ZV90b19ncHUocmluZ2J1ZiwgcGFyYW1zLT5jdHgsIHZtYXMpOworCXJldCA9IGV4ZWNsaXN0c19t b3ZlX3RvX2dwdShwYXJhbXMtPnJlcXVlc3QsIHZtYXMpOwogCWlmIChyZXQpCiAJCXJldHVybiBy ZXQ7CiAKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==