From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas Daniel <thomas.daniel@intel.com>
Subject: [PATCH v5 1/4] drm/i915/bdw: Clean up execlist queue
	items in retire_work
Date: Thu, 13 Nov 2014 10:27:05 +0000
Message-ID: <1415874425-314-1-git-send-email-thomas.daniel@intel.com>
References: <1415372150-30455-1-git-send-email-thomas.daniel@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
 by gabe.freedesktop.org (Postfix) with ESMTP id 2B38B6E4BA
 for <intel-gfx@lists.freedesktop.org>; Thu, 13 Nov 2014 02:27:07 -0800 (PST)
In-Reply-To: <1415372150-30455-1-git-send-email-thomas.daniel@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

Tm8gbG9uZ2VyIGNyZWF0ZSBhIHdvcmsgaXRlbSB0byBjbGVhbiBlYWNoIGV4ZWNsaXN0IHF1ZXVl
IGl0ZW0uCkluc3RlYWQsIG1vdmUgcmV0aXJlZCBleGVjbGlzdCByZXF1ZXN0cyB0byBhIHF1ZXVl
IGFuZCBjbGVhbiB1cCB0aGUKaXRlbXMgZHVyaW5nIHJldGlyZV9yZXF1ZXN0cy4KCnYyOiBGaXgg
bGVnYWN5IHJpbmcgcGF0aCBicm9rZW4gZHVyaW5nIG92ZXJ6ZWFsb3VzIGNsZWFudXAKCnYzOiBV
cGRhdGUgaWRsZSBkZXRlY3Rpb24gdG8gdGFrZSBleGVjbGlzdHMgcXVldWUgaW50byBhY2NvdW50
Cgp2NDogR3JhYiBleGVjbGlzdCBsb2NrIHdoZW4gY2hlY2tpbmcgcXVldWUgc3RhdGUKCnY1OiBG
aXggbGVha2luZyByZXF1ZXN0cyBieSBmcmVlaW5nIGluIGV4ZWNsaXN0c19yZXRpcmVfcmVxdWVz
dHMuCgpJc3N1ZTogVklaLTQyNzQKU2lnbmVkLW9mZi1ieTogVGhvbWFzIERhbmllbCA8dGhvbWFz
LmRhbmllbEBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAg
ICAgICAgIHwgICAgOSArKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAg
ICAgICB8ICAgNTMgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfbHJjLmggICAgICAgIHwgICAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgICAgMSArCiA0IGZpbGVzIGNoYW5nZWQsIDQyIGluc2Vy
dGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDgy
N2VkYjUuLjQwOGFmZTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt
LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjcxOCw2ICsyNzE4
LDE1IEBAIGk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog
CWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKIAkJaTkxNV9nZW1fcmV0aXJlX3Jl
cXVlc3RzX3JpbmcocmluZyk7CiAJCWlkbGUgJj0gbGlzdF9lbXB0eSgmcmluZy0+cmVxdWVzdF9s
aXN0KTsKKwkJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgeworCQkJdW5zaWduZWQgbG9uZyBm
bGFnczsKKworCQkJc3Bpbl9sb2NrX2lycXNhdmUoJnJpbmctPmV4ZWNsaXN0X2xvY2ssIGZsYWdz
KTsKKwkJCWlkbGUgJj0gbGlzdF9lbXB0eSgmcmluZy0+ZXhlY2xpc3RfcXVldWUpOworCQkJc3Bp
bl91bmxvY2tfaXJxcmVzdG9yZSgmcmluZy0+ZXhlY2xpc3RfbG9jaywgZmxhZ3MpOworCisJCQlp
bnRlbF9leGVjbGlzdHNfcmV0aXJlX3JlcXVlc3RzKHJpbmcpOworCQl9CiAJfQogCiAJaWYgKGlk
bGUpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IGNkNzRlNWMuLmQ5MjAyOTcgMTAwNjQ0
Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0zODYsNyArMzg2LDYgQEAgc3RhdGljIHZvaWQgZXhl
Y2xpc3RzX2NvbnRleHRfdW5xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewog
CXN0cnVjdCBpbnRlbF9jdHhfc3VibWl0X3JlcXVlc3QgKnJlcTAgPSBOVUxMLCAqcmVxMSA9IE5V
TEw7CiAJc3RydWN0IGludGVsX2N0eF9zdWJtaXRfcmVxdWVzdCAqY3Vyc29yID0gTlVMTCwgKnRt
cCA9IE5VTEw7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcmluZy0+ZGV2
LT5kZXZfcHJpdmF0ZTsKIAogCWFzc2VydF9zcGluX2xvY2tlZCgmcmluZy0+ZXhlY2xpc3RfbG9j
ayk7CiAKQEAgLTQwMyw3ICs0MDIsOCBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY29udGV4dF91
bnF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJCQkgKiB3aWxsIHVwZGF0ZSB0
YWlsIHBhc3QgZmlyc3QgcmVxdWVzdCdzIHdvcmtsb2FkICovCiAJCQljdXJzb3ItPmVsc3Bfc3Vi
bWl0dGVkID0gcmVxMC0+ZWxzcF9zdWJtaXR0ZWQ7CiAJCQlsaXN0X2RlbCgmcmVxMC0+ZXhlY2xp
c3RfbGluayk7Ci0JCQlxdWV1ZV93b3JrKGRldl9wcml2LT53cSwgJnJlcTAtPndvcmspOworCQkJ
bGlzdF9hZGRfdGFpbCgmcmVxMC0+ZXhlY2xpc3RfbGluaywKKwkJCQkmcmluZy0+ZXhlY2xpc3Rf
cmV0aXJlZF9yZXFfbGlzdCk7CiAJCQlyZXEwID0gY3Vyc29yOwogCQl9IGVsc2UgewogCQkJcmVx
MSA9IGN1cnNvcjsKQEAgLTQyNSw3ICs0MjUsNiBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY29u
dGV4dF91bnF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiBzdGF0aWMgYm9vbCBl
eGVjbGlzdHNfY2hlY2tfcmVtb3ZlX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu
ZywKIAkJCQkJICAgdTMyIHJlcXVlc3RfaWQpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3R4X3N1
Ym1pdF9yZXF1ZXN0ICpoZWFkX3JlcTsKIAogCWFzc2VydF9zcGluX2xvY2tlZCgmcmluZy0+ZXhl
Y2xpc3RfbG9jayk7CkBAIC00NDMsNyArNDQyLDggQEAgc3RhdGljIGJvb2wgZXhlY2xpc3RzX2No
ZWNrX3JlbW92ZV9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAKIAkJCWlm
ICgtLWhlYWRfcmVxLT5lbHNwX3N1Ym1pdHRlZCA8PSAwKSB7CiAJCQkJbGlzdF9kZWwoJmhlYWRf
cmVxLT5leGVjbGlzdF9saW5rKTsKLQkJCQlxdWV1ZV93b3JrKGRldl9wcml2LT53cSwgJmhlYWRf
cmVxLT53b3JrKTsKKwkJCQlsaXN0X2FkZF90YWlsKCZoZWFkX3JlcS0+ZXhlY2xpc3RfbGluaywK
KwkJCQkJJnJpbmctPmV4ZWNsaXN0X3JldGlyZWRfcmVxX2xpc3QpOwogCQkJCXJldHVybiB0cnVl
OwogCQkJfQogCQl9CkBAIC01MTIsMjIgKzUxMiw2IEBAIHZvaWQgaW50ZWxfZXhlY2xpc3RzX2hh
bmRsZV9jdHhfZXZlbnRzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJCSAgICgodTMy
KXJpbmctPm5leHRfY29udGV4dF9zdGF0dXNfYnVmZmVyICYgMHgwNykgPDwgOCk7CiB9CiAKLXN0
YXRpYyB2b2lkIGV4ZWNsaXN0c19mcmVlX3JlcXVlc3RfdGFzayhzdHJ1Y3Qgd29ya19zdHJ1Y3Qg
KndvcmspCi17Ci0Jc3RydWN0IGludGVsX2N0eF9zdWJtaXRfcmVxdWVzdCAqcmVxID0KLQkJY29u
dGFpbmVyX29mKHdvcmssIHN0cnVjdCBpbnRlbF9jdHhfc3VibWl0X3JlcXVlc3QsIHdvcmspOwot
CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByZXEtPnJpbmctPmRldjsKLQlzdHJ1Y3QgZHJtX2k5
MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCi0JaW50ZWxfcnVudGlt
ZV9wbV9wdXQoZGV2X3ByaXYpOwotCi0JbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwot
CWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UocmVxLT5jdHgpOwotCW11dGV4X3VubG9jaygm
ZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCi0Ja2ZyZWUocmVxKTsKLX0KLQogc3RhdGljIGludCBleGVj
bGlzdHNfY29udGV4dF9xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJCSAg
IHN0cnVjdCBpbnRlbF9jb250ZXh0ICp0bywKIAkJCQkgICB1MzIgdGFpbCkKQEAgLTU0NCw3ICs1
MjgsNiBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0c19jb250ZXh0X3F1ZXVlKHN0cnVjdCBpbnRlbF9l
bmdpbmVfY3MgKnJpbmcsCiAJaTkxNV9nZW1fY29udGV4dF9yZWZlcmVuY2UocmVxLT5jdHgpOwog
CXJlcS0+cmluZyA9IHJpbmc7CiAJcmVxLT50YWlsID0gdGFpbDsKLQlJTklUX1dPUksoJnJlcS0+
d29yaywgZXhlY2xpc3RzX2ZyZWVfcmVxdWVzdF90YXNrKTsKIAogCWludGVsX3J1bnRpbWVfcG1f
Z2V0KGRldl9wcml2KTsKIApAQCAtNTY1LDcgKzU0OCw4IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3Rz
X2NvbnRleHRfcXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJCVdBUk4odGFp
bF9yZXEtPmVsc3Bfc3VibWl0dGVkICE9IDAsCiAJCQkgICAgICJNb3JlIHRoYW4gMiBhbHJlYWR5
LXN1Ym1pdHRlZCByZXFzIHF1ZXVlZFxuIik7CiAJCQlsaXN0X2RlbCgmdGFpbF9yZXEtPmV4ZWNs
aXN0X2xpbmspOwotCQkJcXVldWVfd29yayhkZXZfcHJpdi0+d3EsICZ0YWlsX3JlcS0+d29yayk7
CisJCQlsaXN0X2FkZF90YWlsKCZ0YWlsX3JlcS0+ZXhlY2xpc3RfbGluaywKKwkJCQkmcmluZy0+
ZXhlY2xpc3RfcmV0aXJlZF9yZXFfbGlzdCk7CiAJCX0KIAl9CiAKQEAgLTczMyw2ICs3MTcsMzAg
QEAgaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs
IHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKIAlyZXR1cm4gMDsKIH0KIAordm9pZCBpbnRlbF9leGVj
bGlzdHNfcmV0aXJlX3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCit7CisJ
c3RydWN0IGludGVsX2N0eF9zdWJtaXRfcmVxdWVzdCAqcmVxLCAqdG1wOworCXN0cnVjdCBkcm1f
aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7CisJdW5zaWdu
ZWQgbG9uZyBmbGFnczsKKwlzdHJ1Y3QgbGlzdF9oZWFkIHJldGlyZWRfbGlzdDsKKworCVdBUk5f
T04oIW11dGV4X2lzX2xvY2tlZCgmcmluZy0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKKwlpZiAobGlz
dF9lbXB0eSgmcmluZy0+ZXhlY2xpc3RfcmV0aXJlZF9yZXFfbGlzdCkpCisJCXJldHVybjsKKwor
CUlOSVRfTElTVF9IRUFEKCZyZXRpcmVkX2xpc3QpOworCXNwaW5fbG9ja19pcnFzYXZlKCZyaW5n
LT5leGVjbGlzdF9sb2NrLCBmbGFncyk7CisJbGlzdF9yZXBsYWNlX2luaXQoJnJpbmctPmV4ZWNs
aXN0X3JldGlyZWRfcmVxX2xpc3QsICZyZXRpcmVkX2xpc3QpOworCXNwaW5fdW5sb2NrX2lycXJl
c3RvcmUoJnJpbmctPmV4ZWNsaXN0X2xvY2ssIGZsYWdzKTsKKworCWxpc3RfZm9yX2VhY2hfZW50
cnlfc2FmZShyZXEsIHRtcCwgJnJldGlyZWRfbGlzdCwgZXhlY2xpc3RfbGluaykgeworCQlpbnRl
bF9ydW50aW1lX3BtX3B1dChkZXZfcHJpdik7CisJCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVu
Y2UocmVxLT5jdHgpOworCQlsaXN0X2RlbCgmcmVxLT5leGVjbGlzdF9saW5rKTsKKwkJa2ZyZWUo
cmVxKTsKKwl9Cit9CisKIHZvaWQgaW50ZWxfbG9naWNhbF9yaW5nX3N0b3Aoc3RydWN0IGludGVs
X2VuZ2luZV9jcyAqcmluZykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg
PSByaW5nLT5kZXYtPmRldl9wcml2YXRlOwpAQCAtMTI0OCw2ICsxMjU2LDcgQEAgc3RhdGljIGlu
dCBsb2dpY2FsX3JpbmdfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxf
ZW5naW5lX2NzICpyaW4KIAlpbml0X3dhaXRxdWV1ZV9oZWFkKCZyaW5nLT5pcnFfcXVldWUpOwog
CiAJSU5JVF9MSVNUX0hFQUQoJnJpbmctPmV4ZWNsaXN0X3F1ZXVlKTsKKwlJTklUX0xJU1RfSEVB
RCgmcmluZy0+ZXhlY2xpc3RfcmV0aXJlZF9yZXFfbGlzdCk7CiAJc3Bpbl9sb2NrX2luaXQoJnJp
bmctPmV4ZWNsaXN0X2xvY2spOwogCXJpbmctPm5leHRfY29udGV4dF9zdGF0dXNfYnVmZmVyID0g
MDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmggYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAppbmRleCAzM2MzYjRiLi44NGJiZjE5IDEwMDY0
NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAorKysgYi9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9scmMuaApAQCAtMTA0LDExICsxMDQsMTEgQEAgc3RydWN0IGludGVs
X2N0eF9zdWJtaXRfcmVxdWVzdCB7CiAJdTMyIHRhaWw7CiAKIAlzdHJ1Y3QgbGlzdF9oZWFkIGV4
ZWNsaXN0X2xpbms7Ci0Jc3RydWN0IHdvcmtfc3RydWN0IHdvcms7CiAKIAlpbnQgZWxzcF9zdWJt
aXR0ZWQ7CiB9OwogCiB2b2lkIGludGVsX2V4ZWNsaXN0c19oYW5kbGVfY3R4X2V2ZW50cyhzdHJ1
Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKK3ZvaWQgaW50ZWxfZXhlY2xpc3RzX3JldGlyZV9y
ZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIAogI2VuZGlmIC8qIF9JTlRF
TF9MUkNfSF8gKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi
dWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCA5
NjQ3OWM4Li44YzAwMmQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y
aW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o
CkBAIC0yMzUsNiArMjM1LDcgQEAgc3RydWN0ICBpbnRlbF9lbmdpbmVfY3MgewogCS8qIEV4ZWNs
aXN0cyAqLwogCXNwaW5sb2NrX3QgZXhlY2xpc3RfbG9jazsKIAlzdHJ1Y3QgbGlzdF9oZWFkIGV4
ZWNsaXN0X3F1ZXVlOworCXN0cnVjdCBsaXN0X2hlYWQgZXhlY2xpc3RfcmV0aXJlZF9yZXFfbGlz
dDsKIAl1OCBuZXh0X2NvbnRleHRfc3RhdHVzX2J1ZmZlcjsKIAl1MzIgICAgICAgICAgICAgaXJx
X2tlZXBfbWFzazsgLyogYml0bWFzayBmb3IgaW50ZXJydXB0cyB0aGF0IHNob3VsZCBub3QgYmUg
bWFza2VkICovCiAJaW50CQkoKmVtaXRfcmVxdWVzdCkoc3RydWN0IGludGVsX3JpbmdidWZmZXIg
KnJpbmdidWYpOwotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl
ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m
by9pbnRlbC1nZngK