From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: [PATCH 1/2] drm/i915: Store edram capabilities instead of fixed size Date: Fri, 8 Jan 2016 18:58:44 +0200 Message-ID: <1452272325-14976-1-git-send-email-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id BC3006E7D9 for ; Fri, 8 Jan 2016 08:58:07 -0800 (PST) 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 U3RvcmUgdGhlIGVkcmFtIGNhcGFiaWxpdGllcyBpbnN0ZWFkIG9mIG9ubHkgdGhlIHNpemUgb2YK ZWRyYW0uIFRoaXMgaXMgcHJlcGFyYXRvcnkgcGF0Y2ggdG8gYWxsb3cgZWRyYW0gc2l6ZSBjYWxj dWxhdGlvbgpiYXNlZCBvbiBlZHJhbSBjYXBhYmlsaXR5IGJpdHMgZm9yIGdlbjkrLgoKU2lnbmVk LW9mZi1ieTogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgfCAgMiArLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCAgICAgfCAgNyArKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu YyB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oICAgICB8ICAyICstCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8IDM5ICsrKysrKysrKysrKysrKysr KysrKysrKystLS0tLS0tLS0tLS0KIDYgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwg MTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCBlMzM3 N2FiYzBkNGQuLjAzOWFjZTZlNDUyNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMK QEAgLTI0MDEsNyArMjQwMSw3IEBAIHN0YXRpYyBpbnQgaTkxNV9sbGMoc3RydWN0IHNlcV9maWxl ICptLCB2b2lkICpkYXRhKQogCiAJLyogU2l6ZSBjYWxjdWxhdGlvbiBmb3IgTExDIGlzIGEgYml0 IG9mIGEgcGFpbi4gSWdub3JlIGZvciBub3cuICovCiAJc2VxX3ByaW50ZihtLCAiTExDOiAlc1xu IiwgeWVzbm8oSEFTX0xMQyhkZXYpKSk7Ci0Jc2VxX3ByaW50ZihtLCAiZUxMQzogJXp1TUJcbiIs IGRldl9wcml2LT5lbGxjX3NpemUpOworCXNlcV9wcmludGYobSwgImVMTEM6ICV6dU1CXG4iLCBp bnRlbF91bmNvcmVfZWRyYW1fc2l6ZV9tYihkZXZfcHJpdikpOwogCiAJcmV0dXJuIDA7CiB9CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA2ZWYwM2VlYTM1MTguLmM4MWY1MzdiMmRhNyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0xODQ2LDcgKzE4NDYsNyBAQCBzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSB7CiAJc3RydWN0IGludGVsX2wzX3Bhcml0eSBsM19wYXJpdHk7CiAKIAkvKiBD YW5ub3QgYmUgZGV0ZXJtaW5lZCBieSBQQ0lJRC4gWW91IG11c3QgYWx3YXlzIHJlYWQgYSByZWdp c3Rlci4gKi8KLQlzaXplX3QgZWxsY19zaXplOworCXUzMiBlZHJhbV9jYXA7CiAKIAkvKiBnZW42 KyBycHMgc3RhdGUgKi8KIAlzdHJ1Y3QgaW50ZWxfZ2VuNl9wb3dlcl9tZ210IHJwczsKQEAgLTI1 NjcsOCArMjU2Nyw5IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogI2RlZmluZSBIQVNf QkxUKGRldikJCShJTlRFTF9JTkZPKGRldiktPnJpbmdfbWFzayAmIEJMVF9SSU5HKQogI2RlZmlu ZSBIQVNfVkVCT1goZGV2KQkJKElOVEVMX0lORk8oZGV2KS0+cmluZ19tYXNrICYgVkVCT1hfUklO RykKICNkZWZpbmUgSEFTX0xMQyhkZXYpCQkoSU5URUxfSU5GTyhkZXYpLT5oYXNfbGxjKQorI2Rl ZmluZSBIQVNfRURSQU0oZGV2KQkJKF9fSTkxNV9fKGRldiktPmVkcmFtX2NhcCAmIEVEUkFNX0VO QUJMRUQpCiAjZGVmaW5lIEhBU19XVChkZXYpCQkoKElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9B RFdFTEwoZGV2KSkgJiYgXAotCQkJCSBfX0k5MTVfXyhkZXYpLT5lbGxjX3NpemUpCisJCQkJIEhB U19FRFJBTShkZXYpKQogI2RlZmluZSBJOTE1X05FRURfR0ZYX0hXUyhkZXYpCShJTlRFTF9JTkZP KGRldiktPm5lZWRfZ2Z4X2h3cykKIAogI2RlZmluZSBIQVNfSFdfQ09OVEVYVFMoZGV2KQkoSU5U RUxfSU5GTyhkZXYpLT5nZW4gPj0gNikKQEAgLTI3MzUsNiArMjczNiw4IEBAIHZvaWQgaW50ZWxf dW5jb3JlX2ZvcmNld2FrZV9nZXRfX2xvY2tlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJCQkJCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgZG9tYWlucyk7CiB2b2lkIGludGVs X3VuY29yZV9mb3JjZXdha2VfcHV0X19sb2NrZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAogCQkJCQllbnVtIGZvcmNld2FrZV9kb21haW5zIGRvbWFpbnMpOwordW5zaWduZWQg aW50ZWxfdW5jb3JlX2VkcmFtX3NpemVfbWIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KTsKKwogdm9pZCBhc3NlcnRfZm9yY2V3YWtlc19pbmFjdGl2ZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpOwogc3RhdGljIGlubGluZSBib29sIGludGVsX3ZncHVfYWN0aXZl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBk OGVmYzlkZmJjNDguLjBhNWU1NTI0ZGVmMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC00 Nzk5LDcgKzQ3OTksNyBAQCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJLyogRG91YmxlIGxheWVyIHNlY3VyaXR5IGJsYW5rZXQsIHNlZSBpOTE1X2dlbV9pbml0KCkg Ki8KIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2dldChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7 CiAKLQlpZiAoZGV2X3ByaXYtPmVsbGNfc2l6ZSkKKwlpZiAoSEFTX0VEUkFNKGRldl9wcml2KSkK IAkJSTkxNV9XUklURShIU1dfSURJQ1IsIEk5MTVfUkVBRChIU1dfSURJQ1IpIHwgSURJSEFTSE1T SygweGYpKTsKIAogCWlmIChJU19IQVNXRUxMKGRldikpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jCmluZGV4IDU2ZjRmMmU1OGQ1My4uMWQxOTMzMTMwYjdhIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuYwpAQCAtMzE1Nyw3ICszMTU3LDcgQEAgaW50IGk5MTVfZ2VtX2d0dF9p bml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJfSBlbHNlIGlmIChJTlRFTF9JTkZPKGRldikt PmdlbiA8IDgpIHsKIAkJZ3R0LT5ndHRfcHJvYmUgPSBnZW42X2dtY2hfcHJvYmU7CiAJCWd0dC0+ YmFzZS5jbGVhbnVwID0gZ2VuNl9nbWNoX3JlbW92ZTsKLQkJaWYgKElTX0hBU1dFTEwoZGV2KSAm JiBkZXZfcHJpdi0+ZWxsY19zaXplKQorCQlpZiAoSEFTX0VEUkFNKGRldikpCiAJCQlndHQtPmJh c2UucHRlX2VuY29kZSA9IGlyaXNfcHRlX2VuY29kZTsKIAkJZWxzZSBpZiAoSVNfSEFTV0VMTChk ZXYpKQogCQkJZ3R0LT5iYXNlLnB0ZV9lbmNvZGUgPSBoc3dfcHRlX2VuY29kZTsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3JlZy5oCmluZGV4IDU1NmE0NThkNjY5ZS4uZjg4Yjc1ZWM1MDQ3IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfcmVnLmgKQEAgLTY4MTgsNyArNjgxOCw3IEBAIGVudW0gc2tsX2Rpc3BfcG93ZXJf d2VsbHMgewogCiAjZGVmaW5lICBIU1dfSURJQ1IJCQkJX01NSU8oMHg5MDA4KQogI2RlZmluZSAg ICBJRElIQVNITVNLKHgpCQkJKCgoeCkgJiAweDNmKSA8PCAxNikKLSNkZWZpbmUgIEhTV19FRFJB TV9QUkVTRU5UCQkJX01NSU8oMHgxMjAwMTApCisjZGVmaW5lICBIU1dfRURSQU1fQ0FQCQkJCV9N TUlPKDB4MTIwMDEwKQogI2RlZmluZSAgICBFRFJBTV9FTkFCTEVECQkJMHgxCiAKICNkZWZpbmUg R0VONl9VQ0dDVEwxCQkJCV9NTUlPKDB4OTQwMCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3VuY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3Jl LmMKaW5kZXggZDA5NzNlMDhlN2ViLi4wYzkwNTljYjNkMTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3VuY29yZS5jCkBAIC0zMTAsMjEgKzMxMCwzNiBAQCB2b2lkIGludGVsX3VuY29yZV9mb3Jj ZXdha2VfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgYm9vbCByZXN0b3JlKQogCXNwaW5f dW5sb2NrX2lycXJlc3RvcmUoJmRldl9wcml2LT51bmNvcmUubG9jaywgaXJxZmxhZ3MpOwogfQog Ci1zdGF0aWMgdm9pZCBpbnRlbF91bmNvcmVfZWxsY19kZXRlY3Qoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKK3Vuc2lnbmVkIGludGVsX3VuY29yZV9lZHJhbV9zaXplX21iKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBkZXYtPmRldl9wcml2YXRlOworCWlmICghSEFTX0VEUkFNKGRldl9wcml2KSkKKwkJcmV0 dXJuIDA7CisKKwkvKiBUaGUgZG9jcyBkbyBub3QgZXhwbGFpbiBleGFjdGx5IGhvdyB0aGUgY2Fs Y3VsYXRpb24gY2FuIGJlCisJICogbWFkZS4gSXQgaXMgc29tZXdoYXQgZ3Vlc3NhYmxlLCBidXQg Zm9yIG5vdywgaXQncyBhbHdheXMKKwkgKiAxMjhNQi4KKwkgKi8KKworCXJldHVybiAxMjg7Cit9 CiAKLQlpZiAoKElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSB8fAotCSAgICAg SU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkgJiYKLQkgICAgKF9fcmF3X2k5MTVfcmVhZDMyKGRl dl9wcml2LCBIU1dfRURSQU1fUFJFU0VOVCkgJiBFRFJBTV9FTkFCTEVEKSkgewotCQkvKiBUaGUg ZG9jcyBkbyBub3QgZXhwbGFpbiBleGFjdGx5IGhvdyB0aGUgY2FsY3VsYXRpb24gY2FuIGJlCi0J CSAqIG1hZGUuIEl0IGlzIHNvbWV3aGF0IGd1ZXNzYWJsZSwgYnV0IGZvciBub3csIGl0J3MgYWx3 YXlzCi0JCSAqIDEyOE1CLgotCQkgKiBOQjogV2UgY2FuJ3Qgd3JpdGUgSURJQ1IgeWV0IGJlY2F1 c2Ugd2UgZG8gbm90IGhhdmUgZ3QgZnVuY3MKK3N0YXRpYyB2b2lkIGludGVsX3VuY29yZV9lZHJh bV9kZXRlY3Qoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCWlmIChJU19I QVNXRUxMKGRldl9wcml2KSB8fAorCSAgICBJU19CUk9BRFdFTEwoZGV2X3ByaXYpIHx8CisJICAg IElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPj0gOSkgeworCQlkZXZfcHJpdi0+ZWRyYW1fY2Fw ID0gX19yYXdfaTkxNV9yZWFkMzIoZGV2X3ByaXYsCisJCQkJCQkJSFNXX0VEUkFNX0NBUCk7CisK KwkJLyogTkI6IFdlIGNhbid0IHdyaXRlIElESUNSIHlldCBiZWNhdXNlIHdlIGRvIG5vdCBoYXZl IGd0IGZ1bmNzCiAJCSAqIHNldCB1cCAqLwotCQlkZXZfcHJpdi0+ZWxsY19zaXplID0gMTI4Owot CQlEUk1fSU5GTygiRm91bmQgJXp1TUIgb2YgZUxMQ1xuIiwgZGV2X3ByaXYtPmVsbGNfc2l6ZSk7 CisJfSBlbHNlIHsKKwkJZGV2X3ByaXYtPmVkcmFtX2NhcCA9IDA7CiAJfQorCisJaWYgKEhBU19F RFJBTShkZXZfcHJpdikpCisJCURSTV9JTkZPKCJGb3VuZCAlenVNQiBvZiBlTExDXG4iLAorCQkJ IGludGVsX3VuY29yZV9lZHJhbV9zaXplX21iKGRldl9wcml2KSk7CiB9CiAKIHN0YXRpYyBib29s CkBAIC0xMjM5LDcgKzEyNTQsNyBAQCB2b2lkIGludGVsX3VuY29yZV9pbml0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAKIAlpOTE1X2NoZWNrX3ZncHUoZGV2KTsKIAotCWludGVsX3VuY29yZV9l bGxjX2RldGVjdChkZXYpOworCWludGVsX3VuY29yZV9lZHJhbV9kZXRlY3QoZGV2X3ByaXYpOwog CWludGVsX3VuY29yZV9md19kb21haW5zX2luaXQoZGV2KTsKIAlfX2ludGVsX3VuY29yZV9lYXJs eV9zYW5pdGl6ZShkZXYsIGZhbHNlKTsKIAotLSAKMi41LjAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==