From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas Daniel <thomas.daniel@intel.com>
Subject: [PATCH v4 1/4] drm/i915/bdw: Clean up execlist queue
	items in retire_work
Date: Fri,  7 Nov 2014 14:55:50 +0000
Message-ID: <1415372150-30455-1-git-send-email-thomas.daniel@intel.com>
References: <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 mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id EA07B6E8D0
 for <intel-gfx@lists.freedesktop.org>; Fri,  7 Nov 2014 06:56:28 -0800 (PST)
In-Reply-To: <1414576373-25121-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
Cgp2NDogR3JhYiBleGVjbGlzdCBsb2NrIHdoZW4gY2hlY2tpbmcgcXVldWUgc3RhdGUKCklzc3Vl
OiBWSVotNDI3NApTaWduZWQtb2ZmLWJ5OiBUaG9tYXMgRGFuaWVsIDx0aG9tYXMuZGFuaWVsQGlu
dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgfCAg
ICA5ICsrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgICA1
MiArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9scmMuaCAgICAgICAgfCAgICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y
aW5nYnVmZmVyLmggfCAgICAxICsKIDQgZmlsZXMgY2hhbmdlZCwgNDEgaW5zZXJ0aW9ucygrKSwg
MjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n
ZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggODI3ZWRiNS4uNDA4
YWZlNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yNzE4LDYgKzI3MTgsMTUgQEAgaTkx
NV9nZW1fcmV0aXJlX3JlcXVlc3RzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZm9yX2VhY2hf
cmluZyhyaW5nLCBkZXZfcHJpdiwgaSkgewogCQlpOTE1X2dlbV9yZXRpcmVfcmVxdWVzdHNfcmlu
ZyhyaW5nKTsKIAkJaWRsZSAmPSBsaXN0X2VtcHR5KCZyaW5nLT5yZXF1ZXN0X2xpc3QpOworCQlp
ZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7CisJCQl1bnNpZ25lZCBsb25nIGZsYWdzOworCisJ
CQlzcGluX2xvY2tfaXJxc2F2ZSgmcmluZy0+ZXhlY2xpc3RfbG9jaywgZmxhZ3MpOworCQkJaWRs
ZSAmPSBsaXN0X2VtcHR5KCZyaW5nLT5leGVjbGlzdF9xdWV1ZSk7CisJCQlzcGluX3VubG9ja19p
cnFyZXN0b3JlKCZyaW5nLT5leGVjbGlzdF9sb2NrLCBmbGFncyk7CisKKwkJCWludGVsX2V4ZWNs
aXN0c19yZXRpcmVfcmVxdWVzdHMocmluZyk7CisJCX0KIAl9CiAKIAlpZiAoaWRsZSkKZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggY2Q3NGU1Yy4uODdjZTQ0NSAxMDA2NDQKLS0tIGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfbHJjLmMKQEAgLTM4Niw3ICszODYsNiBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY29u
dGV4dF91bnF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiB7CiAJc3RydWN0IGlu
dGVsX2N0eF9zdWJtaXRfcmVxdWVzdCAqcmVxMCA9IE5VTEwsICpyZXExID0gTlVMTDsKIAlzdHJ1
Y3QgaW50ZWxfY3R4X3N1Ym1pdF9yZXF1ZXN0ICpjdXJzb3IgPSBOVUxMLCAqdG1wID0gTlVMTDsK
LQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2
YXRlOwogCiAJYXNzZXJ0X3NwaW5fbG9ja2VkKCZyaW5nLT5leGVjbGlzdF9sb2NrKTsKIApAQCAt
NDAzLDcgKzQwMiw4IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19jb250ZXh0X3VucXVldWUoc3Ry
dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAkJCSAqIHdpbGwgdXBkYXRlIHRhaWwgcGFzdCBm
aXJzdCByZXF1ZXN0J3Mgd29ya2xvYWQgKi8KIAkJCWN1cnNvci0+ZWxzcF9zdWJtaXR0ZWQgPSBy
ZXEwLT5lbHNwX3N1Ym1pdHRlZDsKIAkJCWxpc3RfZGVsKCZyZXEwLT5leGVjbGlzdF9saW5rKTsK
LQkJCXF1ZXVlX3dvcmsoZGV2X3ByaXYtPndxLCAmcmVxMC0+d29yayk7CisJCQlsaXN0X2FkZF90
YWlsKCZyZXEwLT5leGVjbGlzdF9saW5rLAorCQkJCSZyaW5nLT5leGVjbGlzdF9yZXRpcmVkX3Jl
cV9saXN0KTsKIAkJCXJlcTAgPSBjdXJzb3I7CiAJCX0gZWxzZSB7CiAJCQlyZXExID0gY3Vyc29y
OwpAQCAtNDI1LDcgKzQyNSw2IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19jb250ZXh0X3VucXVl
dWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIHN0YXRpYyBib29sIGV4ZWNsaXN0c19j
aGVja19yZW1vdmVfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJCQkg
ICB1MzIgcmVxdWVzdF9pZCkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg
PSByaW5nLT5kZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9jdHhfc3VibWl0X3JlcXVl
c3QgKmhlYWRfcmVxOwogCiAJYXNzZXJ0X3NwaW5fbG9ja2VkKCZyaW5nLT5leGVjbGlzdF9sb2Nr
KTsKQEAgLTQ0Myw3ICs0NDIsOCBAQCBzdGF0aWMgYm9vbCBleGVjbGlzdHNfY2hlY2tfcmVtb3Zl
X3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAogCQkJaWYgKC0taGVhZF9y
ZXEtPmVsc3Bfc3VibWl0dGVkIDw9IDApIHsKIAkJCQlsaXN0X2RlbCgmaGVhZF9yZXEtPmV4ZWNs
aXN0X2xpbmspOwotCQkJCXF1ZXVlX3dvcmsoZGV2X3ByaXYtPndxLCAmaGVhZF9yZXEtPndvcmsp
OworCQkJCWxpc3RfYWRkX3RhaWwoJmhlYWRfcmVxLT5leGVjbGlzdF9saW5rLAorCQkJCQkmcmlu
Zy0+ZXhlY2xpc3RfcmV0aXJlZF9yZXFfbGlzdCk7CiAJCQkJcmV0dXJuIHRydWU7CiAJCQl9CiAJ
CX0KQEAgLTUxMiwyMiArNTEyLDYgQEAgdm9pZCBpbnRlbF9leGVjbGlzdHNfaGFuZGxlX2N0eF9l
dmVudHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAkJICAgKCh1MzIpcmluZy0+bmV4
dF9jb250ZXh0X3N0YXR1c19idWZmZXIgJiAweDA3KSA8PCA4KTsKIH0KIAotc3RhdGljIHZvaWQg
ZXhlY2xpc3RzX2ZyZWVfcmVxdWVzdF90YXNrKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKLXsK
LQlzdHJ1Y3QgaW50ZWxfY3R4X3N1Ym1pdF9yZXF1ZXN0ICpyZXEgPQotCQljb250YWluZXJfb2Yo
d29yaywgc3RydWN0IGludGVsX2N0eF9zdWJtaXRfcmVxdWVzdCwgd29yayk7Ci0Jc3RydWN0IGRy
bV9kZXZpY2UgKmRldiA9IHJlcS0+cmluZy0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl
ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0KLQlpbnRlbF9ydW50aW1lX3BtX3B1dChk
ZXZfcHJpdik7Ci0KLQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JaTkxNV9nZW1f
Y29udGV4dF91bnJlZmVyZW5jZShyZXEtPmN0eCk7Ci0JbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVj
dF9tdXRleCk7Ci0KLQlrZnJlZShyZXEpOwotfQotCiBzdGF0aWMgaW50IGV4ZWNsaXN0c19jb250
ZXh0X3F1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCQkJICAgc3RydWN0IGlu
dGVsX2NvbnRleHQgKnRvLAogCQkJCSAgIHUzMiB0YWlsKQpAQCAtNTQ0LDcgKzUyOCw2IEBAIHN0
YXRpYyBpbnQgZXhlY2xpc3RzX2NvbnRleHRfcXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq
cmluZywKIAlpOTE1X2dlbV9jb250ZXh0X3JlZmVyZW5jZShyZXEtPmN0eCk7CiAJcmVxLT5yaW5n
ID0gcmluZzsKIAlyZXEtPnRhaWwgPSB0YWlsOwotCUlOSVRfV09SSygmcmVxLT53b3JrLCBleGVj
bGlzdHNfZnJlZV9yZXF1ZXN0X3Rhc2spOwogCiAJaW50ZWxfcnVudGltZV9wbV9nZXQoZGV2X3By
aXYpOwogCkBAIC01NjUsNyArNTQ4LDggQEAgc3RhdGljIGludCBleGVjbGlzdHNfY29udGV4dF9x
dWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJV0FSTih0YWlsX3JlcS0+ZWxz
cF9zdWJtaXR0ZWQgIT0gMCwKIAkJCSAgICAgIk1vcmUgdGhhbiAyIGFscmVhZHktc3VibWl0dGVk
IHJlcXMgcXVldWVkXG4iKTsKIAkJCWxpc3RfZGVsKCZ0YWlsX3JlcS0+ZXhlY2xpc3RfbGluayk7
Ci0JCQlxdWV1ZV93b3JrKGRldl9wcml2LT53cSwgJnRhaWxfcmVxLT53b3JrKTsKKwkJCWxpc3Rf
YWRkX3RhaWwoJnRhaWxfcmVxLT5leGVjbGlzdF9saW5rLAorCQkJCSZyaW5nLT5leGVjbGlzdF9y
ZXRpcmVkX3JlcV9saXN0KTsKIAkJfQogCX0KIApAQCAtNzMzLDYgKzcxNywyOSBAQCBpbnQgaW50
ZWxfZXhlY2xpc3RzX3N1Ym1pc3Npb24oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRy
bV9maWxlICpmaWxlLAogCXJldHVybiAwOwogfQogCit2b2lkIGludGVsX2V4ZWNsaXN0c19yZXRp
cmVfcmVxdWVzdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKK3sKKwlzdHJ1Y3QgaW50
ZWxfY3R4X3N1Ym1pdF9yZXF1ZXN0ICpyZXEsICp0bXA7CisJc3RydWN0IGRybV9pOTE1X3ByaXZh
dGUgKmRldl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKKwl1bnNpZ25lZCBsb25nIGZs
YWdzOworCXN0cnVjdCBsaXN0X2hlYWQgcmV0aXJlZF9saXN0OworCisJV0FSTl9PTighbXV0ZXhf
aXNfbG9ja2VkKCZyaW5nLT5kZXYtPnN0cnVjdF9tdXRleCkpOworCWlmIChsaXN0X2VtcHR5KCZy
aW5nLT5leGVjbGlzdF9yZXRpcmVkX3JlcV9saXN0KSkKKwkJcmV0dXJuOworCisJSU5JVF9MSVNU
X0hFQUQoJnJldGlyZWRfbGlzdCk7CisJc3Bpbl9sb2NrX2lycXNhdmUoJnJpbmctPmV4ZWNsaXN0
X2xvY2ssIGZsYWdzKTsKKwlsaXN0X3JlcGxhY2VfaW5pdCgmcmluZy0+ZXhlY2xpc3RfcmV0aXJl
ZF9yZXFfbGlzdCwgJnJldGlyZWRfbGlzdCk7CisJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmcmlu
Zy0+ZXhlY2xpc3RfbG9jaywgZmxhZ3MpOworCisJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKHJl
cSwgdG1wLCAmcmV0aXJlZF9saXN0LCBleGVjbGlzdF9saW5rKSB7CisJCWludGVsX3J1bnRpbWVf
cG1fcHV0KGRldl9wcml2KTsKKwkJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShyZXEtPmN0
eCk7CisJCWxpc3RfZGVsKCZyZXEtPmV4ZWNsaXN0X2xpbmspOworCX0KK30KKwogdm9pZCBpbnRl
bF9sb2dpY2FsX3Jpbmdfc3RvcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewogCXN0
cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7
CkBAIC0xMjQ4LDYgKzEyNTUsNyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ19pbml0KHN0cnVj
dCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbgogCWluaXRfd2Fp
dHF1ZXVlX2hlYWQoJnJpbmctPmlycV9xdWV1ZSk7CiAKIAlJTklUX0xJU1RfSEVBRCgmcmluZy0+
ZXhlY2xpc3RfcXVldWUpOworCUlOSVRfTElTVF9IRUFEKCZyaW5nLT5leGVjbGlzdF9yZXRpcmVk
X3JlcV9saXN0KTsKIAlzcGluX2xvY2tfaW5pdCgmcmluZy0+ZXhlY2xpc3RfbG9jayk7CiAJcmlu
Zy0+bmV4dF9jb250ZXh0X3N0YXR1c19idWZmZXIgPSAwOwogCmRpZmYgLS1naXQgYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy
Yy5oCmluZGV4IDMzYzNiNGIuLjg0YmJmMTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2xyYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCkBA
IC0xMDQsMTEgKzEwNCwxMSBAQCBzdHJ1Y3QgaW50ZWxfY3R4X3N1Ym1pdF9yZXF1ZXN0IHsKIAl1
MzIgdGFpbDsKIAogCXN0cnVjdCBsaXN0X2hlYWQgZXhlY2xpc3RfbGluazsKLQlzdHJ1Y3Qgd29y
a19zdHJ1Y3Qgd29yazsKIAogCWludCBlbHNwX3N1Ym1pdHRlZDsKIH07CiAKIHZvaWQgaW50ZWxf
ZXhlY2xpc3RzX2hhbmRsZV9jdHhfZXZlbnRzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcp
Owordm9pZCBpbnRlbF9leGVjbGlzdHNfcmV0aXJlX3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdp
bmVfY3MgKnJpbmcpOwogCiAjZW5kaWYgLyogX0lOVEVMX0xSQ19IXyAqLwpkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IDk2NDc5YzguLjhjMDAyZDIgMTAwNjQ0Ci0t
LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTIzNSw2ICsyMzUsNyBAQCBzdHJ1
Y3QgIGludGVsX2VuZ2luZV9jcyB7CiAJLyogRXhlY2xpc3RzICovCiAJc3BpbmxvY2tfdCBleGVj
bGlzdF9sb2NrOwogCXN0cnVjdCBsaXN0X2hlYWQgZXhlY2xpc3RfcXVldWU7CisJc3RydWN0IGxp
c3RfaGVhZCBleGVjbGlzdF9yZXRpcmVkX3JlcV9saXN0OwogCXU4IG5leHRfY29udGV4dF9zdGF0
dXNfYnVmZmVyOwogCXUzMiAgICAgICAgICAgICBpcnFfa2VlcF9tYXNrOyAvKiBiaXRtYXNrIGZv
ciBpbnRlcnJ1cHRzIHRoYXQgc2hvdWxkIG5vdCBiZSBtYXNrZWQgKi8KIAlpbnQJCSgqZW1pdF9y
ZXF1ZXN0KShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1Zik7Ci0tIAoxLjcuOS41Cgpf
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg
bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz
LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=