From: yu.dai@intel.com Subject: [PATCH] drm/i915/guc: Fix a fw content lost issue after it is evicted Date: Fri, 6 Nov 2015 13:55:27 -0800 Message-ID: <1446846927-28461-1-git-send-email-yu.dai@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 12D9C6EC7E for ; Fri, 6 Nov 2015 13:57:11 -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 RnJvbTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+CgpXZSBrZWVwIGEgY29weSBvZiBHdUMg ZncgaW4gYSBHRU0gb2JqLiBIb3dldmVyIGl0cyBjb250ZW50IGlzIGxvc3QKaWYgdGhlIEdFTSBv YmogaXMgZXZpY3RlZCAoaWd0L2dlbV9ldmljdF8qKS4gVGhlcmVmb3JlLCB0aGUgbGF0ZXIKZncg bG9hZGluZyBkdXJpbmcgR1BVIHJlc2V0IHdpbGwgZmFpbC4KCk5vdyB3ZSBrZWVwIHRoZSBjb3B5 IGluIGEgbWVtb3J5IGJsb2NrIHJhdGhlciB0aGFuIGEgR0VNIG9iamV0LgpEdXJpbmcgZncgbG9h ZGluZywgd2Ugd2lsbCB3cmFwIHVwIGEgR0VNIG9iaiB3aXRoIGZ3IGRhdGEgZm9yIERNQQpjb3B5 LiBUaGUgR0VNIG9iaiB3aWxsIGJlIGZyZWVkIERNQSBpcyBkb25lLgoKU2lnbmVkLW9mZi1ieTog QWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjLmggICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19s b2FkZXIuYyB8IDg0ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBj aGFuZ2VkLCAzOSBpbnNlcnRpb25zKCspLCA0NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Yy5oCmluZGV4IDViYTU4NjYuLjI3MTQxMDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Yy5oCkBAIC02OCw3ICs2OCw3IEBAIHN0cnVjdCBpbnRlbF9ndWNfZncgewogCXN0cnVjdCBkcm1f ZGV2aWNlICoJCWd1Y19kZXY7CiAJY29uc3QgY2hhciAqCQkJZ3VjX2Z3X3BhdGg7CiAJc2l6ZV90 CQkJCWd1Y19md19zaXplOwotCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICoJZ3VjX2Z3X29i ajsKKwl1aW50MzJfdAkJCSpndWNfZndfZGF0YTsKIAllbnVtIGludGVsX2d1Y19md19zdGF0dXMJ Z3VjX2Z3X2ZldGNoX3N0YXR1czsKIAllbnVtIGludGVsX2d1Y19md19zdGF0dXMJZ3VjX2Z3X2xv YWRfc3RhdHVzOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNf bG9hZGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5kZXgg NTUwOTIxZi4uZWJmMTVlOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjX2xvYWRlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIu YwpAQCAtMjE4LDI2ICsyMTgsNDUgQEAgc3RhdGljIGlubGluZSBib29sIGd1Y191Y29kZV9yZXNw b25zZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiBzdGF0aWMgaW50IGd1Y191 Y29kZV94ZmVyX2RtYShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3Ry dWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZ3VjX2Z3OwotCXN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpmd19vYmogPSBndWNfZnctPmd1Y19md19vYmo7CisJc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmZ3X29iajsKIAl1bnNpZ25lZCBsb25nIG9mZnNldDsK LQlzdHJ1Y3Qgc2dfdGFibGUgKnNnID0gZndfb2JqLT5wYWdlczsKLQl1MzIgc3RhdHVzLCByc2Fb VU9TX1JTQV9TQ1JBVENIX01BWF9DT1VOVF07CisJdTMyIHN0YXR1cywgKnJzYTsKIAlpbnQgaSwg cmV0ID0gMDsKIAogCS8qIHdoZXJlIFJTQSBzaWduYXR1cmUgc3RhcnRzICovCi0Jb2Zmc2V0ID0g Z3VjX2Z3LT5yc2Ffb2Zmc2V0OworCXJzYSA9ICh1MzIgKikoKHU4ICopZ3VjX2Z3LT5ndWNfZndf ZGF0YSArIGd1Y19mdy0+cnNhX29mZnNldCk7CiAKIAkvKiBDb3B5IFJTQSBzaWduYXR1cmUgZnJv bSB0aGUgZncgaW1hZ2UgdG8gSFcgZm9yIHZlcmlmaWNhdGlvbiAqLwotCXNnX3Bjb3B5X3RvX2J1 ZmZlcihzZy0+c2dsLCBzZy0+bmVudHMsIHJzYSwgc2l6ZW9mKHJzYSksIG9mZnNldCk7CiAJZm9y IChpID0gMDsgaSA8IFVPU19SU0FfU0NSQVRDSF9NQVhfQ09VTlQ7IGkrKykKLQkJSTkxNV9XUklU RShVT1NfUlNBX1NDUkFUQ0goaSksIHJzYVtpXSk7CisJCUk5MTVfV1JJVEUoVU9TX1JTQV9TQ1JB VENIKGkpLCAqKHJzYSArIGkpKTsKKworCS8qIFdyYXAgdXAgYSBnZW0gb2JqIGZpbGxlZCB3aXRo IGhlYWRlciArIHVjb2RlICovCisJZndfb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9mcm9t X2RhdGEoZGV2X3ByaXYtPmRldiwKKwkJCSh1OCAqKWd1Y19mdy0+Z3VjX2Z3X2RhdGEgKyBndWNf ZnctPmhlYWRlcl9vZmZzZXQsCisJCQlndWNfZnctPmhlYWRlcl9zaXplICsgZ3VjX2Z3LT51Y29k ZV9zaXplKTsKKwlpZiAoSVNfRVJSX09SX05VTEwoZndfb2JqKSkgeworCQlyZXQgPSBmd19vYmog PyBQVFJfRVJSKGZ3X29iaikgOiAtRU5PTUVNOworCQlyZXR1cm4gcmV0OworCX0KKworCXJldCA9 IGk5MTVfZ2VtX29iamVjdF9zZXRfdG9fZ3R0X2RvbWFpbihmd19vYmosIGZhbHNlKTsKKwlpZiAo cmV0KSB7CisJCURSTV9ERUJVR19EUklWRVIoInNldC1kb21haW4gZmFpbGVkICVkXG4iLCByZXQp OworCQlyZXR1cm4gcmV0OworCX0KKworCXJldCA9IGk5MTVfZ2VtX29ial9nZ3R0X3Bpbihmd19v YmosIDAsIDApOworCWlmIChyZXQpIHsKKwkJRFJNX0RFQlVHX0RSSVZFUigicGluIGZhaWxlZCAl ZFxuIiwgcmV0KTsKKwkJcmV0dXJuIHJldDsKKwl9CiAKIAkvKiBUaGUgaGVhZGVyIHBsdXMgdUNv ZGUgd2lsbCBiZSBjb3BpZWQgdG8gV09QQ00gdmlhIERNQSwgZXhjbHVkaW5nIGFueQogCSAqIG90 aGVyIGNvbXBvbmVudHMgKi8KIAlJOTE1X1dSSVRFKERNQV9DT1BZX1NJWkUsIGd1Y19mdy0+aGVh ZGVyX3NpemUgKyBndWNfZnctPnVjb2RlX3NpemUpOwogCiAJLyogU2V0IHRoZSBzb3VyY2UgYWRk cmVzcyBmb3IgdGhlIG5ldyBibG9iICovCi0Jb2Zmc2V0ID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zm c2V0KGZ3X29iaikgKyBndWNfZnctPmhlYWRlcl9vZmZzZXQ7CisJb2Zmc2V0ID0gaTkxNV9nZW1f b2JqX2dndHRfb2Zmc2V0KGZ3X29iaik7CiAJSTkxNV9XUklURShETUFfQUREUl8wX0xPVywgbG93 ZXJfMzJfYml0cyhvZmZzZXQpKTsKIAlJOTE1X1dSSVRFKERNQV9BRERSXzBfSElHSCwgdXBwZXJf MzJfYml0cyhvZmZzZXQpICYgMHhGRkZGKTsKIApAQCAtMjY5LDYgKzI4OCwxMCBAQCBzdGF0aWMg aW50IGd1Y191Y29kZV94ZmVyX2RtYShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAJCXJldCA9IC1FTk9FWEVDOwogCX0KIAorCS8qIFdlIGNhbiBmcmVlIGl0IG5vdyB0aGF0IERN QSBoYXMgY29tcGxldGVkICovCisJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oZndfb2JqKTsK Kwlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgmZndfb2JqLT5iYXNlKTsKKwogCURSTV9ERUJV R19EUklWRVIoInJldHVybmluZyAlZFxuIiwgcmV0KTsKIAogCXJldHVybiByZXQ7CkBAIC0yNzks MjIgKzMwMiw5IEBAIHN0YXRpYyBpbnQgZ3VjX3Vjb2RlX3hmZXJfZG1hKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKICAqLwogc3RhdGljIGludCBndWNfdWNvZGVfeGZlcihzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGludGVsX2d1Y19mdyAq Z3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZ3VjX2Z3OwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBkZXZfcHJpdi0+ZGV2OwogCWludCByZXQ7CiAKLQlyZXQgPSBpOTE1X2dlbV9vYmplY3Rfc2V0 X3RvX2d0dF9kb21haW4oZ3VjX2Z3LT5ndWNfZndfb2JqLCBmYWxzZSk7Ci0JaWYgKHJldCkgewot CQlEUk1fREVCVUdfRFJJVkVSKCJzZXQtZG9tYWluIGZhaWxlZCAlZFxuIiwgcmV0KTsKLQkJcmV0 dXJuIHJldDsKLQl9Ci0KLQlyZXQgPSBpOTE1X2dlbV9vYmpfZ2d0dF9waW4oZ3VjX2Z3LT5ndWNf Zndfb2JqLCAwLCAwKTsKLQlpZiAocmV0KSB7Ci0JCURSTV9ERUJVR19EUklWRVIoInBpbiBmYWls ZWQgJWRcbiIsIHJldCk7Ci0JCXJldHVybiByZXQ7Ci0JfQotCiAJLyogSW52YWxpZGF0ZSBHdUMg VExCIHRvIGxldCBHdUMgdGFrZSB0aGUgbGF0ZXN0IHVwZGF0ZXMgdG8gR1RULiAqLwogCUk5MTVf V1JJVEUoR0VOOF9HVENSLCBHRU44X0dUQ1JfSU5WQUxJREFURSk7CiAKQEAgLTMzNywxMiArMzQ3 LDYgQEAgc3RhdGljIGludCBndWNfdWNvZGVfeGZlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAKIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1dChkZXZfcHJpdiwgRk9SQ0VX QUtFX0FMTCk7CiAKLQkvKgotCSAqIFdlIGtlZXAgdGhlIG9iamVjdCBwYWdlcyBmb3IgcmV1c2Ug ZHVyaW5nIHJlc3VtZS4gQnV0IHdlIGNhbiB1bnBpbiBpdAotCSAqIG5vdyB0aGF0IERNQSBoYXMg Y29tcGxldGVkLCBzbyBpdCBkb2Vzbid0IGNvbnRpbnVlIHRvIHRha2UgdXAgc3BhY2UuCi0JICov Ci0JaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oZ3VjX2Z3LT5ndWNfZndfb2JqKTsKLQogCXJl dHVybiByZXQ7CiB9CiAKQEAgLTQ0NCw3ICs0NDgsNiBAQCBmYWlsOgogCiBzdGF0aWMgdm9pZCBn dWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2d1Y19mdyAq Z3VjX2Z3KQogewotCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJY29uc3Qgc3Ry dWN0IGZpcm13YXJlICpmdzsKIAlzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIgKmNzczsKIAlzaXplX3Qg c2l6ZTsKQEAgLTUzMCwzNCArNTMzLDI3IEBAIHN0YXRpYyB2b2lkIGd1Y19md19mZXRjaChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncpCiAJCQlndWNf ZnctPmd1Y19md19tYWpvcl9mb3VuZCwgZ3VjX2Z3LT5ndWNfZndfbWlub3JfZm91bmQsCiAJCQln dWNfZnctPmd1Y19md19tYWpvcl93YW50ZWQsIGd1Y19mdy0+Z3VjX2Z3X21pbm9yX3dhbnRlZCk7 CiAKLQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0Jb2JqID0gaTkxNV9nZW1fb2Jq ZWN0X2NyZWF0ZV9mcm9tX2RhdGEoZGV2LCBmdy0+ZGF0YSwgZnctPnNpemUpOwotCW11dGV4X3Vu bG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCWlmIChJU19FUlJfT1JfTlVMTChvYmopKSB7Ci0J CWVyciA9IG9iaiA/IFBUUl9FUlIob2JqKSA6IC1FTk9NRU07CisJZ3VjX2Z3LT5ndWNfZndfZGF0 YSA9IGttYWxsb2MoZnctPnNpemUsIEdGUF9LRVJORUwpOworCWlmIChndWNfZnctPmd1Y19md19k YXRhID09IE5VTEwpIHsKKwkJZXJyID0gLUVOT01FTTsKIAkJZ290byBmYWlsOwogCX0KIAotCWd1 Y19mdy0+Z3VjX2Z3X29iaiA9IG9iajsKKwltZW1jcHkoZ3VjX2Z3LT5ndWNfZndfZGF0YSwgZnct PmRhdGEsIGZ3LT5zaXplKTsKIAlndWNfZnctPmd1Y19md19zaXplID0gZnctPnNpemU7CiAKLQlE Uk1fREVCVUdfRFJJVkVSKCJHdUMgZncgZmV0Y2ggc3RhdHVzIFNVQ0NFU1MsIG9iaiAlcFxuIiwK LQkJCWd1Y19mdy0+Z3VjX2Z3X29iaik7CisJRFJNX0RFQlVHX0RSSVZFUigiR3VDIGZ3IGZldGNo IHN0YXR1cyBTVUNDRVNTXG4iKTsKIAogCXJlbGVhc2VfZmlybXdhcmUoZncpOwogCWd1Y19mdy0+ Z3VjX2Z3X2ZldGNoX3N0YXR1cyA9IEdVQ19GSVJNV0FSRV9TVUNDRVNTOwogCXJldHVybjsKIAog ZmFpbDoKLQlEUk1fREVCVUdfRFJJVkVSKCJHdUMgZncgZmV0Y2ggc3RhdHVzIEZBSUw7IGVyciAl ZCwgZncgJXAsIG9iaiAlcFxuIiwKLQkJZXJyLCBmdywgZ3VjX2Z3LT5ndWNfZndfb2JqKTsKKwlE Uk1fREVCVUdfRFJJVkVSKCJHdUMgZncgZmV0Y2ggc3RhdHVzIEZBSUw7IGVyciAlZCwgZncgJXBc biIsIGVyciwgZncpOwogCURSTV9FUlJPUigiRmFpbGVkIHRvIGZldGNoIEd1QyBmaXJtd2FyZSBm cm9tICVzIChlcnJvciAlZClcbiIsCiAJCSAgZ3VjX2Z3LT5ndWNfZndfcGF0aCwgZXJyKTsKIAot CW9iaiA9IGd1Y19mdy0+Z3VjX2Z3X29iajsKLQlpZiAob2JqKQotCQlkcm1fZ2VtX29iamVjdF91 bnJlZmVyZW5jZSgmb2JqLT5iYXNlKTsKLQlndWNfZnctPmd1Y19md19vYmogPSBOVUxMOworCWd1 Y19mdy0+Z3VjX2Z3X2RhdGEgPSBOVUxMOwogCiAJcmVsZWFzZV9maXJtd2FyZShmdyk7CQkvKiBP SyBldmVuIGlmIGZ3IGlzIE5VTEwgKi8KIAlndWNfZnctPmd1Y19md19mZXRjaF9zdGF0dXMgPSBH VUNfRklSTVdBUkVfRkFJTDsKQEAgLTYyNywxMSArNjIzLDcgQEAgdm9pZCBpbnRlbF9ndWNfdWNv ZGVfZmluaShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWRpcmVjdF9pbnRlcnJ1cHRzX3RvX2hv c3QoZGV2X3ByaXYpOwogCWk5MTVfZ3VjX3N1Ym1pc3Npb25fZmluaShkZXYpOwogCi0JbXV0ZXhf bG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCWlmIChndWNfZnctPmd1Y19md19vYmopCi0JCWRy bV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZndWNfZnctPmd1Y19md19vYmotPmJhc2UpOwotCWd1 Y19mdy0+Z3VjX2Z3X29iaiA9IE5VTEw7Ci0JbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRl eCk7CisJa2ZyZWUoZ3VjX2Z3LT5ndWNfZndfZGF0YSk7CiAKIAlndWNfZnctPmd1Y19md19mZXRj aF9zdGF0dXMgPSBHVUNfRklSTVdBUkVfTk9ORTsKIH0KLS0gCjIuNS4wCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=