From: Nick Hoath Subject: [PATCH 2/5] drm/i915: Removed duplicate members from submit_request Date: Wed, 12 Nov 2014 10:53:24 +0000 Message-ID: <1415789607-10243-3-git-send-email-nicholas.hoath@intel.com> References: <1415789607-10243-1-git-send-email-nicholas.hoath@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 DAF2B6E47B for ; Wed, 12 Nov 2014 02:57:33 -0800 (PST) In-Reply-To: <1415789607-10243-1-git-send-email-nicholas.hoath@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 V2hlcmUgdGhlcmUgd2VyZSBkdXBsaWNhdGUgdmFyaWFibGVzIGZvciB0aGUgdGFpbCwgY29udGV4 dCBhbmQgcmluZyAoZW5naW5lKQppbiB0aGUgZ2VtIHJlcXVlc3QgYW5kIHRoZSBleGVjbGlzdCBx dWV1ZSBpdGVtLCB1c2UgdGhlIG9uZSBmcm9tIHRoZSByZXF1ZXN0CmFuZCByZW1vdmUgdGhlIGR1 cGxpY2F0ZSBmcm9tIHRoZSBleGVjbGlzdCBxdWV1ZSBpdGVtLgoKSXNzdWU6IFZJWi00Mjc0ClNp Z25lZC1vZmYtYnk6IE5pY2sgSG9hdGggPG5pY2hvbGFzLmhvYXRoQGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jICAgIHwgMjEgKysrKysrKysrLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuaCAgICB8ICA0IC0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0 aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpp bmRleCAwZDZhZjFjLi40NWRhNzllIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpA QCAtMTg5MSwxMSArMTg5MSwxMSBAQCBzdGF0aWMgaW50IGk5MTVfZXhlY2xpc3RzKHN0cnVjdCBz ZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAkJaWYgKGhlYWRfcmVxKSB7CiAJCQlzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqY3R4X29iajsKIAotCQkJY3R4X29iaiA9IGhlYWRfcmVxLT5jdHgt PmVuZ2luZVtyaW5nX2lkXS5zdGF0ZTsKKwkJCWN0eF9vYmogPSBoZWFkX3JlcS0+cmVxdWVzdC0+ Y3R4LT5lbmdpbmVbcmluZ19pZF0uc3RhdGU7CiAJCQlzZXFfcHJpbnRmKG0sICJcdEhlYWQgcmVx dWVzdCBpZDogJXVcbiIsCiAJCQkJICAgaW50ZWxfZXhlY2xpc3RzX2N0eF9pZChjdHhfb2JqKSk7 CiAJCQlzZXFfcHJpbnRmKG0sICJcdEhlYWQgcmVxdWVzdCB0YWlsOiAldVxuIiwKLQkJCQkgICBo ZWFkX3JlcS0+dGFpbCk7CisJCQkJICAgaGVhZF9yZXEtPnJlcXVlc3QtPnRhaWwpOwogCQl9CiAK IAkJc2VxX3B1dGMobSwgJ1xuJyk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA4NjBjMjk2 Li5lNWY1MjFmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI3MDQsNyArMjcwNCw3IEBA IHN0YXRpYyB2b2lkIGk5MTVfZ2VtX3Jlc2V0X3JpbmdfY2xlYW51cChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJZXhlY2xpc3RfbGluayk7CiAJCWxpc3RfZGVsKCZzdWJt aXRfcmVxLT5leGVjbGlzdF9saW5rKTsKIAkJaW50ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYp OwotCQlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKHN1Ym1pdF9yZXEtPmN0eCk7CisJCWk5 MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2Uoc3VibWl0X3JlcS0+cmVxdWVzdC0+Y3R4KTsKIAkJ a2ZyZWUoc3VibWl0X3JlcSk7CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDU5 MzQ3MWYuLjBlMmUzM2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0zOTYsNyArMzk2 LDcgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2NvbnRleHRfdW5xdWV1ZShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nKQogCQkJCSBleGVjbGlzdF9saW5rKSB7CiAJCWlmICghcmVxMCkgewog CQkJcmVxMCA9IGN1cnNvcjsKLQkJfSBlbHNlIGlmIChyZXEwLT5jdHggPT0gY3Vyc29yLT5jdHgp IHsKKwkJfSBlbHNlIGlmIChyZXEwLT5yZXF1ZXN0LT5jdHggPT0gY3Vyc29yLT5yZXF1ZXN0LT5j dHgpIHsKIAkJCS8qIFNhbWUgY3R4OiBpZ25vcmUgZmlyc3QgcmVxdWVzdCwgYXMgc2Vjb25kIHJl cXVlc3QKIAkJCSAqIHdpbGwgdXBkYXRlIHRhaWwgcGFzdCBmaXJzdCByZXF1ZXN0J3Mgd29ya2xv YWQgKi8KIAkJCWN1cnNvci0+ZWxzcF9zdWJtaXR0ZWQgPSByZXEwLT5lbHNwX3N1Ym1pdHRlZDsK QEAgLTQxMSw5ICs0MTEsOSBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY29udGV4dF91bnF1ZXVl KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAKIAlXQVJOX09OKHJlcTEgJiYgcmVxMS0+ ZWxzcF9zdWJtaXR0ZWQpOwogCi0JZXhlY2xpc3RzX3N1Ym1pdF9jb250ZXh0cyhyaW5nLCByZXEw LT5jdHgsIHJlcTAtPnRhaWwsCi0JCQkJICByZXExID8gcmVxMS0+Y3R4IDogTlVMTCwKLQkJCQkg IHJlcTEgPyByZXExLT50YWlsIDogMCk7CisJZXhlY2xpc3RzX3N1Ym1pdF9jb250ZXh0cyhyaW5n LCByZXEwLT5yZXF1ZXN0LT5jdHgsIHJlcTAtPnJlcXVlc3QtPnRhaWwsCisJCQkJICByZXExID8g cmVxMS0+cmVxdWVzdC0+Y3R4IDogTlVMTCwKKwkJCQkgIHJlcTEgPyByZXExLT5yZXF1ZXN0LT50 YWlsIDogMCk7CiAKIAlyZXEwLT5lbHNwX3N1Ym1pdHRlZCsrOwogCWlmIChyZXExKQpAQCAtNDM0 LDcgKzQzNCw3IEBAIHN0YXRpYyBib29sIGV4ZWNsaXN0c19jaGVja19yZW1vdmVfcmVxdWVzdChz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCiAJaWYgKGhlYWRfcmVxICE9IE5VTEwpIHsK IAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmogPQotCQkJCWhlYWRfcmVxLT5j dHgtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGU7CisJCQkJaGVhZF9yZXEtPnJlcXVlc3QtPmN0eC0+ ZW5naW5lW3JpbmctPmlkXS5zdGF0ZTsKIAkJaWYgKGludGVsX2V4ZWNsaXN0c19jdHhfaWQoY3R4 X29iaikgPT0gcmVxdWVzdF9pZCkgewogCQkJV0FSTihoZWFkX3JlcS0+ZWxzcF9zdWJtaXR0ZWQg PT0gMCwKIAkJCSAgICAgIk5ldmVyIHN1Ym1pdHRlZCBoZWFkIHJlcXVlc3RcbiIpOwpAQCAtNTE0 LDEzICs1MTQsMTMgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2ZyZWVfcmVxdWVzdF90YXNrKHN0 cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIHsKIAlzdHJ1Y3QgaW50ZWxfY3R4X3N1Ym1pdF9yZXF1 ZXN0ICpyZXEgPQogCQljb250YWluZXJfb2Yod29yaywgc3RydWN0IGludGVsX2N0eF9zdWJtaXRf cmVxdWVzdCwgd29yayk7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHJlcS0+cmluZy0+ZGV2 OworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByZXEtPnJlcXVlc3QtPnJpbmctPmRldjsKIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCiAJ aW50ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYpOwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1 Y3RfbXV0ZXgpOwotCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UocmVxLT5jdHgpOworCWk5 MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UocmVxLT5yZXF1ZXN0LT5jdHgpOwogCWk5MTVfZ2Vt X3JlcXVlc3RfdW5yZWZlcmVuY2UocmVxLT5yZXF1ZXN0KTsKIAltdXRleF91bmxvY2soJmRldi0+ c3RydWN0X211dGV4KTsKIApAQCAtNTQwLDEwICs1NDAsNiBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0 c19jb250ZXh0X3F1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJcmVxID0ga3ph bGxvYyhzaXplb2YoKnJlcSksIEdGUF9LRVJORUwpOwogCWlmIChyZXEgPT0gTlVMTCkKIAkJcmV0 dXJuIC1FTk9NRU07Ci0JcmVxLT5jdHggPSB0bzsKLQlpOTE1X2dlbV9jb250ZXh0X3JlZmVyZW5j ZShyZXEtPmN0eCk7Ci0JcmVxLT5yaW5nID0gcmluZzsKLQlyZXEtPnRhaWwgPSB0YWlsOwogCUlO SVRfV09SSygmcmVxLT53b3JrLCBleGVjbGlzdHNfZnJlZV9yZXF1ZXN0X3Rhc2spOwogCiAJaWYo IXJlcXVlc3QpCkBAIC01NjEsNiArNTU3LDcgQEAgc3RhdGljIGludCBleGVjbGlzdHNfY29udGV4 dF9xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCX0KIAlyZXEtPnJlcXVlc3Qg PSByZXF1ZXN0OwogCWk5MTVfZ2VtX3JlcXVlc3RfcmVmZXJlbmNlKHJlcXVlc3QpOworCWk5MTVf Z2VtX2NvbnRleHRfcmVmZXJlbmNlKHJlcS0+cmVxdWVzdC0+Y3R4KTsKIAogCWludGVsX3J1bnRp bWVfcG1fZ2V0KGRldl9wcml2KTsKIApAQCAtNTc3LDcgKzU3NCw3IEBAIHN0YXRpYyBpbnQgZXhl Y2xpc3RzX2NvbnRleHRfcXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJCQkJ ICAgc3RydWN0IGludGVsX2N0eF9zdWJtaXRfcmVxdWVzdCwKIAkJCQkJICAgZXhlY2xpc3RfbGlu ayk7CiAKLQkJaWYgKHRvID09IHRhaWxfcmVxLT5jdHgpIHsKKwkJaWYgKHRvID09IHRhaWxfcmVx LT5yZXF1ZXN0LT5jdHgpIHsKIAkJCVdBUk4odGFpbF9yZXEtPmVsc3Bfc3VibWl0dGVkICE9IDAs CiAJCQkgICAgICJNb3JlIHRoYW4gMiBhbHJlYWR5LXN1Ym1pdHRlZCByZXFzIHF1ZXVlZFxuIik7 CiAJCQlsaXN0X2RlbCgmdGFpbF9yZXEtPmV4ZWNsaXN0X2xpbmspOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuaAppbmRleCA2ZjgxNjY5Li43NjE0MWNlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu aApAQCAtMTAwLDEwICsxMDAsNiBAQCB1MzIgaW50ZWxfZXhlY2xpc3RzX2N0eF9pZChzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaik7CiAgKiBBbGwgYWNjZXNzZXMgdG8gdGhlIHF1 ZXVlIGFyZSBtZWRpYXRlZCBieSBhIHNwaW5sb2NrIChyaW5nLT5leGVjbGlzdF9sb2NrKS4KICAq Lwogc3RydWN0IGludGVsX2N0eF9zdWJtaXRfcmVxdWVzdCB7Ci0Jc3RydWN0IGludGVsX2NvbnRl eHQgKmN0eDsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOwotCXUzMiB0YWlsOwotCiAJ c3RydWN0IGxpc3RfaGVhZCBleGVjbGlzdF9saW5rOwogCXN0cnVjdCB3b3JrX3N0cnVjdCB3b3Jr OwogCi0tIAoyLjEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK