From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 946A0C47258 for ; Mon, 4 May 2020 22:52:49 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6DB2B206EB for ; Mon, 4 May 2020 22:52:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DB2B206EB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4C3F86E4C1; Mon, 4 May 2020 22:52:43 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id CCF2D6E0D6 for ; Mon, 4 May 2020 22:52:41 +0000 (UTC) IronPort-SDR: /99napivueleIribnM6Y1gWgacDQW+/CSUCC9MtpevBnFefPUTCEJmOPYLUnh0BzdzAQPc9Vsw LaZ1Cxm6Vsmg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 May 2020 15:52:41 -0700 IronPort-SDR: GUXYLogUc49pD69V9OxSn0tP8owGajLsN7TCdO/6B1FjoQAOZHp41BBUuPJ0swtQNFHW7NVlO5 xLx2waKhsuFQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,353,1583222400"; d="scan'208";a="295646718" Received: from mdroper-desk1.fm.intel.com ([10.1.27.64]) by orsmga008.jf.intel.com with ESMTP; 04 May 2020 15:52:41 -0700 From: Matt Roper To: intel-gfx@lists.freedesktop.org Date: Mon, 4 May 2020 15:52:12 -0700 Message-Id: <20200504225227.464666-8-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200504225227.464666-1-matthew.d.roper@intel.com> References: <20200504225227.464666-1-matthew.d.roper@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v2 07/22] drm/i915/rkl: Limit number of universal planes to 5 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" UktMIG9ubHkgaGFzIGZpdmUgdW5pdmVyc2FsIHBsYW5lcywgcGx1cyBhIGN1cnNvci4gIFNpbmNl IHRoZQpib3R0b20tbW9zdCB1bml2ZXJzYWwgcGxhbmUgaXMgY29uc2lkZXJlZCB0aGUgcHJpbWFy eSBwbGFuZSwgc2V0IHRoZQpudW1iZXIgb2Ygc3ByaXRlcyBhdmFpbGFibGUgb24gdGhpcyBwbGF0 Zm9ybSB0byA0LgoKSW4gZ2VuZXJhbCwgdGhlIHBsYW5lIGNhcGFiaWxpdGllcyBvZiB0aGUgcmVt YWluaW5nIHBsYW5lcyBzdGF5IHRoZSBzYW1lCmFzIFRHTC4gIEhvd2V2ZXIgdGhlIE5WMTIgWS1w bGFuZSBzdXBwb3J0IG1vdmVzIGRvd24gdG8gdGhlIG5ldyB0b3AgdHdvCnBsYW5lcyBhbmQgbm93 IG9ubHkgdGhlIGJvdHRvbSB0aHJlZSBwbGFuZXMgY2FuIGJlIHVzZWQgZm9yIE5WMTIgVVYuCgpC c3BlYzogNDkxODEKQnNwZWM6IDQ5MjUxCkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmph bGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQu cm9wZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxf ZGlzcGxheS5jIHwgIDYgKysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVs X3Nwcml0ZS5jICB8IDE3ICsrKysrKysrKysrKysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9k aXNwbGF5L2ludGVsX3Nwcml0ZS5oICB8IDExICsrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2lycS5jICAgICAgICAgICAgICB8ICA0ICsrKy0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfcmVnLmggICAgICAgICAgICAgIHwgIDUgKysrKysKIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RldmljZV9pbmZvLmMgICAgIHwgIDUgKysrKy0KIDYgZmlsZXMgY2hhbmdlZCwg MzUgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYwppbmRleCBmZDZkNjNiMDM0ODkuLjdkN2E1YjY2ZjJj YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5 LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKQEAg LTEyNTAwLDcgKzEyNTAwLDcgQEAgc3RhdGljIGludCBpY2xfY2hlY2tfbnYxMl9wbGFuZXMoc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJCQljb250aW51ZTsKIAogCQlmb3Jf ZWFjaF9pbnRlbF9wbGFuZV9vbl9jcnRjKCZkZXZfcHJpdi0+ZHJtLCBjcnRjLCBsaW5rZWQpIHsK LQkJCWlmICghaWNsX2lzX252MTJfeV9wbGFuZShsaW5rZWQtPmlkKSkKKwkJCWlmICghaWNsX2lz X252MTJfeV9wbGFuZShkZXZfcHJpdiwgbGlua2VkLT5pZCkpCiAJCQkJY29udGludWU7CiAKIAkJ CWlmIChjcnRjX3N0YXRlLT5hY3RpdmVfcGxhbmVzICYgQklUKGxpbmtlZC0+aWQpKQpAQCAtMTI1 NDYsNiArMTI1NDYsMTAgQEAgc3RhdGljIGludCBpY2xfY2hlY2tfbnYxMl9wbGFuZXMoc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJCQkJcGxhbmVfc3RhdGUtPmN1c19jdGwg fD0gUExBTkVfQ1VTX1BMQU5FXzc7CiAJCQllbHNlIGlmIChsaW5rZWQtPmlkID09IFBMQU5FX1NQ UklURTQpCiAJCQkJcGxhbmVfc3RhdGUtPmN1c19jdGwgfD0gUExBTkVfQ1VTX1BMQU5FXzY7CisJ CQllbHNlIGlmIChsaW5rZWQtPmlkID09IFBMQU5FX1NQUklURTMpCisJCQkJcGxhbmVfc3RhdGUt PmN1c19jdGwgfD0gUExBTkVfQ1VTX1BMQU5FXzVfUktMOworCQkJZWxzZSBpZiAobGlua2VkLT5p ZCA9PSBQTEFORV9TUFJJVEUyKQorCQkJCXBsYW5lX3N0YXRlLT5jdXNfY3RsIHw9IFBMQU5FX0NV U19QTEFORV80X1JLTDsKIAkJCWVsc2UKIAkJCQlNSVNTSU5HX0NBU0UobGlua2VkLT5pZCk7CiAJ CX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfc3ByaXRl LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX3Nwcml0ZS5jCmluZGV4IDAw MDBlYzcwNTVmNy4uNTcxYzM2ZjkyOWJkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9kaXNwbGF5L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3Bs YXkvaW50ZWxfc3ByaXRlLmMKQEAgLTMzMyw2ICszMzMsMjEgQEAgaW50IGludGVsX3BsYW5lX2No ZWNrX3NyY19jb29yZGluYXRlcyhzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRl KQogCXJldHVybiAwOwogfQogCitzdGF0aWMgdTggaWNsX252MTJfeV9wbGFuZV9tYXNrKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICppOTE1KQoreworCWlmIChJU19ST0NLRVRMQUtFKGk5MTUpKQor CQlyZXR1cm4gQklUKFBMQU5FX1NQUklURTIpIHwgQklUKFBMQU5FX1NQUklURTMpOworCWVsc2UK KwkJcmV0dXJuIEJJVChQTEFORV9TUFJJVEU0KSB8IEJJVChQTEFORV9TUFJJVEU1KTsKK30KKwor Ym9vbCBpY2xfaXNfbnYxMl95X3BsYW5lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKKwkJCSBlbnVtIHBsYW5lX2lkIHBsYW5lX2lkKQoreworCXJldHVybiBJTlRFTF9HRU4oZGV2 X3ByaXYpID49IDExICYmCisJCWljbF9udjEyX3lfcGxhbmVfbWFzayhkZXZfcHJpdikgJiBCSVQo cGxhbmVfaWQpOworfQorCiBib29sIGljbF9pc19oZHJfcGxhbmUoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LCBlbnVtIHBsYW5lX2lkIHBsYW5lX2lkKQogewogCXJldHVybiBJTlRF TF9HRU4oZGV2X3ByaXYpID49IDExICYmCkBAIC0zMDAzLDcgKzMwMTgsNyBAQCBzdGF0aWMgY29u c3QgdTMyICppY2xfZ2V0X3BsYW5lX2Zvcm1hdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAogCWlmIChpY2xfaXNfaGRyX3BsYW5lKGRldl9wcml2LCBwbGFuZV9pZCkpIHsKIAkJ Km51bV9mb3JtYXRzID0gQVJSQVlfU0laRShpY2xfaGRyX3BsYW5lX2Zvcm1hdHMpOwogCQlyZXR1 cm4gaWNsX2hkcl9wbGFuZV9mb3JtYXRzOwotCX0gZWxzZSBpZiAoaWNsX2lzX252MTJfeV9wbGFu ZShwbGFuZV9pZCkpIHsKKwl9IGVsc2UgaWYgKGljbF9pc19udjEyX3lfcGxhbmUoZGV2X3ByaXYs IHBsYW5lX2lkKSkgewogCQkqbnVtX2Zvcm1hdHMgPSBBUlJBWV9TSVpFKGljbF9zZHJfeV9wbGFu ZV9mb3JtYXRzKTsKIAkJcmV0dXJuIGljbF9zZHJfeV9wbGFuZV9mb3JtYXRzOwogCX0gZWxzZSB7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX3Nwcml0ZS5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9zcHJpdGUuaAppbmRleCA1ZWVh YTkyNDIwZDEuLmNkMjEwNGJhMWNhMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv ZGlzcGxheS9pbnRlbF9zcHJpdGUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX3Nwcml0ZS5oCkBAIC0zMiwyMSArMzIsMTQgQEAgc3RydWN0IGludGVsX3BsYW5lICoK IHNrbF91bml2ZXJzYWxfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKIAkJCSAgIGVudW0gcGlwZSBwaXBlLCBlbnVtIHBsYW5lX2lkIHBsYW5lX2lkKTsKIAot c3RhdGljIGlubGluZSBib29sIGljbF9pc19udjEyX3lfcGxhbmUoZW51bSBwbGFuZV9pZCBpZCkK LXsKLQkvKiBEb24ndCBuZWVkIHRvIGRvIGEgZ2VuIGNoZWNrLCB0aGVzZSBwbGFuZXMgYXJlIG9u bHkgYXZhaWxhYmxlIG9uIGdlbjExICovCi0JaWYgKGlkID09IFBMQU5FX1NQUklURTQgfHwgaWQg PT0gUExBTkVfU1BSSVRFNSkKLQkJcmV0dXJuIHRydWU7Ci0KLQlyZXR1cm4gZmFsc2U7Ci19Ci0K IHN0YXRpYyBpbmxpbmUgdTggaWNsX2hkcl9wbGFuZV9tYXNrKHZvaWQpCiB7CiAJcmV0dXJuIEJJ VChQTEFORV9QUklNQVJZKSB8CiAJCUJJVChQTEFORV9TUFJJVEUwKSB8IEJJVChQTEFORV9TUFJJ VEUxKTsKIH0KIAorYm9vbCBpY2xfaXNfbnYxMl95X3BsYW5lKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKKwkJCSBlbnVtIHBsYW5lX2lkIHBsYW5lX2lkKTsKIGJvb2wgaWNsX2lz X2hkcl9wbGFuZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcGxhbmVf aWQgcGxhbmVfaWQpOwogCiBpbnQgaXZiX3BsYW5lX21pbl9jZGNsayhjb25zdCBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4IGJk NzIyZDA2NTBjOC4uNjIyOTg2NzU5ZWM2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTIy MjEsNyArMjIyMSw5IEBAIHN0YXRpYyB1MzIgZ2VuOF9kZV9wb3J0X2F1eF9tYXNrKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogc3RhdGljIHUzMiBnZW44X2RlX3BpcGVfZmF1 bHRfbWFzayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0JaWYgKElOVEVM X0dFTihkZXZfcHJpdikgPj0gMTEpCisJaWYgKElTX1JPQ0tFVExBS0UoZGV2X3ByaXYpKQorCQly ZXR1cm4gUktMX0RFX1BJUEVfSVJRX0ZBVUxUX0VSUk9SUzsKKwllbHNlIGlmIChJTlRFTF9HRU4o ZGV2X3ByaXYpID49IDExKQogCQlyZXR1cm4gR0VOMTFfREVfUElQRV9JUlFfRkFVTFRfRVJST1JT OwogCWVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkKIAkJcmV0dXJuIEdFTjlfREVf UElQRV9JUlFfRkFVTFRfRVJST1JTOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggZmQ5ZjI5 MDRkOTNjLi41OWMxZDUyN2NmMTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtNjkwNyw2 ICs2OTA3LDggQEAgZW51bSB7CiAjZGVmaW5lIF9QTEFORV9DVVNfQ1RMXzFfQQkJCTB4NzAxYzgK ICNkZWZpbmUgX1BMQU5FX0NVU19DVExfMl9BCQkJMHg3MDJjOAogI2RlZmluZSAgUExBTkVfQ1VT X0VOQUJMRQkJCSgxIDw8IDMxKQorI2RlZmluZSAgUExBTkVfQ1VTX1BMQU5FXzRfUktMCQkJKDAg PDwgMzApCisjZGVmaW5lICBQTEFORV9DVVNfUExBTkVfNV9SS0wJCQkoMSA8PCAzMCkKICNkZWZp bmUgIFBMQU5FX0NVU19QTEFORV82CQkJKDAgPDwgMzApCiAjZGVmaW5lICBQTEFORV9DVVNfUExB TkVfNwkJCSgxIDw8IDMwKQogI2RlZmluZSAgUExBTkVfQ1VTX0hQSEFTRV9TSUdOX05FR0FUSVZF CQkoMSA8PCAxOSkKQEAgLTc1NzMsNiArNzU3NSw5IEBAIGVudW0gewogCSBHRU4xMV9QSVBFX1BM QU5FN19GQVVMVCB8IFwKIAkgR0VOMTFfUElQRV9QTEFORTZfRkFVTFQgfCBcCiAJIEdFTjExX1BJ UEVfUExBTkU1X0ZBVUxUKQorI2RlZmluZSBSS0xfREVfUElQRV9JUlFfRkFVTFRfRVJST1JTIFwK KwkoR0VOOV9ERV9QSVBFX0lSUV9GQVVMVF9FUlJPUlMgfCBcCisJIEdFTjExX1BJUEVfUExBTkU1 X0ZBVUxUKQogCiAjZGVmaW5lIEdFTjhfREVfUE9SVF9JU1IgX01NSU8oMHg0NDQ0MCkKICNkZWZp bmUgR0VOOF9ERV9QT1JUX0lNUiBfTU1JTygweDQ0NDQ0KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGV2aWNlX2luZm8uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RldmljZV9pbmZvLmMKaW5kZXggOTg2MmMxMTg1MDU5Li5hNWE5MmMyNzI4ZGIgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RldmljZV9pbmZvLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGV2aWNlX2luZm8uYwpAQCAtOTM0LDcgKzkzNCwxMCBA QCB2b2lkIGludGVsX2RldmljZV9pbmZvX3J1bnRpbWVfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAKIAlCVUlMRF9CVUdfT04oQklUU19QRVJfVFlQRShpbnRlbF9lbmdp bmVfbWFza190KSA8IEk5MTVfTlVNX0VOR0lORVMpOwogCi0JaWYgKElOVEVMX0dFTihkZXZfcHJp dikgPj0gMTEpCisJaWYgKElTX1JPQ0tFVExBS0UoZGV2X3ByaXYpKQorCQlmb3JfZWFjaF9waXBl KGRldl9wcml2LCBwaXBlKQorCQkJcnVudGltZS0+bnVtX3Nwcml0ZXNbcGlwZV0gPSA0OworCWVs c2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEpCiAJCWZvcl9lYWNoX3BpcGUoZGV2X3By aXYsIHBpcGUpCiAJCQlydW50aW1lLT5udW1fc3ByaXRlc1twaXBlXSA9IDY7CiAJZWxzZSBpZiAo SVNfR0VOKGRldl9wcml2LCAxMCkgfHwgSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpCi0tIAoyLjI0 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=