From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 27/70] drm/i915: Remove vestigal DRI1 ring
	quiescing code
Date: Tue,  7 Apr 2015 16:20:51 +0100
Message-ID: <1428420094-18352-28-git-send-email-chris@chris-wilson.co.uk>
References: <1428420094-18352-1-git-send-email-chris@chris-wilson.co.uk>
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 relay.fireflyinternet.com (hostedrelay.fireflyinternet.com
 [109.228.30.76])
 by gabe.freedesktop.org (Postfix) with ESMTP id C6E6A6E5D7
 for <intel-gfx@lists.freedesktop.org>; Tue,  7 Apr 2015 08:22:16 -0700 (PDT)
In-Reply-To: <1428420094-18352-1-git-send-email-chris@chris-wilson.co.uk>
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

QWZ0ZXIgdGhlIHJlbW92YWwgb2YgRFJJMSwgYWxsIGFjY2VzcyB0byB0aGUgcmluZ3MgYXJlIHRo
cm91Z2ggcmVxdWVzdHMKYW5kIHNvIHdlIGNhbiBhbHdheXMgYmUgc3VyZSB0aGF0IHRoZXJlIGlz
IGEgcmVxdWVzdCB0byB3YWl0IHVwb24gdG8KZnJlZSB1cCBhdmFpbGFibGUgc3BhY2UuIFRoZSBm
YWxsYmFjayBjb2RlIG9ubHkgZXhpc3RlZCBzbyB0aGF0IHdlIGNvdWxkCnF1aWVzY2UgdGhlIEdQ
VSBmb2xsb3dpbmcgdW5tZWRpYXRlZCBhY2Nlc3MgYnkgRFJJMS4KCnYyOiBSZWJhc2UKClNpZ25l
ZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRy
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdHJhY2UuaCAgICAgICB8IDI3IC0tLS0tLS0tLS0tLS0t
LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8IDU3ICsrKy0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu
Z2J1ZmZlci5jIHwgNTYgKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMg
Y2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCAxMzQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV90cmFjZS5oCmluZGV4IGIzMDcwYTQ1MDFhYi4uOTc0ODNlMjFjOWI0IDEwMDY0NAotLS0g
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3RyYWNlLmgKKysrIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV90cmFjZS5oCkBAIC01OTcsMzMgKzU5Nyw2IEBAIERFRklORV9FVkVOVChpOTE1
X2dlbV9yZXF1ZXN0LCBpOTE1X2dlbV9yZXF1ZXN0X3dhaXRfZW5kLAogCSAgICBUUF9BUkdTKHJl
cSkKICk7CiAKLURFQ0xBUkVfRVZFTlRfQ0xBU1MoaTkxNV9yaW5nLAotCSAgICBUUF9QUk9UTyhz
dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKSwKLQkgICAgVFBfQVJHUyhyaW5nKSwKLQotCSAg
ICBUUF9TVFJVQ1RfX2VudHJ5KAotCQkJICAgICBfX2ZpZWxkKHUzMiwgZGV2KQotCQkJICAgICBf
X2ZpZWxkKHUzMiwgcmluZykKLQkJCSAgICAgKSwKLQotCSAgICBUUF9mYXN0X2Fzc2lnbigKLQkJ
CSAgIF9fZW50cnktPmRldiA9IHJpbmctPmRldi0+cHJpbWFyeS0+aW5kZXg7Ci0JCQkgICBfX2Vu
dHJ5LT5yaW5nID0gcmluZy0+aWQ7Ci0JCQkgICApLAotCi0JICAgIFRQX3ByaW50aygiZGV2PSV1
LCByaW5nPSV1IiwgX19lbnRyeS0+ZGV2LCBfX2VudHJ5LT5yaW5nKQotKTsKLQotREVGSU5FX0VW
RU5UKGk5MTVfcmluZywgaTkxNV9yaW5nX3dhaXRfYmVnaW4sCi0JICAgIFRQX1BST1RPKHN0cnVj
dCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpLAotCSAgICBUUF9BUkdTKHJpbmcpCi0pOwotCi1ERUZJ
TkVfRVZFTlQoaTkxNV9yaW5nLCBpOTE1X3Jpbmdfd2FpdF9lbmQsCi0JICAgIFRQX1BST1RPKHN0
cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpLAotCSAgICBUUF9BUkdTKHJpbmcpCi0pOwotCiBU
UkFDRV9FVkVOVChpOTE1X2ZsaXBfcmVxdWVzdCwKIAkgICAgVFBfUFJPVE8oaW50IHBsYW5lLCBz
dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKSwKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu
YwppbmRleCA0Yzk4NWUxODZlM2EuLmQxYTk3MDFjN2Y3YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
bHJjLmMKQEAgLTYxMyw4ICs2MTMsOSBAQCBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2FsbG9jX3Jl
cXVlc3RfZXh0cmFzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdAogCXJldHVy
biAwOwogfQogCi1zdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193YWl0X3JlcXVlc3Qoc3RydWN0IGlu
dGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCi0JCQkJICAgICBpbnQgYnl0ZXMpCitzdGF0aWMgaW50
IGxvZ2ljYWxfcmluZ193YWl0X2Zvcl9zcGFjZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmlu
Z2J1ZiwKKwkJCQkgICAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKwkJCQkgICAgICAg
aW50IGJ5dGVzKQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByaW5nYnVmLT5y
aW5nOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKQEAgLTY0MCw3ICs2
NDEsNyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193YWl0X3JlcXVlc3Qoc3RydWN0IGludGVs
X3JpbmdidWZmZXIgKnJpbmdidWYsCiAJCQlicmVhazsKIAl9CiAKLQlpZiAoJnJlcXVlc3QtPmxp
c3QgPT0gJnJpbmctPnJlcXVlc3RfbGlzdCkKKwlpZiAoV0FSTl9PTigmcmVxdWVzdC0+bGlzdCA9
PSAmcmluZy0+cmVxdWVzdF9saXN0KSkKIAkJcmV0dXJuIC1FTk9TUEM7CiAKIAlyZXQgPSBpOTE1
X3dhaXRfcmVxdWVzdChyZXF1ZXN0KTsKQEAgLTY3NSw1NiArNjc2LDYgQEAgaW50ZWxfbG9naWNh
bF9yaW5nX2FkdmFuY2VfYW5kX3N1Ym1pdChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1
ZiwKIAlleGVjbGlzdHNfY29udGV4dF9xdWV1ZShyaW5nLCBjdHgsIHJpbmdidWYtPnRhaWwsIHJl
cXVlc3QpOwogfQogCi1zdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193YWl0X2Zvcl9zcGFjZShzdHJ1
Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKLQkJCQkgICAgICAgc3RydWN0IGludGVsX2Nv
bnRleHQgKmN0eCwKLQkJCQkgICAgICAgaW50IGJ5dGVzKQotewotCXN0cnVjdCBpbnRlbF9lbmdp
bmVfY3MgKnJpbmcgPSByaW5nYnVmLT5yaW5nOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBy
aW5nLT5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZf
cHJpdmF0ZTsKLQl1bnNpZ25lZCBsb25nIGVuZDsKLQlpbnQgcmV0OwotCi0JcmV0ID0gbG9naWNh
bF9yaW5nX3dhaXRfcmVxdWVzdChyaW5nYnVmLCBieXRlcyk7Ci0JaWYgKHJldCAhPSAtRU5PU1BD
KQotCQlyZXR1cm4gcmV0OwotCi0JLyogRm9yY2UgdGhlIGNvbnRleHQgc3VibWlzc2lvbiBpbiBj
YXNlIHdlIGhhdmUgYmVlbiBza2lwcGluZyBpdCAqLwotCWludGVsX2xvZ2ljYWxfcmluZ19hZHZh
bmNlX2FuZF9zdWJtaXQocmluZ2J1ZiwgY3R4LCBOVUxMKTsKLQotCS8qIFdpdGggR0VNIHRoZSBo
YW5nY2hlY2sgdGltZXIgc2hvdWxkIGtpY2sgdXMgb3V0IG9mIHRoZSBsb29wLAotCSAqIGxlYXZp
bmcgaXQgZWFybHkgcnVucyB0aGUgcmlzayBvZiBjb3JydXB0aW5nIEdFTSBzdGF0ZSAoZHVlCi0J
ICogdG8gcnVubmluZyBvbiBhbG1vc3QgdW50ZXN0ZWQgY29kZXBhdGhzKS4gQnV0IG9uIHJlc3Vt
ZQotCSAqIHRpbWVycyBkb24ndCB3b3JrIHlldCwgc28gcHJldmVudCBhIGNvbXBsZXRlIGhhbmcg
aW4gdGhhdAotCSAqIGNhc2UgYnkgY2hvb3NpbmcgYW4gaW5zYW5lbHkgbGFyZ2UgdGltZW91dC4g
Ki8KLQllbmQgPSBqaWZmaWVzICsgNjAgKiBIWjsKLQotCXJldCA9IDA7Ci0JZG8gewotCQlpZiAo
aW50ZWxfcmluZ19zcGFjZShyaW5nYnVmKSA+PSBieXRlcykKLQkJCWJyZWFrOwotCi0JCW1zbGVl
cCgxKTsKLQotCQlpZiAoZGV2X3ByaXYtPm1tLmludGVycnVwdGlibGUgJiYgc2lnbmFsX3BlbmRp
bmcoY3VycmVudCkpIHsKLQkJCXJldCA9IC1FUkVTVEFSVFNZUzsKLQkJCWJyZWFrOwotCQl9Ci0K
LQkJcmV0ID0gaTkxNV9nZW1fY2hlY2tfd2VkZ2UoJmRldl9wcml2LT5ncHVfZXJyb3IsCi0JCQkJ
CSAgIGRldl9wcml2LT5tbS5pbnRlcnJ1cHRpYmxlKTsKLQkJaWYgKHJldCkKLQkJCWJyZWFrOwot
Ci0JCWlmICh0aW1lX2FmdGVyKGppZmZpZXMsIGVuZCkpIHsKLQkJCXJldCA9IC1FQlVTWTsKLQkJ
CWJyZWFrOwotCQl9Ci0JfSB3aGlsZSAoMSk7Ci0KLQlyZXR1cm4gcmV0OwotfQotCiBzdGF0aWMg
aW50IGxvZ2ljYWxfcmluZ193cmFwX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmlu
Z2J1ZiwKIAkJCQkgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCkKIHsKZGlmZiAtLWdpdCBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCBhMjQyMTc4ZDY3OTIuLjkzNzg4YTM2ZGI2
MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisr
KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjA2OCw3ICsy
MDY4LDcgQEAgdm9pZCBpbnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdp
bmVfY3MgKnJpbmcpCiAJcmluZy0+YnVmZmVyID0gTlVMTDsKIH0KIAotc3RhdGljIGludCBpbnRl
bF9yaW5nX3dhaXRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCBpbnQgbikK
K3N0YXRpYyBpbnQgcmluZ193YWl0X2Zvcl9zcGFjZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy
aW5nLCBpbnQgbikKIHsKIAlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IHJpbmct
PmJ1ZmZlcjsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3Q7CkBAIC0yMDg1
LDcgKzIwODUsNyBAQCBzdGF0aWMgaW50IGludGVsX3Jpbmdfd2FpdF9yZXF1ZXN0KHN0cnVjdCBp
bnRlbF9lbmdpbmVfY3MgKnJpbmcsIGludCBuKQogCQkJYnJlYWs7CiAJfQogCi0JaWYgKCZyZXF1
ZXN0LT5saXN0ID09ICZyaW5nLT5yZXF1ZXN0X2xpc3QpCisJaWYgKFdBUk5fT04oJnJlcXVlc3Qt
Pmxpc3QgPT0gJnJpbmctPnJlcXVlc3RfbGlzdCkpCiAJCXJldHVybiAtRU5PU1BDOwogCiAJcmV0
ID0gaTkxNV93YWl0X3JlcXVlc3QocmVxdWVzdCk7CkBAIC0yMDk2LDU4ICsyMDk2LDYgQEAgc3Rh
dGljIGludCBpbnRlbF9yaW5nX3dhaXRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy
aW5nLCBpbnQgbikKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCByaW5nX3dhaXRfZm9yX3Nw
YWNlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIGludCBuKQotewotCXN0cnVjdCBkcm1f
ZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w
cml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1
ZiA9IHJpbmctPmJ1ZmZlcjsKLQl1bnNpZ25lZCBsb25nIGVuZDsKLQlpbnQgcmV0OwotCi0JcmV0
ID0gaW50ZWxfcmluZ193YWl0X3JlcXVlc3QocmluZywgbik7Ci0JaWYgKHJldCAhPSAtRU5PU1BD
KQotCQlyZXR1cm4gcmV0OwotCi0JLyogZm9yY2UgdGhlIHRhaWwgd3JpdGUgaW4gY2FzZSB3ZSBo
YXZlIGJlZW4gc2tpcHBpbmcgdGhlbSAqLwotCV9faW50ZWxfcmluZ19hZHZhbmNlKHJpbmcpOwot
Ci0JLyogV2l0aCBHRU0gdGhlIGhhbmdjaGVjayB0aW1lciBzaG91bGQga2ljayB1cyBvdXQgb2Yg
dGhlIGxvb3AsCi0JICogbGVhdmluZyBpdCBlYXJseSBydW5zIHRoZSByaXNrIG9mIGNvcnJ1cHRp
bmcgR0VNIHN0YXRlIChkdWUKLQkgKiB0byBydW5uaW5nIG9uIGFsbW9zdCB1bnRlc3RlZCBjb2Rl
cGF0aHMpLiBCdXQgb24gcmVzdW1lCi0JICogdGltZXJzIGRvbid0IHdvcmsgeWV0LCBzbyBwcmV2
ZW50IGEgY29tcGxldGUgaGFuZyBpbiB0aGF0Ci0JICogY2FzZSBieSBjaG9vc2luZyBhbiBpbnNh
bmVseSBsYXJnZSB0aW1lb3V0LiAqLwotCWVuZCA9IGppZmZpZXMgKyA2MCAqIEhaOwotCi0JcmV0
ID0gMDsKLQl0cmFjZV9pOTE1X3Jpbmdfd2FpdF9iZWdpbihyaW5nKTsKLQlkbyB7Ci0JCWlmIChp
bnRlbF9yaW5nX3NwYWNlKHJpbmdidWYpID49IG4pCi0JCQlicmVhazsKLQkJcmluZ2J1Zi0+aGVh
ZCA9IEk5MTVfUkVBRF9IRUFEKHJpbmcpOwotCQlpZiAoaW50ZWxfcmluZ19zcGFjZShyaW5nYnVm
KSA+PSBuKQotCQkJYnJlYWs7Ci0KLQkJbXNsZWVwKDEpOwotCi0JCWlmIChkZXZfcHJpdi0+bW0u
aW50ZXJydXB0aWJsZSAmJiBzaWduYWxfcGVuZGluZyhjdXJyZW50KSkgewotCQkJcmV0ID0gLUVS
RVNUQVJUU1lTOwotCQkJYnJlYWs7Ci0JCX0KLQotCQlyZXQgPSBpOTE1X2dlbV9jaGVja193ZWRn
ZSgmZGV2X3ByaXYtPmdwdV9lcnJvciwKLQkJCQkJICAgZGV2X3ByaXYtPm1tLmludGVycnVwdGli
bGUpOwotCQlpZiAocmV0KQotCQkJYnJlYWs7Ci0KLQkJaWYgKHRpbWVfYWZ0ZXIoamlmZmllcywg
ZW5kKSkgewotCQkJcmV0ID0gLUVCVVNZOwotCQkJYnJlYWs7Ci0JCX0KLQl9IHdoaWxlICgxKTsK
LQl0cmFjZV9pOTE1X3Jpbmdfd2FpdF9lbmQocmluZyk7Ci0JcmV0dXJuIHJldDsKLX0KLQogc3Rh
dGljIGludCBpbnRlbF93cmFwX3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp
bmcpCiB7CiAJdWludDMyX3QgX19pb21lbSAqdmlydDsKLS0gCjIuMS40CgpfX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0
CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w
Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=