From: Jackie Li Subject: [PATCH v4 1/4] drm/i915: Always do WOPCM partitioning based on real firmware sizes Date: Wed, 18 Apr 2018 10:01:31 -0700 Message-ID: <1524070894-8120-1-git-send-email-yaodong.li@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id AFE776E0BC for ; Wed, 18 Apr 2018 17:03:55 +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 List-Id: intel-gfx@lists.freedesktop.org QWZ0ZXIgZW5hYmxlZCB0aGUgV09QQ00gd3JpdGUtb25jZSByZWdpc3RlcnMgbG9ja2luZyBzdGF0 dXMgY2hlY2tpbmcsCnJlbG9hZGluZyBvZiB0aGUgaTkxNSBtb2R1bGUgd2lsbCBmYWlsIHdpdGgg bW9kcGFyYW0gZW5hYmxlX2d1YyBzZXQgdG8gMwooZW5hYmxlIEd1QyBhbmQgSHVDIGZpcm13YXJl IGxvYWRpbmcpIGlmIHRoZSBtb2R1bGUgd2FzIG9yaWdpbmFsbHkgbG9hZGVkCndpdGggZW5hYmxl X2d1YyBzZXQgdG8gMSAob25seSBlbmFibGUgR3VDIGZpcm13YXJlIGxvYWRpbmcpLiBUaGlzIGlz CmJlY2F1c2UgV09QQ00gcmVnaXN0ZXJzIHdlcmUgdXBkYXRlZCBhbmQgbG9ja2VkIHdpdGhvdXQg Y29uc2lkZXJpbmcgdGhlIEh1QwpGVyBzaXplLiBTaW5jZSB3ZSBuZWVkIGJvdGggR3VDIGFuZCBI dUMgRlcgc2l6ZXMgdG8gZGV0ZXJtaW5lIHRoZSBmaW5hbApsYXlvdXQgb2YgV09QQ00sIHdlIHNo b3VsZCBhbHdheXMgY2FsY3VsYXRlIHRoZSBXT1BDTSBsYXlvdXQgYmFzZWQgb24gdGhlCmFjdHVh bCBzaXplcyBvZiB0aGUgR3VDIGFuZCBIdUMgZmlybXdhcmUgYXZhaWxhYmxlIGZvciBhIHNwZWNp ZmljIHBsYXRmb3JtCmlmIHdlIG5lZWQgY29udGludWUgdG8gc3VwcG9ydCBlbmFibGUvZGlzYWJs ZSBIdUMgRlcgbG9hZGluZyBkeW5hbWljYWxseQp3aXRoIGVuYWJsZV9ndWMgbW9kcGFyYW0uCgpU aGlzIHBhdGNoIHNwbGl0cyB1QyBmaXJtd2FyZSBmZXRjaGluZyBpbnRvIHR3byBzdGFnZXMuIEZp cnN0IHN0YWdlIGlzIHRvCmZldGNoIHRoZSBmaXJtd2FyZSBpbWFnZSBhbmQgdmVyaWZ5IHRoZSBm aXJtd2FyZSBoZWFkZXIuIHVDIGZpcm13YXJlIHdpbGwKYmUgbWFya2VkIGFzIHZlcmlmaWVkIGFu ZCB0aGlzIHdpbGwgbWFrZSBGVyBpbmZvIGF2YWlsYWJsZSBmb3IgZm9sbG93aW5nCldPUENNIGxh eW91dCBjYWxjdWxhdGlvbi4gVGhlIHNlY29uZCBzdGFnZSBpcyB0byBjcmVhdGUgYSBHRU0gb2Jq ZWN0IGFuZApjb3B5IHRoZSBGVyBkYXRhIGludG8gdGhlIGNyZWF0ZWQgR0VNIG9iamVjdCB3aGlj aCB3aWxsIG9ubHkgYmUgYXZhaWxhYmxlCndoZW4gR3VDL0h1QyBsb2FkaW5nIGlzIGVuYWJsZWQg YnkgZW5hYmxlX2d1YyBtb2RwYXJhbS4gVGhpcyB3aWxsIGd1YXJhbnRlZQp0aGF0IHRoZSBXT1BD TSBsYXlvdXQgd2lsbCBiZSBhbHdheXMgYmUgY2FsY3VsYXRlZCBjb3JyZWN0bHkgd2l0aG91dCBt YWtpbmcKYW55IGFzc3VtcHRpb25zIHRvIHRoZSBHdUMgYW5kIEh1QyBmaXJtd2FyZSBzaXplcy4K CnYzOgogLSBSZWJhc2UKCnY0OgogLSBSZW5hbWVkIHRoZSBuZXcgcGFyYW1ldGVyIGFkZCB0byBp bnRlbF91Y19md19mZXRjaCAoTWljaGFsKQoKU2lnbmVkLW9mZi1ieTogSmFja2llIExpIDx5YW9k b25nLmxpQGludGVsLmNvbT4KQ2M6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53YWpkZWN6a29A aW50ZWwuY29tPgpDYzogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNv bT4KQ2M6IE1pY2hhbCBXaW5pYXJza2kgPG1pY2hhbC53aW5pYXJza2lAaW50ZWwuY29tPgpDYzog Sm9obiBTcG90c3dvb2QgPGpvaG4uYS5zcG90c3dvb2RAaW50ZWwuY29tPgpDYzogSm9vbmFzIExh aHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogSm9o biBTcG90c3dvb2QgPGpvaG4uYS5zcG90c3dvb2RAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VjLmMgICAgfCAxNCArKysrLS0tLS0tLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfdWNfZncuYyB8IDMxICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjX2Z3LmggfCAgNyArKysrKy0tCiAzIGZp bGVzIGNoYW5nZWQsIDI5IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF91Yy5jCmluZGV4IDFjZmZhZjcuLjczYjhmNmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3VjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf dWMuYwpAQCAtMTcyLDExICsxNzIsOCBAQCB2b2lkIGludGVsX3VjX2luaXRfZWFybHkoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiAKIAlzYW5pdGl6ZV9vcHRpb25zX2Vhcmx5KGk5MTUp OwogCi0JaWYgKFVTRVNfR1VDKGk5MTUpKQotCQlpbnRlbF91Y19md19mZXRjaChpOTE1LCAmZ3Vj LT5mdyk7Ci0KLQlpZiAoVVNFU19IVUMoaTkxNSkpCi0JCWludGVsX3VjX2Z3X2ZldGNoKGk5MTUs ICZodWMtPmZ3KTsKKwlpbnRlbF91Y19md19mZXRjaChpOTE1LCAmZ3VjLT5mdywgVVNFU19HVUMo aTkxNSkpOworCWludGVsX3VjX2Z3X2ZldGNoKGk5MTUsICZodWMtPmZ3LCBVU0VTX0hVQyhpOTE1 KSk7CiB9CiAKIHZvaWQgaW50ZWxfdWNfY2xlYW51cF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqaTkxNSkKQEAgLTE4NCwxMSArMTgxLDggQEAgdm9pZCBpbnRlbF91Y19jbGVhbnVwX2Vh cmx5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogCXN0cnVjdCBpbnRlbF9ndWMgKmd1 YyA9ICZpOTE1LT5ndWM7CiAJc3RydWN0IGludGVsX2h1YyAqaHVjID0gJmk5MTUtPmh1YzsKIAot CWlmIChVU0VTX0hVQyhpOTE1KSkKLQkJaW50ZWxfdWNfZndfZmluaSgmaHVjLT5mdyk7Ci0KLQlp ZiAoVVNFU19HVUMoaTkxNSkpCi0JCWludGVsX3VjX2Z3X2ZpbmkoJmd1Yy0+ZncpOworCWludGVs X3VjX2Z3X2ZpbmkoJmh1Yy0+ZncpOworCWludGVsX3VjX2Z3X2ZpbmkoJmd1Yy0+ZncpOwogCiAJ Z3VjX2ZyZWVfbG9hZF9lcnJfbG9nKGd1Yyk7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF91Y19mdy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWNfZncu YwppbmRleCA2ZThlMGI1Li5jMWZlZDA2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF91Y19mdy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjX2Z3LmMK QEAgLTMzLDExICszMywxMyBAQAogICoKICAqIEBkZXZfcHJpdjogZGV2aWNlIHByaXZhdGUKICAq IEB1Y19mdzogdUMgZmlybXdhcmUKKyAqIEBmZXRjaDogd2hldGhlciBmZXRjaCB1QyBmaXJtd2Fy ZSBpbnRvIEdFTSBvYmplY3Qgb3Igbm90CiAgKgotICogRmV0Y2ggdUMgZmlybXdhcmUgaW50byBH RU0gb2JqLgorICogRmV0Y2ggYW5kIHZlcmlmeSB1QyBmaXJtd2FyZSBhbmQgY29weSBmaXJtd2Fy ZSBkYXRhIGludG8gR0VNIG9iamVjdCBpZgorICogQGZldGNoIGlzIHRydWUuCiAgKi8KIHZvaWQg aW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkg ICAgICAgc3RydWN0IGludGVsX3VjX2Z3ICp1Y19mdykKKwkJICAgICAgIHN0cnVjdCBpbnRlbF91 Y19mdyAqdWNfZncsIGJvb2wgZmV0Y2gpCiB7CiAJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBkZXZf cHJpdi0+ZHJtLnBkZXY7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKQEAgLTE1 NCwxNyArMTU2LDI0IEBAIHZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAogCQlnb3RvIGZhaWw7CiAJfQogCi0Jb2JqID0gaTkxNV9nZW1fb2Jq ZWN0X2NyZWF0ZV9mcm9tX2RhdGEoZGV2X3ByaXYsIGZ3LT5kYXRhLCBmdy0+c2l6ZSk7Ci0JaWYg KElTX0VSUihvYmopKSB7Ci0JCWVyciA9IFBUUl9FUlIob2JqKTsKLQkJRFJNX0RFQlVHX0RSSVZF UigiJXMgZncgb2JqZWN0X2NyZWF0ZSBlcnI9JWRcbiIsCi0JCQkJIGludGVsX3VjX2Z3X3R5cGVf cmVwcih1Y19mdy0+dHlwZSksIGVycik7Ci0JCWdvdG8gZmFpbDsKKwl1Y19mdy0+c2l6ZSA9IGZ3 LT5zaXplOworCXVjX2Z3LT5mZXRjaF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9WRVJJRklF RDsKKworCWlmIChmZXRjaCkgeworCQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX2Zyb21f ZGF0YShkZXZfcHJpdiwgZnctPmRhdGEsCisJCQkJCQkgICAgICAgZnctPnNpemUpOworCQlpZiAo SVNfRVJSKG9iaikpIHsKKwkJCWVyciA9IFBUUl9FUlIob2JqKTsKKwkJCURSTV9ERUJVR19EUklW RVIoIiVzIGZ3IG9iamVjdF9jcmVhdGUgZXJyPSVkXG4iLAorCQkJCQkgaW50ZWxfdWNfZndfdHlw ZV9yZXByKHVjX2Z3LT50eXBlKSwKKwkJCQkJIGVycik7CisJCQlnb3RvIGZhaWw7CisJCX0KKwor CQl1Y19mdy0+b2JqID0gb2JqOworCQl1Y19mdy0+ZmV0Y2hfc3RhdHVzID0gSU5URUxfVUNfRklS TVdBUkVfU1VDQ0VTUzsKIAl9CiAKLQl1Y19mdy0+b2JqID0gb2JqOwotCXVjX2Z3LT5zaXplID0g ZnctPnNpemU7Ci0JdWNfZnctPmZldGNoX3N0YXR1cyA9IElOVEVMX1VDX0ZJUk1XQVJFX1NVQ0NF U1M7CiAJRFJNX0RFQlVHX0RSSVZFUigiJXMgZncgZmV0Y2ggJXNcbiIsCiAJCQkgaW50ZWxfdWNf ZndfdHlwZV9yZXByKHVjX2Z3LT50eXBlKSwKIAkJCSBpbnRlbF91Y19md19zdGF0dXNfcmVwcih1 Y19mdy0+ZmV0Y2hfc3RhdHVzKSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF91Y19mdy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWNfZncuaAppbmRleCBk YzMzYjEyLi5hMTMwOGMwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91 Y19mdy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjX2Z3LmgKQEAgLTM2LDYg KzM2LDcgQEAgZW51bSBpbnRlbF91Y19md19zdGF0dXMgewogCUlOVEVMX1VDX0ZJUk1XQVJFX0ZB SUwgPSAtMSwKIAlJTlRFTF9VQ19GSVJNV0FSRV9OT05FID0gMCwKIAlJTlRFTF9VQ19GSVJNV0FS RV9QRU5ESU5HLAorCUlOVEVMX1VDX0ZJUk1XQVJFX1ZFUklGSUVELAogCUlOVEVMX1VDX0ZJUk1X QVJFX1NVQ0NFU1MKIH07CiAKQEAgLTg0LDYgKzg1LDggQEAgY29uc3QgY2hhciAqaW50ZWxfdWNf Zndfc3RhdHVzX3JlcHIoZW51bSBpbnRlbF91Y19md19zdGF0dXMgc3RhdHVzKQogCQlyZXR1cm4g Ik5PTkUiOwogCWNhc2UgSU5URUxfVUNfRklSTVdBUkVfUEVORElORzoKIAkJcmV0dXJuICJQRU5E SU5HIjsKKwljYXNlIElOVEVMX1VDX0ZJUk1XQVJFX1ZFUklGSUVEOgorCQlyZXR1cm4gIlZFUklG SUVEIjsKIAljYXNlIElOVEVMX1VDX0ZJUk1XQVJFX1NVQ0NFU1M6CiAJCXJldHVybiAiU1VDQ0VT UyI7CiAJfQpAQCAtMTMxLDE0ICsxMzQsMTQgQEAgc3RhdGljIGlubGluZSB2b2lkIGludGVsX3Vj X2Z3X3Nhbml0aXplKHN0cnVjdCBpbnRlbF91Y19mdyAqdWNfZncpCiAgKi8KIHN0YXRpYyBpbmxp bmUgdTMyIGludGVsX3VjX2Z3X2dldF91cGxvYWRfc2l6ZShzdHJ1Y3QgaW50ZWxfdWNfZncgKnVj X2Z3KQogewotCWlmICh1Y19mdy0+ZmV0Y2hfc3RhdHVzICE9IElOVEVMX1VDX0ZJUk1XQVJFX1NV Q0NFU1MpCisJaWYgKHVjX2Z3LT5mZXRjaF9zdGF0dXMgPCBJTlRFTF9VQ19GSVJNV0FSRV9WRVJJ RklFRCkKIAkJcmV0dXJuIDA7CiAKIAlyZXR1cm4gdWNfZnctPmhlYWRlcl9zaXplICsgdWNfZnct PnVjb2RlX3NpemU7CiB9CiAKIHZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAotCQkgICAgICAgc3RydWN0IGludGVsX3VjX2Z3ICp1Y19mdyk7 CisJCSAgICAgICBzdHJ1Y3QgaW50ZWxfdWNfZncgKnVjX2Z3LCBib29sIGZldGNoKTsKIGludCBp bnRlbF91Y19md191cGxvYWQoc3RydWN0IGludGVsX3VjX2Z3ICp1Y19mdywKIAkJICAgICAgIGlu dCAoKnhmZXIpKHN0cnVjdCBpbnRlbF91Y19mdyAqdWNfZncsCiAJCQkJICAgc3RydWN0IGk5MTVf dm1hICp2bWEpKTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK