From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH 2/2] drm/i915: Kill intel_crtc->vbl_wait
Date: Thu, 22 May 2014 18:39:33 +0300
Message-ID: <1400773173-13813-2-git-send-email-ville.syrjala@linux.intel.com>
References: <1400773173-13813-1-git-send-email-ville.syrjala@linux.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>
In-Reply-To: <1400773173-13813-1-git-send-email-ville.syrjala@linux.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
Cc: dri-devel@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNo
YXJlIHRoZSB3YWl0cXVldWUgdGhhdCBkcm1faXJxIHVzZXMgd2hlbiBwZXJmb3JtaW5nIHRoZSB2
YmxhbmsgZXZhZGUKdHJpY2sgZm9yIGF0b21pYyBwaXBlIHVwZGF0ZXMuCgpTdWdnZXN0ZWQtYnk6
IERhbmllbCBWZXR0ZXIgPGRhbmllbEBmZndsbC5jaD4KU2lnbmVkLW9mZi1ieTogVmlsbGUgU3ly
asOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X2lycS5jICAgICAgfCAyNSArKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiBk
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgMiAtLQogZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDIgLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX3Nwcml0ZS5jICB8ICA1ICsrKy0tCiA0IGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygr
KSwgMjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKaW5kZXggMzA0Zjg2YS4u
NTkwNWE5ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC0xNzI0LDE5ICsxNzI0LDYgQEAg
c3RhdGljIHZvaWQgZ2VuNl9ycHNfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2LCB1MzIgcG1faWlyKQogCX0KIH0KIAotc3RhdGljIGJvb2wgaW50ZWxfcGlwZV9o
YW5kbGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcGlwZSBwaXBlKQotewot
CXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjOwotCi0JaWYgKCFkcm1faGFuZGxlX3ZibGFuayhkZXYs
IHBpcGUpKQotCQlyZXR1cm4gZmFsc2U7Ci0KLQljcnRjID0gdG9faW50ZWxfY3J0YyhpbnRlbF9n
ZXRfY3J0Y19mb3JfcGlwZShkZXYsIHBpcGUpKTsKLQl3YWtlX3VwKCZjcnRjLT52Ymxfd2FpdCk7
Ci0KLQlyZXR1cm4gdHJ1ZTsKLX0KLQogc3RhdGljIHZvaWQgdmFsbGV5dmlld19waXBlc3RhdF9p
cnFfaGFuZGxlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1MzIgaWlyKQogewogCXN0cnVjdCBk
cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC0xNzkxLDcg
KzE3NzgsNyBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X3BpcGVzdGF0X2lycV9oYW5kbGVyKHN0
cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUzMiBpaXIpCiAKIAlmb3JfZWFjaF9waXBlKHBpcGUpIHsK
IAkJaWYgKHBpcGVfc3RhdHNbcGlwZV0gJiBQSVBFX1NUQVJUX1ZCTEFOS19JTlRFUlJVUFRfU1RB
VFVTKQotCQkJaW50ZWxfcGlwZV9oYW5kbGVfdmJsYW5rKGRldiwgcGlwZSk7CisJCQlkcm1faGFu
ZGxlX3ZibGFuayhkZXYsIHBpcGUpOwogCiAJCWlmIChwaXBlX3N0YXRzW3BpcGVdICYgUExBTkVf
RkxJUF9ET05FX0lOVF9TVEFUVVNfVkxWKSB7CiAJCQlpbnRlbF9wcmVwYXJlX3BhZ2VfZmxpcChk
ZXYsIHBpcGUpOwpAQCAtMjA2OCw3ICsyMDU1LDcgQEAgc3RhdGljIHZvaWQgaWxrX2Rpc3BsYXlf
aXJxX2hhbmRsZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdTMyIGRlX2lpcikKIAogCWZvcl9l
YWNoX3BpcGUocGlwZSkgewogCQlpZiAoZGVfaWlyICYgREVfUElQRV9WQkxBTksocGlwZSkpCi0J
CQlpbnRlbF9waXBlX2hhbmRsZV92YmxhbmsoZGV2LCBwaXBlKTsKKwkJCWRybV9oYW5kbGVfdmJs
YW5rKGRldiwgcGlwZSk7CiAKIAkJaWYgKGRlX2lpciAmIERFX1BJUEVfRklGT19VTkRFUlJVTihw
aXBlKSkKIAkJCWlmIChpbnRlbF9zZXRfY3B1X2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKGRldiwg
cGlwZSwgZmFsc2UpKQpAQCAtMjExOCw3ICsyMTA1LDcgQEAgc3RhdGljIHZvaWQgaXZiX2Rpc3Bs
YXlfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdTMyIGRlX2lpcikKIAogCWZv
cl9lYWNoX3BpcGUocGlwZSkgewogCQlpZiAoZGVfaWlyICYgKERFX1BJUEVfVkJMQU5LX0lWQihw
aXBlKSkpCi0JCQlpbnRlbF9waXBlX2hhbmRsZV92YmxhbmsoZGV2LCBwaXBlKTsKKwkJCWRybV9o
YW5kbGVfdmJsYW5rKGRldiwgcGlwZSk7CiAKIAkJLyogcGxhbmUvcGlwZXMgbWFwIDE6MSBvbiBp
bGsrICovCiAJCWlmIChkZV9paXIgJiBERV9QTEFORV9GTElQX0RPTkVfSVZCKHBpcGUpKSB7CkBA
IC0yMjYxLDcgKzIyNDgsNyBAQCBzdGF0aWMgaXJxcmV0dXJuX3QgZ2VuOF9pcnFfaGFuZGxlcihp
bnQgaXJxLCB2b2lkICphcmcpCiAKIAkJcGlwZV9paXIgPSBJOTE1X1JFQUQoR0VOOF9ERV9QSVBF
X0lJUihwaXBlKSk7CiAJCWlmIChwaXBlX2lpciAmIEdFTjhfUElQRV9WQkxBTkspCi0JCQlpbnRl
bF9waXBlX2hhbmRsZV92YmxhbmsoZGV2LCBwaXBlKTsKKwkJCWRybV9oYW5kbGVfdmJsYW5rKGRl
diwgcGlwZSk7CiAKIAkJaWYgKHBpcGVfaWlyICYgR0VOOF9QSVBFX1BSSU1BUllfRkxJUF9ET05F
KSB7CiAJCQlpbnRlbF9wcmVwYXJlX3BhZ2VfZmxpcChkZXYsIHBpcGUpOwpAQCAtMzczMSw3ICsz
NzE4LDcgQEAgc3RhdGljIGJvb2wgaTh4eF9oYW5kbGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYsCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJp
dmF0ZTsKIAl1MTYgZmxpcF9wZW5kaW5nID0gRElTUExBWV9QTEFORV9GTElQX1BFTkRJTkcocGxh
bmUpOwogCi0JaWYgKCFpbnRlbF9waXBlX2hhbmRsZV92YmxhbmsoZGV2LCBwaXBlKSkKKwlpZiAo
IWRybV9oYW5kbGVfdmJsYW5rKGRldiwgcGlwZSkpCiAJCXJldHVybiBmYWxzZTsKIAogCWlmICgo
aWlyICYgZmxpcF9wZW5kaW5nKSA9PSAwKQpAQCAtMzkxNiw3ICszOTAzLDcgQEAgc3RhdGljIGJv
b2wgaTkxNV9oYW5kbGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJc3RydWN0IGRy
bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAl1MzIgZmxpcF9w
ZW5kaW5nID0gRElTUExBWV9QTEFORV9GTElQX1BFTkRJTkcocGxhbmUpOwogCi0JaWYgKCFpbnRl
bF9waXBlX2hhbmRsZV92YmxhbmsoZGV2LCBwaXBlKSkKKwlpZiAoIWRybV9oYW5kbGVfdmJsYW5r
KGRldiwgcGlwZSkpCiAJCXJldHVybiBmYWxzZTsKIAogCWlmICgoaWlyICYgZmxpcF9wZW5kaW5n
KSA9PSAwKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDAxOWU5ZTEuLmFh
YjYzOGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwor
KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEwOTY2LDggKzEw
OTY2LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpk
ZXYsIGludCBwaXBlKQogCQlpbnRlbF9jcnRjLT5wbGFuZSA9ICFwaXBlOwogCX0KIAotCWluaXRf
d2FpdHF1ZXVlX2hlYWQoJmludGVsX2NydGMtPnZibF93YWl0KTsKLQogCUJVR19PTihwaXBlID49
IEFSUkFZX1NJWkUoZGV2X3ByaXYtPnBsYW5lX3RvX2NydGNfbWFwcGluZykgfHwKIAkgICAgICAg
ZGV2X3ByaXYtPnBsYW5lX3RvX2NydGNfbWFwcGluZ1tpbnRlbF9jcnRjLT5wbGFuZV0gIT0gTlVM
TCk7CiAJZGV2X3ByaXYtPnBsYW5lX3RvX2NydGNfbWFwcGluZ1tpbnRlbF9jcnRjLT5wbGFuZV0g
PSAmaW50ZWxfY3J0Yy0+YmFzZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggZDdjNTJi
Mi4uMDA3MTEzOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK
KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTQwOCw4ICs0MDgsNiBA
QCBzdHJ1Y3QgaW50ZWxfY3J0YyB7CiAJCXN0cnVjdCBpbnRlbF9waXBlX3dtIGFjdGl2ZTsKIAl9
IHdtOwogCi0Jd2FpdF9xdWV1ZV9oZWFkX3QgdmJsX3dhaXQ7Ci0KIAlpbnQgc2NhbmxpbmVfb2Zm
c2V0OwogfTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl
LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCBkNmFjZDZiLi43
Y2Q2YTRmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwor
KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtNTMsNiArNTMsNyBA
QCBzdGF0aWMgYm9vbCBpbnRlbF9waXBlX3VwZGF0ZV9zdGFydChzdHJ1Y3QgaW50ZWxfY3J0YyAq
Y3J0YywgdWludDMyX3QgKnN0YXJ0X3ZibAogCWVudW0gcGlwZSBwaXBlID0gY3J0Yy0+cGlwZTsK
IAlsb25nIHRpbWVvdXQgPSBtc2Vjc190b19qaWZmaWVzX3RpbWVvdXQoMSk7CiAJaW50IHNjYW5s
aW5lLCBtaW4sIG1heCwgdmJsYW5rX3N0YXJ0OworCXdhaXRfcXVldWVfaGVhZF90ICp3cSA9IGRy
bV9jcnRjX3ZibGFua193YWl0cXVldWUoJmNydGMtPmJhc2UpOwogCURFRklORV9XQUlUKHdhaXQp
OwogCiAJV0FSTl9PTighbXV0ZXhfaXNfbG9ja2VkKCZjcnRjLT5iYXNlLm11dGV4KSk7CkBAIC04
MSw3ICs4Miw3IEBAIHN0YXRpYyBib29sIGludGVsX3BpcGVfdXBkYXRlX3N0YXJ0KHN0cnVjdCBp
bnRlbF9jcnRjICpjcnRjLCB1aW50MzJfdCAqc3RhcnRfdmJsCiAJCSAqIG90aGVyIENQVXMgY2Fu
IHNlZSB0aGUgdGFzayBzdGF0ZSB1cGRhdGUgYnkgdGhlIHRpbWUgd2UKIAkJICogcmVhZCB0aGUg
c2NhbmxpbmUuCiAJCSAqLwotCQlwcmVwYXJlX3RvX3dhaXQoJmNydGMtPnZibF93YWl0LCAmd2Fp
dCwgVEFTS19VTklOVEVSUlVQVElCTEUpOworCQlwcmVwYXJlX3RvX3dhaXQod3EsICZ3YWl0LCBU
QVNLX1VOSU5URVJSVVBUSUJMRSk7CiAKIAkJc2NhbmxpbmUgPSBpbnRlbF9nZXRfY3J0Y19zY2Fu
bGluZShjcnRjKTsKIAkJaWYgKHNjYW5saW5lIDwgbWluIHx8IHNjYW5saW5lID4gbWF4KQpAQCAt
MTAwLDcgKzEwMSw3IEBAIHN0YXRpYyBib29sIGludGVsX3BpcGVfdXBkYXRlX3N0YXJ0KHN0cnVj
dCBpbnRlbF9jcnRjICpjcnRjLCB1aW50MzJfdCAqc3RhcnRfdmJsCiAJCWxvY2FsX2lycV9kaXNh
YmxlKCk7CiAJfQogCi0JZmluaXNoX3dhaXQoJmNydGMtPnZibF93YWl0LCAmd2FpdCk7CisJZmlu
aXNoX3dhaXQod3EsICZ3YWl0KTsKIAogCWRybV92YmxhbmtfcHV0KGRldiwgcGlwZSk7CiAKLS0g
CjEuOC41LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo
dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==