From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: [PATCH 81/88] drm/amdgpu: recalculate VCE firmware BO size Date: Tue, 26 May 2015 23:20:20 -0400 Message-ID: <1432696827-3752-51-git-send-email-alexander.deucher@amd.com> References: <1432696827-3752-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qk0-f170.google.com (mail-qk0-f170.google.com [209.85.220.170]) by gabe.freedesktop.org (Postfix) with ESMTP id A02B16E8E5 for ; Tue, 26 May 2015 20:21:05 -0700 (PDT) Received: by qkdn188 with SMTP id n188so105310414qkd.2 for ; Tue, 26 May 2015 20:21:05 -0700 (PDT) In-Reply-To: <1432696827-3752-1-git-send-email-alexander.deucher@amd.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Leo Liu List-Id: dri-devel@lists.freedesktop.org RnJvbTogTGVvIExpdSA8bGVvLmxpdUBhbWQuY29tPgoKRmlybXdhcmUgcmVxdWlyZWQgQk8gc2l6 ZSBjaGFuZ2VzIGluIHRlcm1zIG9mIEFTSUMgZmFtaWx5CgpTaWduZWQtb2ZmLWJ5OiBMZW8gTGl1 IDxsZW8ubGl1QGFtZC5jb20+ClJldmlld2VkLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5k ZXVjaGVyQGFtZC5jb20+ClJldmlld2VkLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4u a29lbmlnQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1Lmgg ICAgIHwgIDIgLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92Y2UuYyB8ICA1 ICstLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdmNlLmggfCAgMiArLQog ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmNlX3YyXzAuYyAgIHwgMTMgKysrKysrKysrLS0t LQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmNlX3YzXzAuYyAgIHwgMTMgKysrKysrKysr LS0tLQogNSBmaWxlcyBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaCBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCmluZGV4IGViZmY4OWUuLjUyZDY4NDUgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCkBAIC0xNjY0LDggKzE2NjQsNiBAQCBzdHJ1 Y3QgYW1kZ3B1X3V2ZCB7CiAgKiBWQ0UKICAqLwogI2RlZmluZSBBTURHUFVfTUFYX1ZDRV9IQU5E TEVTCTE2Ci0jZGVmaW5lIEFNREdQVV9WQ0VfU1RBQ0tfU0laRQkoMTAyNCoxMDI0KQotI2RlZmlu ZSBBTURHUFVfVkNFX0hFQVBfU0laRQkoNCoxMDI0KjEwMjQpCiAjZGVmaW5lIEFNREdQVV9WQ0Vf RklSTVdBUkVfT0ZGU0VUIDI1NgogCiBzdHJ1Y3QgYW1kZ3B1X3ZjZSB7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfdmNlLmMKaW5kZXggODAzZWU2MC4uNjIwMThiMyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZjZS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92Y2UuYwpAQCAtNjgsOSArNjgsOCBAQCBzdGF0aWMg dm9pZCBhbWRncHVfdmNlX2lkbGVfd29ya19oYW5kbGVyKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29y ayk7CiAgKgogICogRmlyc3Qgc3RlcCB0byBnZXQgVkNFIG9ubGluZSwgYWxsb2NhdGUgbWVtb3J5 IGFuZCBsb2FkIHRoZSBmaXJtd2FyZQogICovCi1pbnQgYW1kZ3B1X3ZjZV9zd19pbml0KHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2KQoraW50IGFtZGdwdV92Y2Vfc3dfaW5pdChzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldiwgdW5zaWduZWQgbG9uZyBzaXplKQogewotCXVuc2lnbmVkIGxvbmcg c2l6ZTsKIAljb25zdCBjaGFyICpmd19uYW1lOwogCWNvbnN0IHN0cnVjdCBjb21tb25fZmlybXdh cmVfaGVhZGVyICpoZHI7CiAJdW5zaWduZWQgdWNvZGVfdmVyc2lvbiwgdmVyc2lvbl9tYWpvciwg dmVyc2lvbl9taW5vciwgYmluYXJ5X2lkOwpAQCAtMTM2LDggKzEzNSw2IEBAIGludCBhbWRncHVf dmNlX3N3X2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAKIAkvKiBhbGxvY2F0ZSBm aXJtd2FyZSwgc3RhY2sgYW5kIGhlYXAgQk8gKi8KIAotCXNpemUgPSBBTURHUFVfR1BVX1BBR0Vf QUxJR04obGUzMl90b19jcHUoaGRyLT51Y29kZV9zaXplX2J5dGVzKSkgKwotCSAgICAgICBBTURH UFVfVkNFX1NUQUNLX1NJWkUgKyBBTURHUFVfVkNFX0hFQVBfU0laRTsKIAlyID0gYW1kZ3B1X2Jv X2NyZWF0ZShhZGV2LCBzaXplLCBQQUdFX1NJWkUsIHRydWUsCiAJCQkgICAgIEFNREdQVV9HRU1f RE9NQUlOX1ZSQU0sIDAsIE5VTEwsICZhZGV2LT52Y2UudmNwdV9ibyk7CiAJaWYgKHIpIHsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92Y2UuaCBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92Y2UuaAppbmRleCBiOTQxMWU0Li40Mjk0ODU0 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdmNlLmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZjZS5oCkBAIC0yNCw3ICsyNCw3 IEBACiAjaWZuZGVmIF9fQU1ER1BVX1ZDRV9IX18KICNkZWZpbmUgX19BTURHUFVfVkNFX0hfXwog Ci1pbnQgYW1kZ3B1X3ZjZV9zd19pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KTsKK2lu dCBhbWRncHVfdmNlX3N3X2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHVuc2lnbmVk IGxvbmcgc2l6ZSk7CiBpbnQgYW1kZ3B1X3ZjZV9zd19maW5pKHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2KTsKIGludCBhbWRncHVfdmNlX3N1c3BlbmQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYpOwogaW50IGFtZGdwdV92Y2VfcmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZjZV92Ml8wLmMgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y2VfdjJfMC5jCmluZGV4IGI0N2MxNmQuLmYyMDBkZjMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZjZV92Ml8wLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmNlX3YyXzAuYwpAQCAtMzcsNiArMzcsMTAgQEAK ICNpbmNsdWRlICJvc3Mvb3NzXzJfMF9kLmgiCiAjaW5jbHVkZSAib3NzL29zc18yXzBfc2hfbWFz ay5oIgogCisjZGVmaW5lIFZDRV9WMl8wX0ZXX1NJWkUJKDI1NiAqIDEwMjQpCisjZGVmaW5lIFZD RV9WMl8wX1NUQUNLX1NJWkUJKDY0ICogMTAyNCkKKyNkZWZpbmUgVkNFX1YyXzBfREFUQV9TSVpF CSgyMzU1MiAqIEFNREdQVV9NQVhfVkNFX0hBTkRMRVMpCisKIHN0YXRpYyB2b2lkIHZjZV92Ml8w X21jX3Jlc3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CiBzdGF0aWMgdm9pZCB2Y2Vf djJfMF9zZXRfcmluZ19mdW5jcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CiBzdGF0aWMg dm9pZCB2Y2VfdjJfMF9zZXRfaXJxX2Z1bmNzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KTsK QEAgLTE4Myw3ICsxODcsOCBAQCBzdGF0aWMgaW50IHZjZV92Ml8wX3N3X2luaXQoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYpCiAJaWYgKHIpCiAJCXJldHVybiByOwogCi0JciA9IGFtZGdwdV92 Y2Vfc3dfaW5pdChhZGV2KTsKKwlyID0gYW1kZ3B1X3ZjZV9zd19pbml0KGFkZXYsIFZDRV9WMl8w X0ZXX1NJWkUgKworCQlWQ0VfVjJfMF9TVEFDS19TSVpFICsgVkNFX1YyXzBfREFUQV9TSVpFKTsK IAlpZiAocikKIAkJcmV0dXJuIHI7CiAKQEAgLTQxNSwxNyArNDIwLDE3IEBAIHN0YXRpYyB2b2lk IHZjZV92Ml8wX21jX3Jlc3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlXUkVHMzIo bW1WQ0VfTE1JX1ZNX0NUUkwsIDApOwogCiAJYWRkciArPSBBTURHUFVfVkNFX0ZJUk1XQVJFX09G RlNFVDsKLQlzaXplID0gQU1ER1BVX0dQVV9QQUdFX0FMSUdOKGFkZXYtPnZjZS5mdy0+c2l6ZSk7 CisJc2l6ZSA9IFZDRV9WMl8wX0ZXX1NJWkU7CiAJV1JFRzMyKG1tVkNFX1ZDUFVfQ0FDSEVfT0ZG U0VUMCwgYWRkciAmIDB4N2ZmZmZmZmYpOwogCVdSRUczMihtbVZDRV9WQ1BVX0NBQ0hFX1NJWkUw LCBzaXplKTsKIAogCWFkZHIgKz0gc2l6ZTsKLQlzaXplID0gQU1ER1BVX1ZDRV9TVEFDS19TSVpF OworCXNpemUgPSBWQ0VfVjJfMF9TVEFDS19TSVpFOwogCVdSRUczMihtbVZDRV9WQ1BVX0NBQ0hF X09GRlNFVDEsIGFkZHIgJiAweDdmZmZmZmZmKTsKIAlXUkVHMzIobW1WQ0VfVkNQVV9DQUNIRV9T SVpFMSwgc2l6ZSk7CiAKIAlhZGRyICs9IHNpemU7Ci0Jc2l6ZSA9IEFNREdQVV9WQ0VfSEVBUF9T SVpFOworCXNpemUgPSBWQ0VfVjJfMF9EQVRBX1NJWkU7CiAJV1JFRzMyKG1tVkNFX1ZDUFVfQ0FD SEVfT0ZGU0VUMiwgYWRkciAmIDB4N2ZmZmZmZmYpOwogCVdSRUczMihtbVZDRV9WQ1BVX0NBQ0hF X1NJWkUyLCBzaXplKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv dmNlX3YzXzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZjZV92M18wLmMKaW5kZXgg Mzg0YzQ1ZS4uZWUyOTQzNmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L3ZjZV92M18wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmNlX3YzXzAuYwpA QCAtMzUsNiArMzUsMTAgQEAKICNpbmNsdWRlICJvc3Mvb3NzXzJfMF9kLmgiCiAjaW5jbHVkZSAi b3NzL29zc18yXzBfc2hfbWFzay5oIgogCisjZGVmaW5lIFZDRV9WM18wX0ZXX1NJWkUJKDM4NCAq IDEwMjQpCisjZGVmaW5lIFZDRV9WM18wX1NUQUNLX1NJWkUJKDY0ICogMTAyNCkKKyNkZWZpbmUg VkNFX1YzXzBfREFUQV9TSVpFCSgoMTYgKiAxMDI0ICogQU1ER1BVX01BWF9WQ0VfSEFORExFUykg KyAoNTIgKiAxMDI0KSkKKwogc3RhdGljIHZvaWQgdmNlX3YzXzBfbWNfcmVzdW1lKHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2KTsKIHN0YXRpYyB2b2lkIHZjZV92M18wX3NldF9yaW5nX2Z1bmNz KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KTsKIHN0YXRpYyB2b2lkIHZjZV92M18wX3NldF9p cnFfZnVuY3Moc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwpAQCAtMTgxLDcgKzE4NSw4IEBA IHN0YXRpYyBpbnQgdmNlX3YzXzBfc3dfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikK IAlpZiAocikKIAkJcmV0dXJuIHI7CiAKLQlyID0gYW1kZ3B1X3ZjZV9zd19pbml0KGFkZXYpOwor CXIgPSBhbWRncHVfdmNlX3N3X2luaXQoYWRldiwgVkNFX1YzXzBfRldfU0laRSArCisJCShWQ0Vf VjNfMF9TVEFDS19TSVpFICsgVkNFX1YzXzBfREFUQV9TSVpFKSAqIDIpOwogCWlmIChyKQogCQly ZXR1cm4gcjsKIApAQCAtMzA0LDE3ICszMDksMTcgQEAgc3RhdGljIHZvaWQgdmNlX3YzXzBfbWNf cmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCiAJV1JFRzMyKG1tVkNFX0xNSV9W Q1BVX0NBQ0hFXzQwQklUX0JBUiwgKGFkZXYtPnZjZS5ncHVfYWRkciA+PiA4KSk7CiAJb2Zmc2V0 ID0gQU1ER1BVX1ZDRV9GSVJNV0FSRV9PRkZTRVQ7Ci0Jc2l6ZSA9IEFNREdQVV9HUFVfUEFHRV9B TElHTihhZGV2LT52Y2UuZnctPnNpemUpOworCXNpemUgPSBWQ0VfVjNfMF9GV19TSVpFOwogCVdS RUczMihtbVZDRV9WQ1BVX0NBQ0hFX09GRlNFVDAsIG9mZnNldCAmIDB4N2ZmZmZmZmYpOwogCVdS RUczMihtbVZDRV9WQ1BVX0NBQ0hFX1NJWkUwLCBzaXplKTsKIAogCW9mZnNldCArPSBzaXplOwot CXNpemUgPSBBTURHUFVfVkNFX1NUQUNLX1NJWkU7CisJc2l6ZSA9IFZDRV9WM18wX1NUQUNLX1NJ WkU7CiAJV1JFRzMyKG1tVkNFX1ZDUFVfQ0FDSEVfT0ZGU0VUMSwgb2Zmc2V0ICYgMHg3ZmZmZmZm Zik7CiAJV1JFRzMyKG1tVkNFX1ZDUFVfQ0FDSEVfU0laRTEsIHNpemUpOwogCiAJb2Zmc2V0ICs9 IHNpemU7Ci0Jc2l6ZSA9IEFNREdQVV9WQ0VfSEVBUF9TSVpFOworCXNpemUgPSBWQ0VfVjNfMF9E QVRBX1NJWkU7CiAJV1JFRzMyKG1tVkNFX1ZDUFVfQ0FDSEVfT0ZGU0VUMiwgb2Zmc2V0ICYgMHg3 ZmZmZmZmZik7CiAJV1JFRzMyKG1tVkNFX1ZDUFVfQ0FDSEVfU0laRTIsIHNpemUpOwogCi0tIAox LjguMy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpk cmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=