From: Damien Lespiau Subject: [PATCH 2/7] drm/i915/skl: fetch, enable/disable pfit as needed v2 Date: Thu, 13 Nov 2014 17:51:47 +0000 Message-ID: <1415901112-7233-3-git-send-email-damien.lespiau@intel.com> References: <1415901112-7233-1-git-send-email-damien.lespiau@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 4C2756EBCB for ; Thu, 13 Nov 2014 09:51:57 -0800 (PST) In-Reply-To: <1415901112-7233-1-git-send-email-damien.lespiau@intel.com> 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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogSmVzc2UgQmFybmVzIDxqYmFybmVzQHZpcnR1b3VzZ2Vlay5vcmc+CgpUaGlzIG1vdmVk IGFyb3VuZCBvbiBTS0wsIHNvIHdlIG5lZWQgdG8gbWFrZSBzdXJlIHdlIHJlYWQvd3JpdGUgdGhl CmNvcnJlY3QgcmVncy4KCnYyOiBmaXh1cCBXSU5fUE9TIG9mZnNldHMgKFBhdWxvKQogICAgemVy byBvdXQgV0lOX1BPUyByZWcgYXQgZGlzYWJsZSB0aW1lIChQYXVsbykKClJldmlld2VkLWJ5OiBQ YXVsbyBaYW5vbmkgPHBhdWxvLnIuemFub25pQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSmVz c2UgQmFybmVzIDxqYmFybmVzQHZpcnR1b3Vnc2Vlay5vcmc+ClNpZ25lZC1vZmYtYnk6IERhbWll biBMZXNwaWF1IDxkYW1pZW4ubGVzcGlhdUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9yZWcuaCAgICAgIHwgMTIgKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIHwgNjIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0t CiAyIGZpbGVzIGNoYW5nZWQsIDcwIGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggMzYzNTA5OS4uNTMxMjFlOSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3JlZy5oCkBAIC00OTE2LDYgKzQ5MTYsMTggQEAgZW51bSBwdW5pdF9wb3dlcl93ZWxsIHsK ICNkZWZpbmUgUEZfVlNDQUxFKHBpcGUpCQlfUElQRShwaXBlLCBfUEZBX1ZTQ0FMRSwgX1BGQl9W U0NBTEUpCiAjZGVmaW5lIFBGX0hTQ0FMRShwaXBlKQkJX1BJUEUocGlwZSwgX1BGQV9IU0NBTEUs IF9QRkJfSFNDQUxFKQogCisjZGVmaW5lIF9QU0FfQ1RMCQkweDY4MTgwCisjZGVmaW5lIF9QU0Jf Q1RMCQkweDY4OTgwCisjZGVmaW5lIFBTX0VOQUJMRQkJKDE8PDMxKQorI2RlZmluZSBfUFNBX1dJ Tl9TWgkJMHg2ODE3NAorI2RlZmluZSBfUFNCX1dJTl9TWgkJMHg2ODk3NAorI2RlZmluZSBfUFNB X1dJTl9QT1MJCTB4NjgxNzAKKyNkZWZpbmUgX1BTQl9XSU5fUE9TCQkweDY4OTcwCisKKyNkZWZp bmUgUFNfQ1RMKHBpcGUpCQlfUElQRShwaXBlLCBfUFNBX0NUTCwgX1BTQl9DVEwpCisjZGVmaW5l IFBTX1dJTl9TWihwaXBlKQkJX1BJUEUocGlwZSwgX1BTQV9XSU5fU1osIF9QU0JfV0lOX1NaKQor I2RlZmluZSBQU19XSU5fUE9TKHBpcGUpCV9QSVBFKHBpcGUsIF9QU0FfV0lOX1BPUywgX1BTQl9X SU5fUE9TKQorCiAvKiBsZWdhY3kgcGFsZXR0ZSAqLwogI2RlZmluZSBfTEdDX1BBTEVUVEVfQSAg ICAgICAgICAgMHg0YTAwMAogI2RlZmluZSBfTEdDX1BBTEVUVEVfQiAgICAgICAgICAgMHg0YTgw MApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDkwZDg1ODEuLmNiMmVjODQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTQwMDMsNiArNDAwMywxOSBA QCBzdGF0aWMgdm9pZCBjcHRfdmVyaWZ5X21vZGVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg aW50IHBpcGUpCiAJfQogfQogCitzdGF0aWMgdm9pZCBza3lsYWtlX3BmaXRfZW5hYmxlKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjKQoreworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5i YXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9w cml2YXRlOworCWludCBwaXBlID0gY3J0Yy0+cGlwZTsKKworCWlmIChjcnRjLT5jb25maWcucGNo X3BmaXQuZW5hYmxlZCkgeworCQlJOTE1X1dSSVRFKFBTX0NUTChwaXBlKSwgUFNfRU5BQkxFKTsK KwkJSTkxNV9XUklURShQU19XSU5fUE9TKHBpcGUpLCBjcnRjLT5jb25maWcucGNoX3BmaXQucG9z KTsKKwkJSTkxNV9XUklURShQU19XSU5fU1oocGlwZSksIGNydGMtPmNvbmZpZy5wY2hfcGZpdC5z aXplKTsKKwl9Cit9CisKIHN0YXRpYyB2b2lkIGlyb25sYWtlX3BmaXRfZW5hYmxlKHN0cnVjdCBp bnRlbF9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNl LmRldjsKQEAgLTQzODYsNyArNDM5OSwxMCBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxsX2NydGNfZW5h YmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCWludGVsX2RkaV9lbmFibGVfcGlwZV9jbG9j ayhpbnRlbF9jcnRjKTsKIAotCWlyb25sYWtlX3BmaXRfZW5hYmxlKGludGVsX2NydGMpOworCWlm IChJU19TS1lMQUtFKGRldikpCisJCXNreWxha2VfcGZpdF9lbmFibGUoaW50ZWxfY3J0Yyk7CisJ ZWxzZQorCQlpcm9ubGFrZV9wZml0X2VuYWJsZShpbnRlbF9jcnRjKTsKIAogCS8qCiAJICogT24g SUxLKyBMVVQgbXVzdCBiZSBsb2FkZWQgYmVmb3JlIHRoZSBwaXBlIGlzIHJ1bm5pbmcgYnV0IHdp dGgKQEAgLTQ0MjAsNiArNDQzNiwyMSBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxsX2NydGNfZW5hYmxl KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlpbnRlbF9jcnRjX2VuYWJsZV9wbGFuZXMoY3J0Yyk7 CiB9CiAKK3N0YXRpYyB2b2lkIHNreWxha2VfcGZpdF9kaXNhYmxlKHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjKQoreworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKKwlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOworCWlu dCBwaXBlID0gY3J0Yy0+cGlwZTsKKworCS8qIFRvIGF2b2lkIHVwc2V0dGluZyB0aGUgcG93ZXIg d2VsbCBvbiBoYXN3ZWxsIG9ubHkgZGlzYWJsZSB0aGUgcGZpdCBpZgorCSAqIGl0J3MgaW4gdXNl LiBUaGUgaHcgc3RhdGUgY29kZSB3aWxsIG1ha2Ugc3VyZSB3ZSBnZXQgdGhpcyByaWdodC4gKi8K KwlpZiAoY3J0Yy0+Y29uZmlnLnBjaF9wZml0LmVuYWJsZWQpIHsKKwkJSTkxNV9XUklURShQU19D VEwocGlwZSksIDApOworCQlJOTE1X1dSSVRFKFBTX1dJTl9QT1MocGlwZSksIDApOworCQlJOTE1 X1dSSVRFKFBTX1dJTl9TWihwaXBlKSwgMCk7CisJfQorfQorCiBzdGF0aWMgdm9pZCBpcm9ubGFr ZV9wZml0X2Rpc2FibGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwpAQCAtNDUzMiw3ICs0NTYzLDEwIEBAIHN0YXRp YyB2b2lkIGhhc3dlbGxfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCWlu dGVsX2RkaV9kaXNhYmxlX3RyYW5zY29kZXJfZnVuYyhkZXZfcHJpdiwgY3B1X3RyYW5zY29kZXIp OwogCi0JaXJvbmxha2VfcGZpdF9kaXNhYmxlKGludGVsX2NydGMpOworCWlmIChJU19TS1lMQUtF KGRldikpCisJCXNreWxha2VfcGZpdF9kaXNhYmxlKGludGVsX2NydGMpOworCWVsc2UKKwkJaXJv bmxha2VfcGZpdF9kaXNhYmxlKGludGVsX2NydGMpOwogCiAJaW50ZWxfZGRpX2Rpc2FibGVfcGlw ZV9jbG9jayhpbnRlbF9jcnRjKTsKIApAQCAtNzU0Nyw2ICs3NTgxLDIyIEBAIHN0YXRpYyB2b2lk IGlyb25sYWtlX2dldF9mZGlfbV9uX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJ CQkgICAgICZwaXBlX2NvbmZpZy0+ZmRpX21fbiwgTlVMTCk7CiB9CiAKK3N0YXRpYyB2b2lkIHNr eWxha2VfZ2V0X3BmaXRfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAorCQkJCSAgICBz dHJ1Y3QgaW50ZWxfY3J0Y19jb25maWcgKnBpcGVfY29uZmlnKQoreworCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOworCXVpbnQzMl90IHRtcDsKKworCXRtcCA9IEk5MTVf UkVBRChQU19DVEwoY3J0Yy0+cGlwZSkpOworCisJaWYgKHRtcCAmIFBTX0VOQUJMRSkgeworCQlw aXBlX2NvbmZpZy0+cGNoX3BmaXQuZW5hYmxlZCA9IHRydWU7CisJCXBpcGVfY29uZmlnLT5wY2hf cGZpdC5wb3MgPSBJOTE1X1JFQUQoUFNfV0lOX1BPUyhjcnRjLT5waXBlKSk7CisJCXBpcGVfY29u ZmlnLT5wY2hfcGZpdC5zaXplID0gSTkxNV9SRUFEKFBTX1dJTl9TWihjcnRjLT5waXBlKSk7CisJ fQorfQorCiBzdGF0aWMgdm9pZCBpcm9ubGFrZV9nZXRfcGZpdF9jb25maWcoc3RydWN0IGludGVs X2NydGMgKmNydGMsCiAJCQkJICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19jb25maWcgKnBpcGVfY29u ZmlnKQogewpAQCAtODA2NSw4ICs4MTE1LDEyIEBAIHN0YXRpYyBib29sIGhhc3dlbGxfZ2V0X3Bp cGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCWludGVsX2dldF9waXBlX3RpbWlu Z3MoY3J0YywgcGlwZV9jb25maWcpOwogCiAJcGZpdF9kb21haW4gPSBQT1dFUl9ET01BSU5fUElQ RV9QQU5FTF9GSVRURVIoY3J0Yy0+cGlwZSk7Ci0JaWYgKGludGVsX2Rpc3BsYXlfcG93ZXJfaXNf ZW5hYmxlZChkZXZfcHJpdiwgcGZpdF9kb21haW4pKQotCQlpcm9ubGFrZV9nZXRfcGZpdF9jb25m aWcoY3J0YywgcGlwZV9jb25maWcpOworCWlmIChpbnRlbF9kaXNwbGF5X3Bvd2VyX2lzX2VuYWJs ZWQoZGV2X3ByaXYsIHBmaXRfZG9tYWluKSkgeworCQlpZiAoSVNfU0tZTEFLRShkZXYpKQorCQkJ c2t5bGFrZV9nZXRfcGZpdF9jb25maWcoY3J0YywgcGlwZV9jb25maWcpOworCQllbHNlCisJCQlp cm9ubGFrZV9nZXRfcGZpdF9jb25maWcoY3J0YywgcGlwZV9jb25maWcpOworCX0KIAogCWlmIChJ U19IQVNXRUxMKGRldikpCiAJCXBpcGVfY29uZmlnLT5pcHNfZW5hYmxlZCA9IGhzd19jcnRjX3N1 cHBvcnRzX2lwcyhjcnRjKSAmJgotLSAKMS44LjMuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK