From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas Daniel <thomas.daniel@intel.com>
Subject: [PATCH 1/4] drm/i915/bdw: Clean up execlist queue items
	in retire_work
Date: Wed, 29 Oct 2014 09:52:50 +0000
Message-ID: <1414576373-25121-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 mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id 5C7B46E4EB
 for <intel-gfx@lists.freedesktop.org>; Wed, 29 Oct 2014 02:52:59 -0700 (PDT)
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
Cc: shuang.he@linux.intel.com
List-Id: intel-gfx@lists.freedesktop.org

Tm8gbG9uZ2VyIGNyZWF0ZSBhIHdvcmsgaXRlbSB0byBjbGVhbiBlYWNoIGV4ZWNsaXN0IHF1ZXVl
IGl0ZW0uCkluc3RlYWQsIG1vdmUgcmV0aXJlZCBleGVjbGlzdCByZXF1ZXN0cyB0byBhIHF1ZXVl
IGFuZCBjbGVhbiB1cCB0aGUKaXRlbXMgZHVyaW5nIHJldGlyZV9yZXF1ZXN0cy4KCnYyOiBGaXgg
bGVnYWN5IHJpbmcgcGF0aCBicm9rZW4gZHVyaW5nIG92ZXJ6ZWFsb3VzIGNsZWFudXAKCnYzOiBV
cGRhdGUgaWRsZSBkZXRlY3Rpb24gdG8gdGFrZSBleGVjbGlzdHMgcXVldWUgaW50byBhY2NvdW50
CgpJc3N1ZTogVklaLTQyNzQKU2lnbmVkLW9mZi1ieTogVGhvbWFzIERhbmllbCA8dGhvbWFzLmRh
bmllbEBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAg
ICAgIHwgICAgNCArKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8
ICAgNTIgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfbHJjLmggICAgICAgIHwgICAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfcmluZ2J1ZmZlci5oIHwgICAgMSArCiA0IGZpbGVzIGNoYW5nZWQsIDM2IGluc2VydGlvbnMo
KyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDgyN2VkYjUu
LmRmMjgyMDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjcxOCw2ICsyNzE4LDEwIEBA
IGk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWZvcl9l
YWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKIAkJaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3Rz
X3JpbmcocmluZyk7CiAJCWlkbGUgJj0gbGlzdF9lbXB0eSgmcmluZy0+cmVxdWVzdF9saXN0KTsK
KwkJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgeworCQkJaWRsZSAmPSBsaXN0X2VtcHR5KCZy
aW5nLT5leGVjbGlzdF9xdWV1ZSk7CisJCQlpbnRlbF9leGVjbGlzdHNfcmV0aXJlX3JlcXVlc3Rz
KHJpbmcpOworCQl9CiAJfQogCiAJaWYgKGlkbGUpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmlu
ZGV4IGNkNzRlNWMuLjg3Y2U0NDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0zODYs
NyArMzg2LDYgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2NvbnRleHRfdW5xdWV1ZShzdHJ1Y3Qg
aW50ZWxfZW5naW5lX2NzICpyaW5nKQogewogCXN0cnVjdCBpbnRlbF9jdHhfc3VibWl0X3JlcXVl
c3QgKnJlcTAgPSBOVUxMLCAqcmVxMSA9IE5VTEw7CiAJc3RydWN0IGludGVsX2N0eF9zdWJtaXRf
cmVxdWVzdCAqY3Vyc29yID0gTlVMTCwgKnRtcCA9IE5VTEw7Ci0Jc3RydWN0IGRybV9pOTE1X3By
aXZhdGUgKmRldl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAogCWFzc2VydF9zcGlu
X2xvY2tlZCgmcmluZy0+ZXhlY2xpc3RfbG9jayk7CiAKQEAgLTQwMyw3ICs0MDIsOCBAQCBzdGF0
aWMgdm9pZCBleGVjbGlzdHNfY29udGV4dF91bnF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg
KnJpbmcpCiAJCQkgKiB3aWxsIHVwZGF0ZSB0YWlsIHBhc3QgZmlyc3QgcmVxdWVzdCdzIHdvcmts
b2FkICovCiAJCQljdXJzb3ItPmVsc3Bfc3VibWl0dGVkID0gcmVxMC0+ZWxzcF9zdWJtaXR0ZWQ7
CiAJCQlsaXN0X2RlbCgmcmVxMC0+ZXhlY2xpc3RfbGluayk7Ci0JCQlxdWV1ZV93b3JrKGRldl9w
cml2LT53cSwgJnJlcTAtPndvcmspOworCQkJbGlzdF9hZGRfdGFpbCgmcmVxMC0+ZXhlY2xpc3Rf
bGluaywKKwkJCQkmcmluZy0+ZXhlY2xpc3RfcmV0aXJlZF9yZXFfbGlzdCk7CiAJCQlyZXEwID0g
Y3Vyc29yOwogCQl9IGVsc2UgewogCQkJcmVxMSA9IGN1cnNvcjsKQEAgLTQyNSw3ICs0MjUsNiBA
QCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY29udGV4dF91bnF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdp
bmVfY3MgKnJpbmcpCiBzdGF0aWMgYm9vbCBleGVjbGlzdHNfY2hlY2tfcmVtb3ZlX3JlcXVlc3Qo
c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJCQkJICAgdTMyIHJlcXVlc3RfaWQpCiB7
Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJp
dmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3R4X3N1Ym1pdF9yZXF1ZXN0ICpoZWFkX3JlcTsKIAogCWFz
c2VydF9zcGluX2xvY2tlZCgmcmluZy0+ZXhlY2xpc3RfbG9jayk7CkBAIC00NDMsNyArNDQyLDgg
QEAgc3RhdGljIGJvb2wgZXhlY2xpc3RzX2NoZWNrX3JlbW92ZV9yZXF1ZXN0KHN0cnVjdCBpbnRl
bF9lbmdpbmVfY3MgKnJpbmcsCiAKIAkJCWlmICgtLWhlYWRfcmVxLT5lbHNwX3N1Ym1pdHRlZCA8
PSAwKSB7CiAJCQkJbGlzdF9kZWwoJmhlYWRfcmVxLT5leGVjbGlzdF9saW5rKTsKLQkJCQlxdWV1
ZV93b3JrKGRldl9wcml2LT53cSwgJmhlYWRfcmVxLT53b3JrKTsKKwkJCQlsaXN0X2FkZF90YWls
KCZoZWFkX3JlcS0+ZXhlY2xpc3RfbGluaywKKwkJCQkJJnJpbmctPmV4ZWNsaXN0X3JldGlyZWRf
cmVxX2xpc3QpOwogCQkJCXJldHVybiB0cnVlOwogCQkJfQogCQl9CkBAIC01MTIsMjIgKzUxMiw2
IEBAIHZvaWQgaW50ZWxfZXhlY2xpc3RzX2hhbmRsZV9jdHhfZXZlbnRzKHN0cnVjdCBpbnRlbF9l
bmdpbmVfY3MgKnJpbmcpCiAJCSAgICgodTMyKXJpbmctPm5leHRfY29udGV4dF9zdGF0dXNfYnVm
ZmVyICYgMHgwNykgPDwgOCk7CiB9CiAKLXN0YXRpYyB2b2lkIGV4ZWNsaXN0c19mcmVlX3JlcXVl
c3RfdGFzayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCi17Ci0Jc3RydWN0IGludGVsX2N0eF9z
dWJtaXRfcmVxdWVzdCAqcmVxID0KLQkJY29udGFpbmVyX29mKHdvcmssIHN0cnVjdCBpbnRlbF9j
dHhfc3VibWl0X3JlcXVlc3QsIHdvcmspOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByZXEt
PnJpbmctPmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRl
dl9wcml2YXRlOwotCi0JaW50ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYpOwotCi0JbXV0ZXhf
bG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2Uo
cmVxLT5jdHgpOwotCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCi0Ja2ZyZWUo
cmVxKTsKLX0KLQogc3RhdGljIGludCBleGVjbGlzdHNfY29udGV4dF9xdWV1ZShzdHJ1Y3QgaW50
ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJCSAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICp0bywKIAkJ
CQkgICB1MzIgdGFpbCkKQEAgLTU0NCw3ICs1MjgsNiBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0c19j
b250ZXh0X3F1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJaTkxNV9nZW1fY29u
dGV4dF9yZWZlcmVuY2UocmVxLT5jdHgpOwogCXJlcS0+cmluZyA9IHJpbmc7CiAJcmVxLT50YWls
ID0gdGFpbDsKLQlJTklUX1dPUksoJnJlcS0+d29yaywgZXhlY2xpc3RzX2ZyZWVfcmVxdWVzdF90
YXNrKTsKIAogCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2KTsKIApAQCAtNTY1LDcgKzU0
OCw4IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX2NvbnRleHRfcXVldWUoc3RydWN0IGludGVsX2Vu
Z2luZV9jcyAqcmluZywKIAkJCVdBUk4odGFpbF9yZXEtPmVsc3Bfc3VibWl0dGVkICE9IDAsCiAJ
CQkgICAgICJNb3JlIHRoYW4gMiBhbHJlYWR5LXN1Ym1pdHRlZCByZXFzIHF1ZXVlZFxuIik7CiAJ
CQlsaXN0X2RlbCgmdGFpbF9yZXEtPmV4ZWNsaXN0X2xpbmspOwotCQkJcXVldWVfd29yayhkZXZf
cHJpdi0+d3EsICZ0YWlsX3JlcS0+d29yayk7CisJCQlsaXN0X2FkZF90YWlsKCZ0YWlsX3JlcS0+
ZXhlY2xpc3RfbGluaywKKwkJCQkmcmluZy0+ZXhlY2xpc3RfcmV0aXJlZF9yZXFfbGlzdCk7CiAJ
CX0KIAl9CiAKQEAgLTczMyw2ICs3MTcsMjkgQEAgaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNz
aW9uKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKIAlyZXR1
cm4gMDsKIH0KIAordm9pZCBpbnRlbF9leGVjbGlzdHNfcmV0aXJlX3JlcXVlc3RzKHN0cnVjdCBp
bnRlbF9lbmdpbmVfY3MgKnJpbmcpCit7CisJc3RydWN0IGludGVsX2N0eF9zdWJtaXRfcmVxdWVz
dCAqcmVxLCAqdG1wOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJpbmct
PmRldi0+ZGV2X3ByaXZhdGU7CisJdW5zaWduZWQgbG9uZyBmbGFnczsKKwlzdHJ1Y3QgbGlzdF9o
ZWFkIHJldGlyZWRfbGlzdDsKKworCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmcmluZy0+ZGV2
LT5zdHJ1Y3RfbXV0ZXgpKTsKKwlpZiAobGlzdF9lbXB0eSgmcmluZy0+ZXhlY2xpc3RfcmV0aXJl
ZF9yZXFfbGlzdCkpCisJCXJldHVybjsKKworCUlOSVRfTElTVF9IRUFEKCZyZXRpcmVkX2xpc3Qp
OworCXNwaW5fbG9ja19pcnFzYXZlKCZyaW5nLT5leGVjbGlzdF9sb2NrLCBmbGFncyk7CisJbGlz
dF9yZXBsYWNlX2luaXQoJnJpbmctPmV4ZWNsaXN0X3JldGlyZWRfcmVxX2xpc3QsICZyZXRpcmVk
X2xpc3QpOworCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJnJpbmctPmV4ZWNsaXN0X2xvY2ssIGZs
YWdzKTsKKworCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShyZXEsIHRtcCwgJnJldGlyZWRfbGlz
dCwgZXhlY2xpc3RfbGluaykgeworCQlpbnRlbF9ydW50aW1lX3BtX3B1dChkZXZfcHJpdik7CisJ
CWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UocmVxLT5jdHgpOworCQlsaXN0X2RlbCgmcmVx
LT5leGVjbGlzdF9saW5rKTsKKwl9Cit9CisKIHZvaWQgaW50ZWxfbG9naWNhbF9yaW5nX3N0b3Ao
c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0
ZSAqZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOwpAQCAtMTI0OCw2ICsxMjU1LDcg
QEAgc3RhdGljIGludCBsb2dpY2FsX3JpbmdfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBz
dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW4KIAlpbml0X3dhaXRxdWV1ZV9oZWFkKCZyaW5nLT5p
cnFfcXVldWUpOwogCiAJSU5JVF9MSVNUX0hFQUQoJnJpbmctPmV4ZWNsaXN0X3F1ZXVlKTsKKwlJ
TklUX0xJU1RfSEVBRCgmcmluZy0+ZXhlY2xpc3RfcmV0aXJlZF9yZXFfbGlzdCk7CiAJc3Bpbl9s
b2NrX2luaXQoJnJpbmctPmV4ZWNsaXN0X2xvY2spOwogCXJpbmctPm5leHRfY29udGV4dF9zdGF0
dXNfYnVmZmVyID0gMDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
bHJjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAppbmRleCAzM2MzYjRiLi44
NGJiZjE5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAorKysg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaApAQCAtMTA0LDExICsxMDQsMTEgQEAg
c3RydWN0IGludGVsX2N0eF9zdWJtaXRfcmVxdWVzdCB7CiAJdTMyIHRhaWw7CiAKIAlzdHJ1Y3Qg
bGlzdF9oZWFkIGV4ZWNsaXN0X2xpbms7Ci0Jc3RydWN0IHdvcmtfc3RydWN0IHdvcms7CiAKIAlp
bnQgZWxzcF9zdWJtaXR0ZWQ7CiB9OwogCiB2b2lkIGludGVsX2V4ZWNsaXN0c19oYW5kbGVfY3R4
X2V2ZW50cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKK3ZvaWQgaW50ZWxfZXhlY2xp
c3RzX3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIAogI2Vu
ZGlmIC8qIF9JTlRFTF9MUkNfSF8gKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm
ZXIuaAppbmRleCA5NjQ3OWM4Li44YzAwMmQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
cmluZ2J1ZmZlci5oCkBAIC0yMzUsNiArMjM1LDcgQEAgc3RydWN0ICBpbnRlbF9lbmdpbmVfY3Mg
ewogCS8qIEV4ZWNsaXN0cyAqLwogCXNwaW5sb2NrX3QgZXhlY2xpc3RfbG9jazsKIAlzdHJ1Y3Qg
bGlzdF9oZWFkIGV4ZWNsaXN0X3F1ZXVlOworCXN0cnVjdCBsaXN0X2hlYWQgZXhlY2xpc3RfcmV0
aXJlZF9yZXFfbGlzdDsKIAl1OCBuZXh0X2NvbnRleHRfc3RhdHVzX2J1ZmZlcjsKIAl1MzIgICAg
ICAgICAgICAgaXJxX2tlZXBfbWFzazsgLyogYml0bWFzayBmb3IgaW50ZXJydXB0cyB0aGF0IHNo
b3VsZCBub3QgYmUgbWFza2VkICovCiAJaW50CQkoKmVtaXRfcmVxdWVzdCkoc3RydWN0IGludGVs
X3JpbmdidWZmZXIgKnJpbmdidWYpOwotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n
ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp
bG1hbi9saXN0aW5mby9pbnRlbC1nZngK