From: Harry Wentland Subject: [PATCH 28/29] drm/amd/display: Don't access legacy properties Date: Thu, 26 Oct 2017 14:35:24 -0400 Message-ID: <20171026183525.7532-29-harry.wentland@amd.com> References: <20171026183525.7532-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171026183525.7532-1-harry.wentland-5C7GfCeVMHo@public.gmane.org> 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: Harry Wentland V2UncmUgYW4gYXRvbWljIGRyaXZlciBhbmQgc2hvdWxkbid0IGFjY2VzcyBsZWdhY3kgcHJvcGVy dGllcy4gRG9pbmcgc28Kd2lsbCBvbmx5IHNjYXJlIHVzZXJzIHdpdGggc3RhY2sgdHJhY2VzLgoK SW5zdGVhZCBzYXZlIHRoZSBwcm9wIGluIHRoZSBzdGF0ZSBhbmQgYWNjZXNzIGl0IGRpcmVjdGx5 LiBNdWNoIHNpbXBsZXIuCgpTaWduZWQtb2ZmLWJ5OiBIYXJyeSBXZW50bGFuZCA8aGFycnkud2Vu dGxhbmRAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IFRvbnkgQ2hlbmcgPFRvbnkuQ2hlbmdAYW1kLmNv bT4KQWNrZWQtYnk6IEhhcnJ5IFdlbnRsYW5kIDxoYXJyeS53ZW50bGFuZEBhbWQuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMgfCA3MyAr KysrKysrKysrLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdw dV9kbS9hbWRncHVfZG0uaCB8ICAxICsKIDIgZmlsZXMgY2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygr KSwgNDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNw bGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9h bWRncHVfZG0vYW1kZ3B1X2RtLmMKaW5kZXggNjJlOGRiMWYxMTNjLi42NDY1YTIwMDU3OGQgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2Rt LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0u YwpAQCAtMjQ2MiwyMyArMjQ2Miw2IEBAIGFtZGdwdV9kbV9jb25uZWN0b3JfZGV0ZWN0KHN0cnVj dCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsIGJvb2wgZm9yY2UpCiAJCQljb25uZWN0b3Jfc3Rh dHVzX2Rpc2Nvbm5lY3RlZCk7CiB9CiAKLS8qIENvbXBhcmUgdXNlciBmcmVlIHN5bmMgcHJvcGVy dHkgd2l0aCBpbW11bmFibGUgcHJvcGVydHkgZnJlZSBzeW5jIGNhcGFibGUKLSAqIGFuZCBpZiBk aXNwbGF5IGlzIG5vdCBmcmVlIHN5bmMgY2FwYWJsZSBzZXRzIGZyZWUgc3luYyBwcm9wZXJ0eSB0 byAwCi0gKi8KLXN0YXRpYyBpbnQKLWFtZGdwdV9mcmVlc3luY191cGRhdGVfcHJvcGVydHlfYXRv bWljKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCi0JCQkJICAgICAgIHVpbnQ2NF90 IHZhbF9jYXBhYmxlKQotewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjb25uZWN0b3ItPmRl djsKLQlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0KLQly ZXR1cm4gZHJtX29iamVjdF9wcm9wZXJ0eV9zZXRfdmFsdWUoJmNvbm5lY3Rvci0+YmFzZSwKLQkJ CQkJICAgICBhZGV2LT5tb2RlX2luZm8uZnJlZXN5bmNfcHJvcGVydHksCi0JCQkJCSAgICAgdmFs X2NhcGFibGUpOwotCi0KLX0KLQogaW50IGFtZGdwdV9kbV9jb25uZWN0b3JfYXRvbWljX3NldF9w cm9wZXJ0eShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQkJCQkgICAgc3RydWN0 IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5lY3Rvcl9zdGF0ZSwKIAkJCQkJICAgIHN0cnVjdCBk cm1fcHJvcGVydHkgKnByb3BlcnR5LApAQCAtMjUzMiw4ICsyNTE1LDggQEAgaW50IGFtZGdwdV9k bV9jb25uZWN0b3JfYXRvbWljX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29u bmVjdG9yLAogCQlkbV9uZXdfc3RhdGUtPnVzZXJfZW5hYmxlLmVuYWJsZV9mb3JfdmlkZW8gPSB2 YWw7CiAJCXJldCA9IDA7CiAJfSBlbHNlIGlmIChwcm9wZXJ0eSA9PSBhZGV2LT5tb2RlX2luZm8u ZnJlZXN5bmNfY2FwYWJsZV9wcm9wZXJ0eSkgewotCQlyZXQgPSAtRUlOVkFMOwotCQlyZXR1cm4g cmV0OworCQlkbV9uZXdfc3RhdGUtPmZyZWVzeW5jX2NhcGFibGUgPSB2YWw7CisJCXJldCA9IDA7 CiAJfQogCiAJcmV0dXJuIHJldDsKQEAgLTI1NDksNyArMjUzMiw2IEBAIGludCBhbWRncHVfZG1f Y29ubmVjdG9yX2F0b21pY19nZXRfcHJvcGVydHkoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5l Y3RvciwKIAlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0YXRlICpkbV9zdGF0ZSA9CiAJCXRvX2RtX2Nv bm5lY3Rvcl9zdGF0ZShzdGF0ZSk7CiAJaW50IHJldCA9IC1FSU5WQUw7Ci0JaW50IGk7CiAKIAlp ZiAocHJvcGVydHkgPT0gZGV2LT5tb2RlX2NvbmZpZy5zY2FsaW5nX21vZGVfcHJvcGVydHkpIHsK IAkJc3dpdGNoIChkbV9zdGF0ZS0+c2NhbGluZykgewpAQCAtMjU3NywxNCArMjU1OSwxMiBAQCBp bnQgYW1kZ3B1X2RtX2Nvbm5lY3Rvcl9hdG9taWNfZ2V0X3Byb3BlcnR5KHN0cnVjdCBkcm1fY29u bmVjdG9yICpjb25uZWN0b3IsCiAJfSBlbHNlIGlmIChwcm9wZXJ0eSA9PSBhZGV2LT5tb2RlX2lu Zm8udW5kZXJzY2FuX3Byb3BlcnR5KSB7CiAJCSp2YWwgPSBkbV9zdGF0ZS0+dW5kZXJzY2FuX2Vu YWJsZTsKIAkJcmV0ID0gMDsKLQl9IGVsc2UgaWYgKChwcm9wZXJ0eSA9PSBhZGV2LT5tb2RlX2lu Zm8uZnJlZXN5bmNfcHJvcGVydHkpIHx8Ci0JCSAgIChwcm9wZXJ0eSA9PSBhZGV2LT5tb2RlX2lu Zm8uZnJlZXN5bmNfY2FwYWJsZV9wcm9wZXJ0eSkpIHsKLQkJZm9yIChpID0gMDsgaSA8IGNvbm5l Y3Rvci0+YmFzZS5wcm9wZXJ0aWVzLT5jb3VudDsgaSsrKSB7Ci0JCQlpZiAoY29ubmVjdG9yLT5i YXNlLnByb3BlcnRpZXMtPnByb3BlcnRpZXNbaV0gPT0gcHJvcGVydHkpIHsKLQkJCQkqdmFsID0g Y29ubmVjdG9yLT5iYXNlLnByb3BlcnRpZXMtPnZhbHVlc1tpXTsKLQkJCQlyZXQgPSAwOwotCQkJ fQotCQl9CisJfSBlbHNlIGlmIChwcm9wZXJ0eSA9PSBhZGV2LT5tb2RlX2luZm8uZnJlZXN5bmNf cHJvcGVydHkpIHsKKwkJKnZhbCA9IGRtX3N0YXRlLT51c2VyX2VuYWJsZS5lbmFibGVfZm9yX2dh bWluZzsKKwkJcmV0ID0gMDsKKwl9IGVsc2UgaWYgKHByb3BlcnR5ID09IGFkZXYtPm1vZGVfaW5m by5mcmVlc3luY19jYXBhYmxlX3Byb3BlcnR5KSB7CisJCSp2YWwgPSBkbV9zdGF0ZS0+ZnJlZXN5 bmNfY2FwYWJsZTsKKwkJcmV0ID0gMDsKIAl9CiAJcmV0dXJuIHJldDsKIH0KQEAgLTQ4NDMsMTcg KzQ4MjMsMjQgQEAgdm9pZCBhbWRncHVfZG1fYWRkX3NpbmtfdG9fZnJlZXN5bmNfbW9kdWxlKHN0 cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCQkJCSAgIHN0cnVjdCBlZGlkICplZGlk KQogewogCWludCBpOwotCXVpbnQ2NF90IHZhbF9jYXBhYmxlOwogCWJvb2wgZWRpZF9jaGVja19y ZXF1aXJlZDsKIAlzdHJ1Y3QgZGV0YWlsZWRfdGltaW5nICp0aW1pbmc7CiAJc3RydWN0IGRldGFp bGVkX25vbl9waXhlbCAqZGF0YTsKIAlzdHJ1Y3QgZGV0YWlsZWRfZGF0YV9tb25pdG9yX3Jhbmdl ICpyYW5nZTsKIAlzdHJ1Y3QgYW1kZ3B1X2RtX2Nvbm5lY3RvciAqYW1kZ3B1X2RtX2Nvbm5lY3Rv ciA9CiAJCQl0b19hbWRncHVfZG1fY29ubmVjdG9yKGNvbm5lY3Rvcik7CisJc3RydWN0IGRtX2Nv bm5lY3Rvcl9zdGF0ZSAqZG1fY29uX3N0YXRlOwogCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGNvbm5lY3Rvci0+ZGV2OwogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gZGV2LT5kZXZf cHJpdmF0ZTsKIAorCWlmICghY29ubmVjdG9yLT5zdGF0ZSkgeworCQlEUk1fRVJST1IoIiVzIC0g Q29ubmVjdG9yIGhhcyBubyBzdGF0ZSIsIF9fZnVuY19fKTsKKwkJcmV0dXJuOworCX0KKworCWRt X2Nvbl9zdGF0ZSA9IHRvX2RtX2Nvbm5lY3Rvcl9zdGF0ZShjb25uZWN0b3ItPnN0YXRlKTsKKwog CWVkaWRfY2hlY2tfcmVxdWlyZWQgPSBmYWxzZTsKIAlpZiAoIWFtZGdwdV9kbV9jb25uZWN0b3It PmRjX3NpbmspIHsKIAkJRFJNX0VSUk9SKCJkY19zaW5rIE5VTEwsIGNvdWxkIG5vdCBhZGQgZnJl ZV9zeW5jIG1vZHVsZS5cbiIpOwpAQCAtNDg3Miw3ICs0ODU5LDcgQEAgdm9pZCBhbWRncHVfZG1f YWRkX3NpbmtfdG9fZnJlZXN5bmNfbW9kdWxlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0 b3IsCiAJCQkJCQlhbWRncHVfZG1fY29ubmVjdG9yKTsKIAkJfQogCX0KLQl2YWxfY2FwYWJsZSA9 IDA7CisJZG1fY29uX3N0YXRlLT5mcmVlc3luY19jYXBhYmxlID0gZmFsc2U7CiAJaWYgKGVkaWRf Y2hlY2tfcmVxdWlyZWQgPT0gdHJ1ZSAmJiAoZWRpZC0+dmVyc2lvbiA+IDEgfHwKIAkgICAoZWRp ZC0+dmVyc2lvbiA9PSAxICYmIGVkaWQtPnJldmlzaW9uID4gMSkpKSB7CiAJCWZvciAoaSA9IDA7 IGkgPCA0OyBpKyspIHsKQEAgLTQ5MDgsMjEgKzQ4OTUsMjAgQEAgdm9pZCBhbWRncHVfZG1fYWRk X3NpbmtfdG9fZnJlZXN5bmNfbW9kdWxlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3Is CiAJCQkJCWFtZGdwdV9kbV9jb25uZWN0b3ItPm1pbl92ZnJlcSAqIDEwMDAwMDA7CiAJCQlhbWRn cHVfZG1fY29ubmVjdG9yLT5jYXBzLm1heF9yZWZyZXNoX2luX21pY3JvX2h6ID0KIAkJCQkJYW1k Z3B1X2RtX2Nvbm5lY3Rvci0+bWF4X3ZmcmVxICogMTAwMDAwMDsKLQkJCQl2YWxfY2FwYWJsZSA9 IDE7CisJCQlkbV9jb25fc3RhdGUtPmZyZWVzeW5jX2NhcGFibGUgPSB0cnVlOwogCQl9CiAJfQot CWRybV9vYmplY3RfcHJvcGVydHlfc2V0X3ZhbHVlKCZjb25uZWN0b3ItPmJhc2UsCi0JCQkJICAg ICAgYWRldi0+bW9kZV9pbmZvLmZyZWVzeW5jX2NhcGFibGVfcHJvcGVydHksCi0JCQkJICAgICAg dmFsX2NhcGFibGUpOwotCWFtZGdwdV9mcmVlc3luY191cGRhdGVfcHJvcGVydHlfYXRvbWljKGNv bm5lY3RvciwgdmFsX2NhcGFibGUpOwogCisJZG1fY29uX3N0YXRlLT51c2VyX2VuYWJsZS5lbmFi bGVfZm9yX2dhbWluZyA9IGRtX2Nvbl9zdGF0ZS0+ZnJlZXN5bmNfY2FwYWJsZTsKKwlkbV9jb25f c3RhdGUtPnVzZXJfZW5hYmxlLmVuYWJsZV9mb3Jfc3RhdGljID0gZG1fY29uX3N0YXRlLT5mcmVl c3luY19jYXBhYmxlOworCWRtX2Nvbl9zdGF0ZS0+dXNlcl9lbmFibGUuZW5hYmxlX2Zvcl92aWRl byA9IGRtX2Nvbl9zdGF0ZS0+ZnJlZXN5bmNfY2FwYWJsZTsKIH0KIAogdm9pZCBhbWRncHVfZG1f cmVtb3ZlX3NpbmtfZnJvbV9mcmVlc3luY19tb2R1bGUoc3RydWN0IGRybV9jb25uZWN0b3IgKmNv bm5lY3RvcikKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RtX2Nvbm5lY3RvciAqYW1kZ3B1X2RtX2Nvbm5l Y3RvciA9CiAJCQl0b19hbWRncHVfZG1fY29ubmVjdG9yKGNvbm5lY3Rvcik7Ci0KKwlzdHJ1Y3Qg ZG1fY29ubmVjdG9yX3N0YXRlICpkbV9jb25fc3RhdGU7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGNvbm5lY3Rvci0+ZGV2OwogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKIApAQCAtNDkzMSwxNSArNDkxNywyMiBAQCB2b2lkIGFtZGdwdV9kbV9yZW1v dmVfc2lua19mcm9tX2ZyZWVzeW5jX21vZHVsZShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVj dG9yKQogCQlyZXR1cm47CiAJfQogCisJaWYgKCFjb25uZWN0b3ItPnN0YXRlKSB7CisJCURSTV9F UlJPUigiJXMgLSBDb25uZWN0b3IgaGFzIG5vIHN0YXRlIiwgX19mdW5jX18pOworCQlyZXR1cm47 CisJfQorCisJZG1fY29uX3N0YXRlID0gdG9fZG1fY29ubmVjdG9yX3N0YXRlKGNvbm5lY3Rvci0+ c3RhdGUpOworCiAJYW1kZ3B1X2RtX2Nvbm5lY3Rvci0+bWluX3ZmcmVxID0gMDsKIAlhbWRncHVf ZG1fY29ubmVjdG9yLT5tYXhfdmZyZXEgPSAwOwogCWFtZGdwdV9kbV9jb25uZWN0b3ItPnBpeGVs X2Nsb2NrX21oeiA9IDA7CiAKIAltZW1zZXQoJmFtZGdwdV9kbV9jb25uZWN0b3ItPmNhcHMsIDAs IHNpemVvZihhbWRncHVfZG1fY29ubmVjdG9yLT5jYXBzKSk7CiAKLQlkcm1fb2JqZWN0X3Byb3Bl cnR5X3NldF92YWx1ZSgmY29ubmVjdG9yLT5iYXNlLAotCQkJCSAgICAgIGFkZXYtPm1vZGVfaW5m by5mcmVlc3luY19jYXBhYmxlX3Byb3BlcnR5LAotCQkJCSAgICAgIDApOwotCWFtZGdwdV9mcmVl c3luY191cGRhdGVfcHJvcGVydHlfYXRvbWljKGNvbm5lY3RvciwgMCk7CisJZG1fY29uX3N0YXRl LT5mcmVlc3luY19jYXBhYmxlID0gZmFsc2U7CiAKKwlkbV9jb25fc3RhdGUtPnVzZXJfZW5hYmxl LmVuYWJsZV9mb3JfZ2FtaW5nID0gZmFsc2U7CisJZG1fY29uX3N0YXRlLT51c2VyX2VuYWJsZS5l bmFibGVfZm9yX3N0YXRpYyA9IGZhbHNlOworCWRtX2Nvbl9zdGF0ZS0+dXNlcl9lbmFibGUuZW5h YmxlX2Zvcl92aWRlbyA9IGZhbHNlOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlz cGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmgKaW5kZXggNmYxYWFlZTM1ZDExLi44MmE3NDU3ZDdm NjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1k Z3B1X2RtLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRn cHVfZG0uaApAQCAtMjMwLDYgKzIzMCw3IEBAIHN0cnVjdCBkbV9jb25uZWN0b3Jfc3RhdGUgewog CXVpbnQ4X3QgdW5kZXJzY2FuX2hib3JkZXI7CiAJYm9vbCB1bmRlcnNjYW5fZW5hYmxlOwogCXN0 cnVjdCBtb2RfZnJlZXN5bmNfdXNlcl9lbmFibGUgdXNlcl9lbmFibGU7CisJYm9vbCBmcmVlc3lu Y19jYXBhYmxlOwogfTsKIAogI2RlZmluZSB0b19kbV9jb25uZWN0b3Jfc3RhdGUoeClcCi0tIAoy LjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFt ZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=