From: Nick Hoath Subject: [PATCH 2/4] drm/i915: Removed duplicate members from submit_request Date: Mon, 22 Dec 2014 09:37:22 +0000 Message-ID: <1419241044-929-3-git-send-email-nicholas.hoath@intel.com> References: <1419241044-929-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 3FD496E223 for ; Mon, 22 Dec 2014 01:37:32 -0800 (PST) In-Reply-To: <1419241044-929-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 Cc: daniel.vetter@ffwll.ch List-Id: intel-gfx@lists.freedesktop.org V2hlcmUgdGhlcmUgd2VyZSBkdXBsaWNhdGUgdmFyaWFibGVzIGZvciB0aGUgdGFpbCwgY29udGV4 dCBhbmQgcmluZyAoZW5naW5lKQppbiB0aGUgZ2VtIHJlcXVlc3QgYW5kIHRoZSBleGVjbGlzdCBx dWV1ZSBpdGVtLCB1c2UgdGhlIG9uZSBmcm9tIHRoZSByZXF1ZXN0CmFuZCByZW1vdmUgdGhlIGR1 cGxpY2F0ZSBmcm9tIHRoZSBleGVjbGlzdCBxdWV1ZSBpdGVtLgoKSXNzdWU6IFZJWi00Mjc0Cgp2 MTogUmViYXNlClNpZ25lZC1vZmYtYnk6IE5pY2sgSG9hdGggPG5pY2hvbGFzLmhvYXRoQGludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8ICA0ICsrLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jICAgIHwgMjAgKysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oICAgIHwgIDQgLS0tLQogNCBmaWxlcyBjaGFuZ2Vk LCAxMiBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZGVidWdmcy5jCmluZGV4IGU1MTVhYWQuLmQ0Y2M0ODIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZGVidWdmcy5jCkBAIC0xOTY4LDExICsxOTY4LDExIEBAIHN0YXRpYyBpbnQgaTkxNV9leGVjbGlz dHMoc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCQlpZiAoaGVhZF9yZXEpIHsKIAkJ CXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqOwogCi0JCQljdHhfb2JqID0gaGVh ZF9yZXEtPmN0eC0+ZW5naW5lW3JpbmdfaWRdLnN0YXRlOworCQkJY3R4X29iaiA9IGhlYWRfcmVx LT5yZXF1ZXN0LT5jdHgtPmVuZ2luZVtyaW5nX2lkXS5zdGF0ZTsKIAkJCXNlcV9wcmludGYobSwg Ilx0SGVhZCByZXF1ZXN0IGlkOiAldVxuIiwKIAkJCQkgICBpbnRlbF9leGVjbGlzdHNfY3R4X2lk KGN0eF9vYmopKTsKIAkJCXNlcV9wcmludGYobSwgIlx0SGVhZCByZXF1ZXN0IHRhaWw6ICV1XG4i LAotCQkJCSAgIGhlYWRfcmVxLT50YWlsKTsKKwkJCQkgICBoZWFkX3JlcS0+cmVxdWVzdC0+dGFp bCk7CiAJCX0KIAogCQlzZXFfcHV0YyhtLCAnXG4nKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmlu ZGV4IDJiNmVjZmQuLjg3ODJhNGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjY2OSw3 ICsyNjY5LDcgQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVzZXRfcmluZ19jbGVhbnVwKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQlleGVjbGlzdF9saW5rKTsKIAkJbGlz dF9kZWwoJnN1Ym1pdF9yZXEtPmV4ZWNsaXN0X2xpbmspOwogCQlpbnRlbF9ydW50aW1lX3BtX3B1 dChkZXZfcHJpdik7Ci0JCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2Uoc3VibWl0X3JlcS0+ Y3R4KTsKKwkJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShzdWJtaXRfcmVxLT5yZXF1ZXN0 LT5jdHgpOwogCQlrZnJlZShzdWJtaXRfcmVxKTsKIAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmMKaW5kZXggZDllYWYyZC4uYTE4ZWExMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAg LTQxNyw3ICs0MTcsNyBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY29udGV4dF91bnF1ZXVlKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJCQkJIGV4ZWNsaXN0X2xpbmspIHsKIAkJaWYg KCFyZXEwKSB7CiAJCQlyZXEwID0gY3Vyc29yOwotCQl9IGVsc2UgaWYgKHJlcTAtPmN0eCA9PSBj dXJzb3ItPmN0eCkgeworCQl9IGVsc2UgaWYgKHJlcTAtPnJlcXVlc3QtPmN0eCA9PSBjdXJzb3It PnJlcXVlc3QtPmN0eCkgewogCQkJLyogU2FtZSBjdHg6IGlnbm9yZSBmaXJzdCByZXF1ZXN0LCBh cyBzZWNvbmQgcmVxdWVzdAogCQkJICogd2lsbCB1cGRhdGUgdGFpbCBwYXN0IGZpcnN0IHJlcXVl c3QncyB3b3JrbG9hZCAqLwogCQkJY3Vyc29yLT5lbHNwX3N1Ym1pdHRlZCA9IHJlcTAtPmVsc3Bf c3VibWl0dGVkOwpAQCAtNDMzLDkgKzQzMyw5IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19jb250 ZXh0X3VucXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAogCVdBUk5fT04ocmVx MSAmJiByZXExLT5lbHNwX3N1Ym1pdHRlZCk7CiAKLQlleGVjbGlzdHNfc3VibWl0X2NvbnRleHRz KHJpbmcsIHJlcTAtPmN0eCwgcmVxMC0+dGFpbCwKLQkJCQkgIHJlcTEgPyByZXExLT5jdHggOiBO VUxMLAotCQkJCSAgcmVxMSA/IHJlcTEtPnRhaWwgOiAwKTsKKwlleGVjbGlzdHNfc3VibWl0X2Nv bnRleHRzKHJpbmcsIHJlcTAtPnJlcXVlc3QtPmN0eCwgcmVxMC0+cmVxdWVzdC0+dGFpbCwKKwkJ CQkgIHJlcTEgPyByZXExLT5yZXF1ZXN0LT5jdHggOiBOVUxMLAorCQkJCSAgcmVxMSA/IHJlcTEt PnJlcXVlc3QtPnRhaWwgOiAwKTsKIAogCXJlcTAtPmVsc3Bfc3VibWl0dGVkKys7CiAJaWYgKHJl cTEpCkBAIC00NTUsNyArNDU1LDcgQEAgc3RhdGljIGJvb2wgZXhlY2xpc3RzX2NoZWNrX3JlbW92 ZV9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAKIAlpZiAoaGVhZF9yZXEg IT0gTlVMTCkgewogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaiA9Ci0JCQkJ aGVhZF9yZXEtPmN0eC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0ZTsKKwkJCQloZWFkX3JlcS0+cmVx dWVzdC0+Y3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlOwogCQlpZiAoaW50ZWxfZXhlY2xpc3Rz X2N0eF9pZChjdHhfb2JqKSA9PSByZXF1ZXN0X2lkKSB7CiAJCQlXQVJOKGhlYWRfcmVxLT5lbHNw X3N1Ym1pdHRlZCA9PSAwLAogCQkJICAgICAiTmV2ZXIgc3VibWl0dGVkIGhlYWQgcmVxdWVzdFxu Iik7CkBAIC01NTEsOSArNTUxLDYgQEAgc3RhdGljIGludCBleGVjbGlzdHNfY29udGV4dF9xdWV1 ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCWlmICh0byAhPSByaW5nLT5kZWZhdWx0 X2NvbnRleHQpCiAJCWludGVsX2xyX2NvbnRleHRfcGluKHJpbmcsIHRvKTsKIAotCXJlcS0+cmlu ZyA9IHJpbmc7Ci0JcmVxLT50YWlsID0gdGFpbDsKLQogCWlmICghcmVxdWVzdCkgewogCQkvKgog CQkgKiBJZiB0aGVyZSBpc24ndCBhIHJlcXVlc3QgYXNzb2NpYXRlZCB3aXRoIHRoaXMgc3VibWlz c2lvbiwKQEAgLTU2OCw2ICs1NjUsNyBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0c19jb250ZXh0X3F1 ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJfQogCXJlcS0+cmVxdWVzdCA9IHJl cXVlc3Q7CiAJaTkxNV9nZW1fcmVxdWVzdF9yZWZlcmVuY2UocmVxdWVzdCk7CisJaTkxNV9nZW1f Y29udGV4dF9yZWZlcmVuY2UocmVxLT5yZXF1ZXN0LT5jdHgpOwogCiAJaW50ZWxfcnVudGltZV9w bV9nZXQoZGV2X3ByaXYpOwogCkBAIC01ODQsNyArNTgyLDcgQEAgc3RhdGljIGludCBleGVjbGlz dHNfY29udGV4dF9xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJCQkgICBz dHJ1Y3QgaW50ZWxfY3R4X3N1Ym1pdF9yZXF1ZXN0LAogCQkJCQkgICBleGVjbGlzdF9saW5rKTsK IAotCQlpZiAodG8gPT0gdGFpbF9yZXEtPmN0eCkgeworCQlpZiAodG8gPT0gdGFpbF9yZXEtPnJl cXVlc3QtPmN0eCkgewogCQkJV0FSTih0YWlsX3JlcS0+ZWxzcF9zdWJtaXR0ZWQgIT0gMCwKIAkJ CQkiTW9yZSB0aGFuIDIgYWxyZWFkeS1zdWJtaXR0ZWQgcmVxcyBxdWV1ZWRcbiIpOwogCQkJbGlz dF9kZWwoJnRhaWxfcmVxLT5leGVjbGlzdF9saW5rKTsKQEAgLTc3NCwxNCArNzcyLDE0IEBAIHZv aWQgaW50ZWxfZXhlY2xpc3RzX3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nKQogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJnJpbmctPmV4ZWNsaXN0X2xvY2ssIGZs YWdzKTsKIAogCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShyZXEsIHRtcCwgJnJldGlyZWRfbGlz dCwgZXhlY2xpc3RfbGluaykgewotCQlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4ID0gcmVxLT5j dHg7CisJCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHggPSByZXEtPnJlcXVlc3QtPmN0eDsKIAkJ c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmogPQogCQkJCWN0eC0+ZW5naW5lW3Jp bmctPmlkXS5zdGF0ZTsKIAogCQlpZiAoY3R4X29iaiAmJiAoY3R4ICE9IHJpbmctPmRlZmF1bHRf Y29udGV4dCkpCiAJCQlpbnRlbF9scl9jb250ZXh0X3VucGluKHJpbmcsIGN0eCk7CiAJCWludGVs X3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKLQkJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5j ZShyZXEtPmN0eCk7CisJCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UoY3R4KTsKIAkJaTkx NV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZShyZXEtPnJlcXVlc3QpOwogCQlsaXN0X2RlbCgmcmVx LT5leGVjbGlzdF9saW5rKTsKIAkJa2ZyZWUocmVxKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgK aW5kZXggN2E4MmJjOS4uMzc2YzMwNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKQEAgLTEw NSwxMCArMTA1LDYgQEAgdTMyIGludGVsX2V4ZWNsaXN0c19jdHhfaWQoc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKmN0eF9vYmopOwogICogQWxsIGFjY2Vzc2VzIHRvIHRoZSBxdWV1ZSBhcmUg bWVkaWF0ZWQgYnkgYSBzcGlubG9jayAocmluZy0+ZXhlY2xpc3RfbG9jaykuCiAgKi8KIHN0cnVj dCBpbnRlbF9jdHhfc3VibWl0X3JlcXVlc3QgewotCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHg7 Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZzsKLQl1MzIgdGFpbDsKLQogCXN0cnVjdCBs aXN0X2hlYWQgZXhlY2xpc3RfbGluazsKIAogCWludCBlbHNwX3N1Ym1pdHRlZDsKLS0gCjIuMS4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=