From: Jani Nikula Subject: [PATCH 1/5] drm/i915/crt: split out intel_crt_present() to platform specific setup Date: Mon, 21 Jan 2019 16:21:30 +0200 Message-ID: <20190121142134.17434-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5C5426E709 for ; Mon, 21 Jan 2019 14:19:57 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org V2l0aCBuZXcgcGxhdGZvcm1zIG5vdCBoYXZpbmcgQ1JUIHN1cHBvcnQgYW5kIG1vc3QgY29uZGl0 aW9ucyBpbgppbnRlbF9jcnRfcHJlc2VudCgpIGJlaW5nIHNwZWNpZmljIHRvIERESSwgc3BsaXQg b3V0IHRoZSBDUlQKaW5pdGlhbGl6YXRpb24gdG8gcGxhdGZvcm0gc3BlY2lmaWMgYmxvY2tzIGlu IHRoZSBpZiBsYWRkZXIuIEFkZCBuZXcKUGluZXZpZXcgYmxvY2sgZm9yIHRoaXMuCgpUaGlzIHB1 dHMgaW50ZWxfY3J0X2luaXQoKSBtb3JlIGluIGxpbmUgd2l0aCB0aGUgcmVzdCBvZiB0aGUgb3V0 cHV0cywKYW5kIG1ha2VzIGl0IHNsaWdodGx5IGVhc2llciBmb3IgdGhlIHVuaW5pdGlhdGVkIHRv IGZpZ3VyZSBvdXQgd2hpY2gKcGxhdGZvcm1zIGFjdHVhbGx5IGhhdmUgd2hhdC4KClNpZ25lZC1v ZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMzcgKysrKysrKysrKysrKysrKysrLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAyZmE5ZjRhZWMwOGUuLmU4YmMy OTdjNjBhYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTQyNDUsMjMg KzE0MjQ1LDE3IEBAIHN0YXRpYyBib29sIGhhc19lZHBfYShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiAJcmV0dXJuIHRydWU7CiB9CiAKLXN0YXRpYyBib29sIGludGVsX2NydF9w cmVzZW50KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyBib29sIGlu dGVsX2RkaV9jcnRfcHJlc2VudChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7 Ci0JaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkKLQkJcmV0dXJuIGZhbHNlOwotCiAJaWYg KElTX0hTV19VTFQoZGV2X3ByaXYpIHx8IElTX0JEV19VTFQoZGV2X3ByaXYpKQogCQlyZXR1cm4g ZmFsc2U7CiAKLQlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCi0JCXJldHVybiBmYWxzZTsK LQogCWlmIChIQVNfUENIX0xQVF9IKGRldl9wcml2KSAmJgogCSAgICBJOTE1X1JFQUQoU0ZVU0Vf U1RSQVApICYgU0ZVU0VfU1RSQVBfQ1JUX0RJU0FCTEVEKQogCQlyZXR1cm4gZmFsc2U7CiAKIAkv KiBEREkgRSBjYW4ndCBiZSB1c2VkIGlmIERESSBBIHJlcXVpcmVzIDQgbGFuZXMgKi8KLQlpZiAo SEFTX0RESShkZXZfcHJpdikgJiYgSTkxNV9SRUFEKERESV9CVUZfQ1RMKFBPUlRfQSkpICYgRERJ X0FfNF9MQU5FUykKKwlpZiAoSTkxNV9SRUFEKERESV9CVUZfQ1RMKFBPUlRfQSkpICYgRERJX0Ff NF9MQU5FUykKIAkJcmV0dXJuIGZhbHNlOwogCiAJaWYgKCFkZXZfcHJpdi0+dmJ0LmludF9jcnRf c3VwcG9ydCkKQEAgLTE0MzIzLDkgKzE0MzE3LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2V0dXBf b3V0cHV0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJICovCiAJaW50ZWxf bHZkc19pbml0KGRldl9wcml2KTsKIAotCWlmIChpbnRlbF9jcnRfcHJlc2VudChkZXZfcHJpdikp Ci0JCWludGVsX2NydF9pbml0KGRldl9wcml2KTsKLQogCWlmIChJU19JQ0VMQUtFKGRldl9wcml2 KSkgewogCQlpbnRlbF9kZGlfaW5pdChkZXZfcHJpdiwgUE9SVF9BKTsKIAkJaW50ZWxfZGRpX2lu aXQoZGV2X3ByaXYsIFBPUlRfQik7CkBAIC0xNDM1NCw2ICsxNDM0NSw5IEBAIHN0YXRpYyB2b2lk IGludGVsX3NldHVwX291dHB1dHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CX0gZWxzZSBpZiAoSEFTX0RESShkZXZfcHJpdikpIHsKIAkJaW50IGZvdW5kOwogCisJCWlmIChp bnRlbF9kZGlfY3J0X3ByZXNlbnQoZGV2X3ByaXYpKQorCQkJaW50ZWxfY3J0X2luaXQoZGV2X3By aXYpOworCiAJCS8qCiAJCSAqIEhhc3dlbGwgdXNlcyBEREkgZnVuY3Rpb25zIHRvIGRldGVjdCBk aWdpdGFsIG91dHB1dHMuCiAJCSAqIE9uIFNLTCBwcmUtRDAgdGhlIHN0cmFwIGlzbid0IGNvbm5l Y3RlZCwgc28gd2UgYXNzdW1lCkBAIC0xNDM4NSw2ICsxNDM3OSwxMCBAQCBzdGF0aWMgdm9pZCBp bnRlbF9zZXR1cF9vdXRwdXRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAog CX0gZWxzZSBpZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikpIHsKIAkJaW50IGZvdW5kOworCisJ CWlmIChkZXZfcHJpdi0+dmJ0LmludF9jcnRfc3VwcG9ydCkKKwkJCWludGVsX2NydF9pbml0KGRl dl9wcml2KTsKKwogCQlkcGRfaXNfZWRwID0gaW50ZWxfZHBfaXNfcG9ydF9lZHAoZGV2X3ByaXYs IFBPUlRfRCk7CiAKIAkJaWYgKGhhc19lZHBfYShkZXZfcHJpdikpCkBAIC0xNDQxMyw2ICsxNDQx MSw5IEBAIHN0YXRpYyB2b2lkIGludGVsX3NldHVwX291dHB1dHMoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwg SVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJYm9vbCBoYXNfZWRwLCBoYXNfcG9ydDsKIAor CQlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgJiYgZGV2X3ByaXYtPnZidC5pbnRfY3J0X3N1 cHBvcnQpCisJCQlpbnRlbF9jcnRfaW5pdChkZXZfcHJpdik7CisKIAkJLyoKIAkJICogVGhlIERQ X0RFVEVDVEVEIGJpdCBpcyB0aGUgbGF0Y2hlZCBzdGF0ZSBvZiB0aGUgRERDCiAJCSAqIFNEQSBw aW4gYXQgYm9vdC4gSG93ZXZlciBzaW5jZSBlRFAgZG9lc24ndCByZXF1aXJlIEREQwpAQCAtMTQ0 NTUsOSArMTQ0NTYsMTUgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2V0dXBfb3V0cHV0cyhzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCX0KIAogCQl2bHZfZHNpX2luaXQoZGV2X3By aXYpOwotCX0gZWxzZSBpZiAoIUlTX0dFTihkZXZfcHJpdiwgMikgJiYgIUlTX1BJTkVWSUVXKGRl dl9wcml2KSkgeworCX0gZWxzZSBpZiAoSVNfUElORVZJRVcoZGV2X3ByaXYpKSB7CisJCWlmIChk ZXZfcHJpdi0+dmJ0LmludF9jcnRfc3VwcG9ydCkKKwkJCWludGVsX2NydF9pbml0KGRldl9wcml2 KTsKKwl9IGVsc2UgaWYgKElTX0dFTl9SQU5HRShkZXZfcHJpdiwgMywgNCkpIHsKIAkJYm9vbCBm b3VuZCA9IGZhbHNlOwogCisJCWlmIChkZXZfcHJpdi0+dmJ0LmludF9jcnRfc3VwcG9ydCkKKwkJ CWludGVsX2NydF9pbml0KGRldl9wcml2KTsKKwogCQlpZiAoSTkxNV9SRUFEKEdFTjNfU0RWT0Ip ICYgU0RWT19ERVRFQ1RFRCkgewogCQkJRFJNX0RFQlVHX0tNUygicHJvYmluZyBTRFZPQlxuIik7 CiAJCQlmb3VuZCA9IGludGVsX3Nkdm9faW5pdChkZXZfcHJpdiwgR0VOM19TRFZPQiwgUE9SVF9C KTsKQEAgLTE0NDg5LDggKzE0NDk2LDEyIEBAIHN0YXRpYyB2b2lkIGludGVsX3NldHVwX291dHB1 dHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJCWlmIChJU19HNFgoZGV2 X3ByaXYpICYmIChJOTE1X1JFQUQoRFBfRCkgJiBEUF9ERVRFQ1RFRCkpCiAJCQlpbnRlbF9kcF9p bml0KGRldl9wcml2LCBEUF9ELCBQT1JUX0QpOwotCX0gZWxzZSBpZiAoSVNfR0VOKGRldl9wcml2 LCAyKSkKKwl9IGVsc2UgaWYgKElTX0dFTihkZXZfcHJpdiwgMikpIHsKKwkJaWYgKGRldl9wcml2 LT52YnQuaW50X2NydF9zdXBwb3J0KQorCQkJaW50ZWxfY3J0X2luaXQoZGV2X3ByaXYpOworCiAJ CWludGVsX2R2b19pbml0KGRldl9wcml2KTsKKwl9CiAKIAlpZiAoU1VQUE9SVFNfVFYoZGV2X3By aXYpKQogCQlpbnRlbF90dl9pbml0KGRldl9wcml2KTsKLS0gCjIuMjAuMQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==