From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: [PATCH] drm/amdgpu/gfx: add proper CG flags for fiji Date: Mon, 2 May 2016 16:00:21 -0400 Message-ID: <1462219259-29806-9-git-send-email-alexander.deucher@amd.com> References: <1462219259-29806-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-x231.google.com (mail-qk0-x231.google.com [IPv6:2607:f8b0:400d:c09::231]) by gabe.freedesktop.org (Postfix) with ESMTPS id A94966E34A for ; Mon, 2 May 2016 20:01:12 +0000 (UTC) Received: by mail-qk0-x231.google.com with SMTP id n63so79728936qkf.0 for ; Mon, 02 May 2016 13:01:12 -0700 (PDT) In-Reply-To: <1462219259-29806-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: Alex Deucher List-Id: dri-devel@lists.freedesktop.org V2Ugd2VyZSBhbHJlYWR5IGVuYWJsaW5nIHRoZXNlIENHIGZlYXR1cmVzLCB0aGlzIHVzZXMKdGhl IHN0YW5kYXJkIGludGVyZmFjZSBmb3IgZG9pbmcgc28uCgpBY2tlZC1ieTogVG9tIFN0IERlbmlz IDx0b20uc3RkZW5pc0BhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhh bmRlci5kZXVjaGVyQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4 X3Y4XzAuYyB8IDgyICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS92aS5jICAgICAgIHwgIDkgKysrLQogMiBmaWxlcyBjaGFuZ2Vk LCA1NiBpbnNlcnRpb25zKCspLCAzNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvZ2Z4X3Y4XzAuYwppbmRleCA4NDJlNGFkLi40YWRjY2QxIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2dmeF92OF8wLmMKQEAgLTQyODIsNyArNDI4Miw3IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y4 XzBfc2V0X3Bvd2VyZ2F0aW5nX3N0YXRlKHZvaWQgKmhhbmRsZSwKIH0KIAogc3RhdGljIHZvaWQg ZmlqaV9zZW5kX3NlcmRlc19jbWQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCi0JCXVpbnQz Ml90IHJlZ19hZGRyLCB1aW50MzJfdCBjbWQpCisJCQkJICAgICB1aW50MzJfdCByZWdfYWRkciwg dWludDMyX3QgY21kKQogewogCXVpbnQzMl90IGRhdGE7CiAKQEAgLTQzMTIsMjMgKzQzMTIsMjkg QEAgc3RhdGljIHZvaWQgZmlqaV9zZW5kX3NlcmRlc19jbWQoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYsCiB9CiAKIHN0YXRpYyB2b2lkIGZpamlfdXBkYXRlX21lZGl1bV9ncmFpbl9jbG9ja19n YXRpbmcoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCi0JCWJvb2wgZW5hYmxlKQorCQkJCQkJ ICBib29sIGVuYWJsZSkKIHsKIAl1aW50MzJfdCB0ZW1wLCBkYXRhOwogCiAJLyogSXQgaXMgZGlz YWJsZWQgYnkgSFcgYnkgZGVmYXVsdCAqLwotCWlmIChlbmFibGUpIHsKLQkJLyogMSAtIFJMQyBt ZW1vcnkgTGlnaHQgc2xlZXAgKi8KLQkJdGVtcCA9IGRhdGEgPSBSUkVHMzIobW1STENfTUVNX1NM UF9DTlRMKTsKLQkJZGF0YSB8PSBSTENfTUVNX1NMUF9DTlRMX19STENfTUVNX0xTX0VOX01BU0s7 Ci0JCWlmICh0ZW1wICE9IGRhdGEpCi0JCQlXUkVHMzIobW1STENfTUVNX1NMUF9DTlRMLCBkYXRh KTsKKwlpZiAoZW5hYmxlICYmIChhZGV2LT5jZ19mbGFncyAmIEFNRF9DR19TVVBQT1JUX0dGWF9N R0NHKSkgeworCQlpZiAoYWRldi0+Y2dfZmxhZ3MgJiBBTURfQ0dfU1VQUE9SVF9HRlhfTUdMUykg eworCQkJaWYgKGFkZXYtPmNnX2ZsYWdzICYgQU1EX0NHX1NVUFBPUlRfR0ZYX1JMQ19MUykgewor CQkJCS8qIDEgLSBSTEMgbWVtb3J5IExpZ2h0IHNsZWVwICovCisJCQkJdGVtcCA9IGRhdGEgPSBS UkVHMzIobW1STENfTUVNX1NMUF9DTlRMKTsKKwkJCQlkYXRhIHw9IFJMQ19NRU1fU0xQX0NOVExf X1JMQ19NRU1fTFNfRU5fTUFTSzsKKwkJCQlpZiAodGVtcCAhPSBkYXRhKQorCQkJCQlXUkVHMzIo bW1STENfTUVNX1NMUF9DTlRMLCBkYXRhKTsKKwkJCX0KIAotCQkvKiAyIC0gQ1AgbWVtb3J5IExp Z2h0IHNsZWVwICovCi0JCXRlbXAgPSBkYXRhID0gUlJFRzMyKG1tQ1BfTUVNX1NMUF9DTlRMKTsK LQkJZGF0YSB8PSBDUF9NRU1fU0xQX0NOVExfX0NQX01FTV9MU19FTl9NQVNLOwotCQlpZiAodGVt cCAhPSBkYXRhKQotCQkJV1JFRzMyKG1tQ1BfTUVNX1NMUF9DTlRMLCBkYXRhKTsKKwkJCWlmIChh ZGV2LT5jZ19mbGFncyAmIEFNRF9DR19TVVBQT1JUX0dGWF9DUF9MUykgeworCQkJCS8qIDIgLSBD UCBtZW1vcnkgTGlnaHQgc2xlZXAgKi8KKwkJCQl0ZW1wID0gZGF0YSA9IFJSRUczMihtbUNQX01F TV9TTFBfQ05UTCk7CisJCQkJZGF0YSB8PSBDUF9NRU1fU0xQX0NOVExfX0NQX01FTV9MU19FTl9N QVNLOworCQkJCWlmICh0ZW1wICE9IGRhdGEpCisJCQkJCVdSRUczMihtbUNQX01FTV9TTFBfQ05U TCwgZGF0YSk7CisJCQl9CisJCX0KIAogCQkvKiAzIC0gUkxDX0NHVFRfTUdDR19PVkVSUklERSAq LwogCQl0ZW1wID0gZGF0YSA9IFJSRUczMihtbVJMQ19DR1RUX01HQ0dfT1ZFUlJJREUpOwpAQCAt NDM0NiwxNyArNDM1MiwyMSBAQCBzdGF0aWMgdm9pZCBmaWppX3VwZGF0ZV9tZWRpdW1fZ3JhaW5f Y2xvY2tfZ2F0aW5nKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkvKiA1IC0gY2xlYXIg bWdjZyBvdmVycmlkZSAqLwogCQlmaWppX3NlbmRfc2VyZGVzX2NtZChhZGV2LCBCUE1fUkVHX01H Q0dfT1ZFUlJJREUsIENMRV9CUE1fU0VSREVTX0NNRCk7CiAKLQkJLyogNiAtIEVuYWJsZSBDR1RT KFRyZWUgU2hhZGUpIE1HQ0cgL01HTFMgKi8KLQkJdGVtcCA9IGRhdGEgPSBSUkVHMzIobW1DR1RT X1NNX0NUUkxfUkVHKTsKLQkJZGF0YSAmPSB+KENHVFNfU01fQ1RSTF9SRUdfX1NNX01PREVfTUFT Syk7Ci0JCWRhdGEgfD0gKDB4MiA8PCBDR1RTX1NNX0NUUkxfUkVHX19TTV9NT0RFX19TSElGVCk7 Ci0JCWRhdGEgfD0gQ0dUU19TTV9DVFJMX1JFR19fU01fTU9ERV9FTkFCTEVfTUFTSzsKLQkJZGF0 YSAmPSB+Q0dUU19TTV9DVFJMX1JFR19fT1ZFUlJJREVfTUFTSzsKLQkJZGF0YSAmPSB+Q0dUU19T TV9DVFJMX1JFR19fTFNfT1ZFUlJJREVfTUFTSzsKLQkJZGF0YSB8PSBDR1RTX1NNX0NUUkxfUkVH X19PTl9NT05JVE9SX0FERF9FTl9NQVNLOwotCQlkYXRhIHw9ICgweDk2IDw8IENHVFNfU01fQ1RS TF9SRUdfX09OX01PTklUT1JfQUREX19TSElGVCk7Ci0JCWlmICh0ZW1wICE9IGRhdGEpCi0JCQlX UkVHMzIobW1DR1RTX1NNX0NUUkxfUkVHLCBkYXRhKTsKKwkJaWYgKGFkZXYtPmNnX2ZsYWdzICYg QU1EX0NHX1NVUFBPUlRfR0ZYX0NHVFMpIHsKKwkJCS8qIDYgLSBFbmFibGUgQ0dUUyhUcmVlIFNo YWRlKSBNR0NHIC9NR0xTICovCisJCQl0ZW1wID0gZGF0YSA9IFJSRUczMihtbUNHVFNfU01fQ1RS TF9SRUcpOworCQkJZGF0YSAmPSB+KENHVFNfU01fQ1RSTF9SRUdfX1NNX01PREVfTUFTSyk7CisJ CQlkYXRhIHw9ICgweDIgPDwgQ0dUU19TTV9DVFJMX1JFR19fU01fTU9ERV9fU0hJRlQpOworCQkJ ZGF0YSB8PSBDR1RTX1NNX0NUUkxfUkVHX19TTV9NT0RFX0VOQUJMRV9NQVNLOworCQkJZGF0YSAm PSB+Q0dUU19TTV9DVFJMX1JFR19fT1ZFUlJJREVfTUFTSzsKKwkJCWlmICgoYWRldi0+Y2dfZmxh Z3MgJiBBTURfQ0dfU1VQUE9SVF9HRlhfTUdMUykgJiYKKwkJCSAgICAoYWRldi0+Y2dfZmxhZ3Mg JiBBTURfQ0dfU1VQUE9SVF9HRlhfQ0dUU19MUykpCisJCQkJZGF0YSAmPSB+Q0dUU19TTV9DVFJM X1JFR19fTFNfT1ZFUlJJREVfTUFTSzsKKwkJCWRhdGEgfD0gQ0dUU19TTV9DVFJMX1JFR19fT05f TU9OSVRPUl9BRERfRU5fTUFTSzsKKwkJCWRhdGEgfD0gKDB4OTYgPDwgQ0dUU19TTV9DVFJMX1JF R19fT05fTU9OSVRPUl9BRERfX1NISUZUKTsKKwkJCWlmICh0ZW1wICE9IGRhdGEpCisJCQkJV1JF RzMyKG1tQ0dUU19TTV9DVFJMX1JFRywgZGF0YSk7CisJCX0KIAkJdWRlbGF5KDUwKTsKIAogCQkv KiA3IC0gd2FpdCBmb3IgUkxDX1NFUkRFU19DVV9NQVNURVIgJiBSTENfU0VSREVTX05PTkNVX01B U1RFUiBpZGxlICovCkBAIC00NDA2LDEzICs0NDE2LDEzIEBAIHN0YXRpYyB2b2lkIGZpamlfdXBk YXRlX21lZGl1bV9ncmFpbl9jbG9ja19nYXRpbmcoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYs CiB9CiAKIHN0YXRpYyB2b2lkIGZpamlfdXBkYXRlX2NvYXJzZV9ncmFpbl9jbG9ja19nYXRpbmco c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCi0JCWJvb2wgZW5hYmxlKQorCQkJCQkJICBib29s IGVuYWJsZSkKIHsKIAl1aW50MzJfdCB0ZW1wLCB0ZW1wMSwgZGF0YSwgZGF0YTE7CiAKIAl0ZW1w ID0gZGF0YSA9IFJSRUczMihtbVJMQ19DR0NHX0NHTFNfQ1RSTCk7CiAKLQlpZiAoZW5hYmxlKSB7 CisJaWYgKGVuYWJsZSAmJiAoYWRldi0+Y2dfZmxhZ3MgJiBBTURfQ0dfU1VQUE9SVF9HRlhfQ0dD RykpIHsKIAkJLyogMSBlbmFibGUgY250eF9lbXB0eV9pbnRfZW5hYmxlL2NudHhfYnVzeV9pbnRf ZW5hYmxlLwogCQkgKiBDbXBfYnVzeS9HRlhfSWRsZSBpbnRlcnJ1cHRzCiAJCSAqLwpAQCAtNDQz OCwxNCArNDQ0OCwxOCBAQCBzdGF0aWMgdm9pZCBmaWppX3VwZGF0ZV9jb2Fyc2VfZ3JhaW5fY2xv Y2tfZ2F0aW5nKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkvKiA1IC0gZW5hYmxlIGNn Y2cgKi8KIAkJZGF0YSB8PSBSTENfQ0dDR19DR0xTX0NUUkxfX0NHQ0dfRU5fTUFTSzsKIAotCQkv KiBlbmFibGUgY2dscyovCi0JCWRhdGEgfD0gUkxDX0NHQ0dfQ0dMU19DVFJMX19DR0xTX0VOX01B U0s7CisJCWlmIChhZGV2LT5jZ19mbGFncyAmIEFNRF9DR19TVVBQT1JUX0dGWF9DR0xTKSB7CisJ CQkvKiBlbmFibGUgY2dscyovCisJCQlkYXRhIHw9IFJMQ19DR0NHX0NHTFNfQ1RSTF9fQ0dMU19F Tl9NQVNLOwogCi0JCXRlbXAxID0gZGF0YTEgPQlSUkVHMzIobW1STENfQ0dUVF9NR0NHX09WRVJS SURFKTsKLQkJZGF0YTEgJj0gflJMQ19DR1RUX01HQ0dfT1ZFUlJJREVfX0NHTFNfTUFTSzsKKwkJ CXRlbXAxID0gZGF0YTEgPQlSUkVHMzIobW1STENfQ0dUVF9NR0NHX09WRVJSSURFKTsKKwkJCWRh dGExICY9IH5STENfQ0dUVF9NR0NHX09WRVJSSURFX19DR0xTX01BU0s7CiAKLQkJaWYgKHRlbXAx ICE9IGRhdGExKQotCQkJV1JFRzMyKG1tUkxDX0NHVFRfTUdDR19PVkVSUklERSwgZGF0YTEpOwor CQkJaWYgKHRlbXAxICE9IGRhdGExKQorCQkJCVdSRUczMihtbVJMQ19DR1RUX01HQ0dfT1ZFUlJJ REUsIGRhdGExKTsKKwkJfSBlbHNlIHsKKwkJCWRhdGEgJj0gflJMQ19DR0NHX0NHTFNfQ1RSTF9f Q0dMU19FTl9NQVNLOworCQl9CiAKIAkJaWYgKHRlbXAgIT0gZGF0YSkKIAkJCVdSRUczMihtbVJM Q19DR0NHX0NHTFNfQ1RSTCwgZGF0YSk7CkBAIC00NDgwLDEzICs0NDk0LDEzIEBAIHN0YXRpYyB2 b2lkIGZpamlfdXBkYXRlX2NvYXJzZV9ncmFpbl9jbG9ja19nYXRpbmcoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYsCiAKIAkJLyogZGlzYWJsZSBjZ2NnLCBjZ2xzIHNob3VsZCBiZSBkaXNhYmxl ZCB0b28uICovCiAJCWRhdGEgJj0gfihSTENfQ0dDR19DR0xTX0NUUkxfX0NHQ0dfRU5fTUFTSyB8 Ci0JCQkJUkxDX0NHQ0dfQ0dMU19DVFJMX19DR0xTX0VOX01BU0spOworCQkJICBSTENfQ0dDR19D R0xTX0NUUkxfX0NHTFNfRU5fTUFTSyk7CiAJCWlmICh0ZW1wICE9IGRhdGEpCiAJCQlXUkVHMzIo bW1STENfQ0dDR19DR0xTX0NUUkwsIGRhdGEpOwogCX0KIH0KIHN0YXRpYyBpbnQgZmlqaV91cGRh dGVfZ2Z4X2Nsb2NrX2dhdGluZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKLQkJYm9vbCBl bmFibGUpCisJCQkJCWJvb2wgZW5hYmxlKQogewogCWlmIChlbmFibGUpIHsKIAkJLyogQ0dDRy9D R0xTIHNob3VsZCBiZSBlbmFibGVkIGFmdGVyIE1HQ0cvTUdMUy9UUyhDRy9MUykKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZpLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS92aS5jCmluZGV4IDM5NjQ3OTAuLjhkOWIwM2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L3ZpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv dmkuYwpAQCAtMTA3Niw3ICsxMDc2LDE0IEBAIHN0YXRpYyBpbnQgdmlfY29tbW9uX2Vhcmx5X2lu aXQodm9pZCAqaGFuZGxlKQogCQlhZGV2LT5leHRlcm5hbF9yZXZfaWQgPSAweDE7CiAJCWJyZWFr OwogCWNhc2UgQ0hJUF9GSUpJOgotCQlhZGV2LT5jZ19mbGFncyA9IDA7CisJCWFkZXYtPmNnX2Zs YWdzID0gQU1EX0NHX1NVUFBPUlRfR0ZYX01HQ0cgfAorCQkJQU1EX0NHX1NVUFBPUlRfR0ZYX01H TFMgfAorCQkJQU1EX0NHX1NVUFBPUlRfR0ZYX1JMQ19MUyB8CisJCQlBTURfQ0dfU1VQUE9SVF9H RlhfQ1BfTFMgfAorCQkJQU1EX0NHX1NVUFBPUlRfR0ZYX0NHVFMgfAorCQkJQU1EX0NHX1NVUFBP UlRfR0ZYX0NHVFNfTFMgfAorCQkJQU1EX0NHX1NVUFBPUlRfR0ZYX0NHQ0cgfAorCQkJQU1EX0NH X1NVUFBPUlRfR0ZYX0NHTFM7CiAJCWFkZXYtPnBnX2ZsYWdzID0gMDsKIAkJYWRldi0+ZXh0ZXJu YWxfcmV2X2lkID0gYWRldi0+cmV2X2lkICsgMHgzYzsKIAkJYnJlYWs7Ci0tIAoyLjUuNQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1h aWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==