From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Kim, Jonathan" Subject: [PATCH] drm/amdgpu: early merge post fix to df_v3_6 for xgmi Date: Thu, 20 Jun 2019 15:19:38 +0000 Message-ID: <20190620151924.86234-1-jonathan.kim@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Language: en-US List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: "amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org" Cc: "Kim, Jonathan" Zml4ZWQgZGYgcGVybW9uIHRvIDQNCnJlbW92ZWQgdW5yZXF1aXJlZCByZXQgaW4gc29jMTUNCnJl bmFtZWQgZGYgaW5pdCB0byBkZiBzdyBpbml0IGFuZCBtb3ZlZCBjYWxsYmFjayBmcm9tIHNvYzE1 IGh3IGluaXQgdG8NCnNvYzE1IHN3IGluaXQNCg0KQ2hhbmdlLUlkOiBJYTk4OTc2MTI5MzdlNjUy ZTdmOGEwOWMxZDIzYmIxYzBlNmYzZDhmNw0KU2lnbmVkLW9mZi1ieTogSm9uYXRoYW4gS2ltIDxK b25hdGhhbi5LaW1AYW1kLmNvbT4NCi0tLQ0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdS5oICB8IDIgKy0NCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kZl92M182LmMgfCA0 ICsrLS0NCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zb2MxNS5jICAgfCA1ICsrLS0tDQog MyBmaWxlcyBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pDQoNCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaCBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oDQppbmRleCBiMjI3Yzk1NmI4YTkuLmMzZWQwOWNkMjY3 OCAxMDA2NDQNCi0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oDQorKysg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaA0KQEAgLTczMiw3ICs3MzIsNyBA QCBzdHJ1Y3QgYW1kX3Bvd2VycGxheSB7DQogfTsNCiANCiAjZGVmaW5lIEFNREdQVV9SRVNFVF9N QUdJQ19OVU0gNjQNCi0jZGVmaW5lIEFNREdQVV9NQVhfREZfUEVSRk1PTlMgMTYNCisjZGVmaW5l IEFNREdQVV9NQVhfREZfUEVSRk1PTlMgNA0KIHN0cnVjdCBhbWRncHVfZGV2aWNlIHsNCiAJc3Ry dWN0IGRldmljZQkJCSpkZXY7DQogCXN0cnVjdCBkcm1fZGV2aWNlCQkqZGRldjsNCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kZl92M182LmMgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9kZl92M182LmMNCmluZGV4IDEyZTNlNjcwMTNkOS4uYzY1MTRjNjA5YWU2 IDEwMDY0NA0KLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZGZfdjNfNi5jDQorKysg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kZl92M182LmMNCkBAIC0xMTgsNyArMTE4LDcg QEAgc3RhdGljIHNzaXplX3QgZGZfdjNfNl9nZXRfZGZfY250cl9hdmFpbChzdHJ1Y3QgZGV2aWNl ICpkZXYsDQogc3RhdGljIERFVklDRV9BVFRSKGRmX2NudHJfYXZhaWwsIFNfSVJVR08sIGRmX3Yz XzZfZ2V0X2RmX2NudHJfYXZhaWwsIE5VTEwpOw0KIA0KIC8qIGluaXQgcGVyZm1vbnMgKi8NCi1z dGF0aWMgdm9pZCBkZl92M182X2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpDQorc3Rh dGljIHZvaWQgZGZfdjNfNl9zd19pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQ0KIHsN CiAJaW50IGksIHJldDsNCiANCkBAIC00OTAsNyArNDkwLDcgQEAgc3RhdGljIHZvaWQgZGZfdjNf Nl9wbWNfZ2V0X2NvdW50KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LA0KIH0NCiANCiBjb25z dCBzdHJ1Y3QgYW1kZ3B1X2RmX2Z1bmNzIGRmX3YzXzZfZnVuY3MgPSB7DQotCS5pbml0ID0gZGZf djNfNl9pbml0LA0KKwkuaW5pdCA9IGRmX3YzXzZfc3dfaW5pdCwNCiAJLmVuYWJsZV9icm9hZGNh c3RfbW9kZSA9IGRmX3YzXzZfZW5hYmxlX2Jyb2FkY2FzdF9tb2RlLA0KIAkuZ2V0X2ZiX2NoYW5u ZWxfbnVtYmVyID0gZGZfdjNfNl9nZXRfZmJfY2hhbm5lbF9udW1iZXIsDQogCS5nZXRfaGJtX2No YW5uZWxfbnVtYmVyID0gZGZfdjNfNl9nZXRfaGJtX2NoYW5uZWxfbnVtYmVyLA0KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NvYzE1LmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9zb2MxNS5jDQppbmRleCAwYWZiY2M4MGVhNjEuLmQxZTdmNjIzZWVhOCAxMDA2 NDQNCi0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NvYzE1LmMNCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NvYzE1LmMNCkBAIC0xMDM0LDYgKzEwMzQsOCBAQCBzdGF0 aWMgaW50IHNvYzE1X2NvbW1vbl9zd19pbml0KHZvaWQgKmhhbmRsZSkNCiAJaWYgKGFtZGdwdV9z cmlvdl92ZihhZGV2KSkNCiAJCXhncHVfYWlfbWFpbGJveF9hZGRfaXJxX2lkKGFkZXYpOw0KIA0K KwlhZGV2LT5kZl9mdW5jcy0+aW5pdChhZGV2KTsNCisNCiAJcmV0dXJuIDA7DQogfQ0KIA0KQEAg LTEwNjcsNyArMTA2OSw2IEBAIHN0YXRpYyB2b2lkIHNvYzE1X2Rvb3JiZWxsX3JhbmdlX2luaXQo c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpDQogc3RhdGljIGludCBzb2MxNV9jb21tb25faHdf aW5pdCh2b2lkICpoYW5kbGUpDQogew0KIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IChz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRsZTsNCi0JaW50IHJldDsNCiANCiAJLyogZW5hYmxl IHBjaWUgZ2VuMi8zIGxpbmsgKi8NCiAJc29jMTVfcGNpZV9nZW4zX2VuYWJsZShhZGV2KTsNCkBA IC0xMDgyLDggKzEwODMsNiBAQCBzdGF0aWMgaW50IHNvYzE1X2NvbW1vbl9od19pbml0KHZvaWQg KmhhbmRsZSkNCiAJaWYgKGFkZXYtPm5iaW9fZnVuY3MtPnJlbWFwX2hkcF9yZWdpc3RlcnMpDQog CQlhZGV2LT5uYmlvX2Z1bmNzLT5yZW1hcF9oZHBfcmVnaXN0ZXJzKGFkZXYpOw0KIA0KLQlhZGV2 LT5kZl9mdW5jcy0+aW5pdChhZGV2KTsNCi0NCiAJLyogZW5hYmxlIHRoZSBkb29yYmVsbCBhcGVy dHVyZSAqLw0KIAlzb2MxNV9lbmFibGVfZG9vcmJlbGxfYXBlcnR1cmUoYWRldiwgdHJ1ZSk7DQog CS8qIEhXIGRvb3JiZWxsIHJvdXRpbmcgcG9saWN5OiBkb29yYmVsbCB3cml0aW5nIG5vdA0KLS0g DQoyLjE3LjENCg0KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4