From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bhawanpreet Lakha <Bhawanpreet.Lakha-5C7GfCeVMHo@public.gmane.org>
Subject: [PATCH 16/20] drm/amd/display: Handle Content protection property
 changes
Date: Tue, 10 Sep 2019 15:05:50 -0400
Message-ID: <20190910190554.1539-17-Bhawanpreet.Lakha@amd.com>
References: <20190829162253.10195-10-Bhawanpreet.Lakha@amd.com>
 <20190910190554.1539-1-Bhawanpreet.Lakha@amd.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
In-Reply-To: <20190910190554.1539-1-Bhawanpreet.Lakha-5C7GfCeVMHo@public.gmane.org>
List-Id: Discussion list for AMD gfx <amd-gfx.lists.freedesktop.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/amd-gfx>,
 <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/amd-gfx>
List-Post: <mailto:amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
List-Help: <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/amd-gfx>,
 <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=subscribe>
Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Sender: "amd-gfx" <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Bhawanpreet Lakha <Bhawanpreet.Lakha-5C7GfCeVMHo@public.gmane.org>

W1doeV0KV2UgbmVlZCB0byBtYW5hZ2UgdGhlIGNvbnRlbnQgcHJvdGVjdGlvbiBwcm9wZXJ0eSBj
aGFuZ2VzIGZvcgpkaWZmZXJlbnQgdXNlY2FzZSwgb25jZSBjcCBpcyBERVNJUkVEIHdlIG5lZWQg
dG8gbWFpbnRhaW4gdGhlCkVOQUJMRUQvREVTSVJFRCBzdGF0dXMgZm9yIGRpZmZlcmVudCBjYXNl
cy4KCltIb3ddCjEuIEF0dGFjaCB0aGUgY29udGVudF9wcm90ZWN0aW9uIHByb3BlcnR5CgoyLiBI
RENQIGVuYWJsZSAoVU5ERVNJUkVEIC0+IERFU0lSRUQpCgljYWxsIGludG8gdGhlIG1vZHVsZSB3
aXRoIHRoZSBjb3JyZWN0IHBhcmFtZXRlcnMgdG8gc3RhcnQKCWhkY3AuIFNldCBjcCB0byBFTkFC
TEVECgozLiBIRENQIGRpc2FibGUgKEVOQUJMRUQgLT4gVU5ERVNJUkVEKQoJQ2FsbCB0aGUgbW9k
dWxlIHRvIGRpc2FibGUgaGRjcC4KCjMuIEhhbmRsZSBTcGVjaWFsIGNhc2VzCShIb3RwbHVnLCBT
MywgaGVhZGxlc3MgUzMsIERQTVMpCglJZiBhbHJlYWR5IEVOQUJMRUQ6IHNldCB0byBERVNJUkVE
IG9uIHVucGx1Zy9zdXNwZW5kL2RwbXMsCglhbmQgZGlzYWJsZSBoZGNwCgoJVGhlbiBvbiBwbHVn
aW4vcmVzdW1lL2RwbXM6IGVuYWJsZSBIRENQCgpTaWduZWQtb2ZmLWJ5OiBCaGF3YW5wcmVldCBM
YWtoYSA8Qmhhd2FucHJlZXQuTGFraGFAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IEhhcnJ5IFdlbnRs
YW5kIDxoYXJyeS53ZW50bGFuZEBhbWQuY29tPgotLS0KIC4uLi9ncHUvZHJtL2FtZC9kaXNwbGF5
L2FtZGdwdV9kbS9hbWRncHVfZG0uYyB8IDk2ICsrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBj
aGFuZ2VkLCA5NiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Ft
ZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlz
cGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMKaW5kZXggMmNjOTVhYjBiNjQ1Li41OTFiOGFiOWQ0
YWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1k
Z3B1X2RtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRn
cHVfZG0uYwpAQCAtNjgsNiArNjgsNyBAQAogI2luY2x1ZGUgPGRybS9kcm1fZmJfaGVscGVyLmg+
CiAjaW5jbHVkZSA8ZHJtL2RybV9lZGlkLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9hdWRpb19jb21w
b25lbnQuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2hkY3AuaD4KIAogI2lmIGRlZmluZWQoQ09ORklH
X0RSTV9BTURfRENfRENOMV8wKQogI2luY2x1ZGUgIml2c3JjaWQvZGNuL2lycXNyY3NfZGNuXzFf
MC5oIgpAQCAtMTQ2Niw2ICsxNDY3LDExIEBAIGFtZGdwdV9kbV91cGRhdGVfY29ubmVjdG9yX2Fm
dGVyX2RldGVjdChzdHJ1Y3QgYW1kZ3B1X2RtX2Nvbm5lY3RvciAqYWNvbm5lY3RvcikKIAkJZGNf
c2lua19yZWxlYXNlKGFjb25uZWN0b3ItPmRjX3NpbmspOwogCQlhY29ubmVjdG9yLT5kY19zaW5r
ID0gTlVMTDsKIAkJYWNvbm5lY3Rvci0+ZWRpZCA9IE5VTEw7CisjaWZkZWYgQ09ORklHX0RSTV9B
TURfRENfSERDUAorCQkvKiBTZXQgQ1AgdG8gREVTSVJFRCBpZiBpdCB3YXMgRU5BQkxFRCwgc28g
d2UgY2FuIHJlLWVuYWJsZSBpdCBhZ2FpbiBvbiBob3RwbHVnICovCisJCWlmIChjb25uZWN0b3It
PnN0YXRlLT5jb250ZW50X3Byb3RlY3Rpb24gPT0gRFJNX01PREVfQ09OVEVOVF9QUk9URUNUSU9O
X0VOQUJMRUQpCisJCQljb25uZWN0b3ItPnN0YXRlLT5jb250ZW50X3Byb3RlY3Rpb24gPSBEUk1f
TU9ERV9DT05URU5UX1BST1RFQ1RJT05fREVTSVJFRDsKKyNlbmRpZgogCX0KIAogCW11dGV4X3Vu
bG9jaygmZGV2LT5tb2RlX2NvbmZpZy5tdXRleCk7CkBAIC0xNDgwLDYgKzE0ODYsOSBAQCBzdGF0
aWMgdm9pZCBoYW5kbGVfaHBkX2lycSh2b2lkICpwYXJhbSkKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3Rv
ciAqY29ubmVjdG9yID0gJmFjb25uZWN0b3ItPmJhc2U7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRl
diA9IGNvbm5lY3Rvci0+ZGV2OwogCWVudW0gZGNfY29ubmVjdGlvbl90eXBlIG5ld19jb25uZWN0
aW9uX3R5cGUgPSBkY19jb25uZWN0aW9uX25vbmU7CisjaWZkZWYgQ09ORklHX0RSTV9BTURfRENf
SERDUAorCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKyNl
bmRpZgogCiAJLyoKIAkgKiBJbiBjYXNlIG9mIGZhaWx1cmUgb3IgTVNUIG5vIG5lZWQgdG8gdXBk
YXRlIGNvbm5lY3RvciBzdGF0dXMgb3Igbm90aWZ5IHRoZSBPUwpAQCAtMTQ4Nyw2ICsxNDk2LDkg
QEAgc3RhdGljIHZvaWQgaGFuZGxlX2hwZF9pcnEodm9pZCAqcGFyYW0pCiAJICovCiAJbXV0ZXhf
bG9jaygmYWNvbm5lY3Rvci0+aHBkX2xvY2spOwogCisjaWZkZWYgQ09ORklHX0RSTV9BTURfRENf
SERDUAorCWhkY3BfcmVzZXRfZGlzcGxheShhZGV2LT5kbS5oZGNwX3dvcmtxdWV1ZSwgYWNvbm5l
Y3Rvci0+ZGNfbGluay0+bGlua19pbmRleCk7CisjZW5kaWYKIAlpZiAoYWNvbm5lY3Rvci0+ZmFr
ZV9lbmFibGUpCiAJCWFjb25uZWN0b3ItPmZha2VfZW5hYmxlID0gZmFsc2U7CiAKQEAgLTUwNzUs
NiArNTA4Nyw5IEBAIHZvaWQgYW1kZ3B1X2RtX2Nvbm5lY3Rvcl9pbml0X2hlbHBlcihzdHJ1Y3Qg
YW1kZ3B1X2Rpc3BsYXlfbWFuYWdlciAqZG0sCiAJCQkJCWFkZXYtPm1vZGVfaW5mby5mcmVlc3lu
Y19wcm9wZXJ0eSwgMCk7CiAJCWRybV9vYmplY3RfYXR0YWNoX3Byb3BlcnR5KCZhY29ubmVjdG9y
LT5iYXNlLmJhc2UsCiAJCQkJYWRldi0+bW9kZV9pbmZvLmZyZWVzeW5jX2NhcGFibGVfcHJvcGVy
dHksIDApOworI2lmZGVmIENPTkZJR19EUk1fQU1EX0RDX0hEQ1AKKwkJZHJtX2Nvbm5lY3Rvcl9h
dHRhY2hfY29udGVudF9wcm90ZWN0aW9uX3Byb3BlcnR5KCZhY29ubmVjdG9yLT5iYXNlLCBmYWxz
ZSk7CisjZW5kaWYKIAl9CiB9CiAKQEAgLTUzMTcsNiArNTMzMiw2MyBAQCBpc19zY2FsaW5nX3N0
YXRlX2RpZmZlcmVudChjb25zdCBzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0YXRlICpkbV9zdGF0ZSwK
IAlyZXR1cm4gZmFsc2U7CiB9CiAKKyNpZmRlZiBDT05GSUdfRFJNX0FNRF9EQ19IRENQCitzdGF0
aWMgYm9vbCBpc19jb250ZW50X3Byb3RlY3Rpb25fZGlmZmVyZW50KHN0cnVjdCBkcm1fY29ubmVj
dG9yX3N0YXRlICpzdGF0ZSwKKwkJCQkJICAgIGNvbnN0IHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0
YXRlICpvbGRfc3RhdGUsCisJCQkJCSAgICBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29u
bmVjdG9yLCBzdHJ1Y3QgaGRjcF93b3JrcXVldWUgKmhkY3BfdykKK3sKKwlzdHJ1Y3QgYW1kZ3B1
X2RtX2Nvbm5lY3RvciAqYWNvbm5lY3RvciA9IHRvX2FtZGdwdV9kbV9jb25uZWN0b3IoY29ubmVj
dG9yKTsKKworCS8qIENQIGlzIGJlaW5nIHJlIGVuYWJsZWQsIGlnbm9yZSB0aGlzICovCisJaWYg
KG9sZF9zdGF0ZS0+Y29udGVudF9wcm90ZWN0aW9uID09IERSTV9NT0RFX0NPTlRFTlRfUFJPVEVD
VElPTl9FTkFCTEVEICYmCisJICAgIHN0YXRlLT5jb250ZW50X3Byb3RlY3Rpb24gPT0gRFJNX01P
REVfQ09OVEVOVF9QUk9URUNUSU9OX0RFU0lSRUQpIHsKKwkJc3RhdGUtPmNvbnRlbnRfcHJvdGVj
dGlvbiA9IERSTV9NT0RFX0NPTlRFTlRfUFJPVEVDVElPTl9FTkFCTEVEOworCQlyZXR1cm4gZmFs
c2U7CisJfQorCisJLyogUzMgcmVzdW1lIGNhc2UsIHNpbmNlIG9sZCBzdGF0ZSB3aWxsIGFsd2F5
cyBiZSAwIChVTkRFU0lSRUQpIGFuZCB0aGUgcmVzdG9yZWQgc3RhdGUgd2lsbCBiZSBFTkFCTEVE
ICovCisJaWYgKG9sZF9zdGF0ZS0+Y29udGVudF9wcm90ZWN0aW9uID09IERSTV9NT0RFX0NPTlRF
TlRfUFJPVEVDVElPTl9VTkRFU0lSRUQgJiYKKwkgICAgc3RhdGUtPmNvbnRlbnRfcHJvdGVjdGlv
biA9PSBEUk1fTU9ERV9DT05URU5UX1BST1RFQ1RJT05fRU5BQkxFRCkKKwkJc3RhdGUtPmNvbnRl
bnRfcHJvdGVjdGlvbiA9IERSTV9NT0RFX0NPTlRFTlRfUFJPVEVDVElPTl9ERVNJUkVEOworCisJ
LyogQ2hlY2sgaWYgc29tZXRoaW5nIGlzIGNvbm5lY3RlZC9lbmFibGVkLCBvdGhlcndpc2Ugd2Ug
c3RhcnQgaGRjcCBidXQgbm90aGluZyBpcyBjb25uZWN0ZWQvZW5hYmxlZAorCSAqIGhvdC1wbHVn
LCBoZWFkbGVzcyBzMywgZHBtcworCSAqLworCWlmIChzdGF0ZS0+Y29udGVudF9wcm90ZWN0aW9u
ID09IERSTV9NT0RFX0NPTlRFTlRfUFJPVEVDVElPTl9ERVNJUkVEICYmIGNvbm5lY3Rvci0+ZHBt
cyA9PSBEUk1fTU9ERV9EUE1TX09OICYmCisJICAgIGFjb25uZWN0b3ItPmRjX3NpbmsgIT0gTlVM
TCkKKwkJcmV0dXJuIHRydWU7CisKKwlpZiAob2xkX3N0YXRlLT5jb250ZW50X3Byb3RlY3Rpb24g
PT0gc3RhdGUtPmNvbnRlbnRfcHJvdGVjdGlvbikKKwkJcmV0dXJuIGZhbHNlOworCisJaWYgKHN0
YXRlLT5jb250ZW50X3Byb3RlY3Rpb24gPT0gRFJNX01PREVfQ09OVEVOVF9QUk9URUNUSU9OX1VO
REVTSVJFRCkKKwkJcmV0dXJuIHRydWU7CisKKwlyZXR1cm4gZmFsc2U7Cit9CisKK3N0YXRpYyB2
b2lkIHVwZGF0ZV9jb250ZW50X3Byb3RlY3Rpb24oc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUg
KnN0YXRlLCBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAorCQkJCSAgICAg
IHN0cnVjdCBoZGNwX3dvcmtxdWV1ZSAqaGRjcF93KQoreworCXN0cnVjdCBhbWRncHVfZG1fY29u
bmVjdG9yICphY29ubmVjdG9yID0gdG9fYW1kZ3B1X2RtX2Nvbm5lY3Rvcihjb25uZWN0b3IpOwor
CisJaWYgKHN0YXRlLT5jb250ZW50X3Byb3RlY3Rpb24gPT0gRFJNX01PREVfQ09OVEVOVF9QUk9U
RUNUSU9OX0RFU0lSRUQpIHsKKwkJaGRjcF9hZGRfZGlzcGxheShoZGNwX3csIGFjb25uZWN0b3It
PmRjX2xpbmstPmxpbmtfaW5kZXgpOworCisJCS8qCisJCSAqIFRPRE86IEVOQUJMRUQgc2hvdWxk
IGJlIHZlcmlmaWVkIHVzaW5nIHBzcCwgaXQgaXMgcGxhbm5lZCBsYXRlci4KKwkJICogSnVzdCBz
ZXQgdGhpcyB0byBFTkFCTEVEIGZvciBub3cKKwkJICovCisJCXN0YXRlLT5jb250ZW50X3Byb3Rl
Y3Rpb24gPSBEUk1fTU9ERV9DT05URU5UX1BST1RFQ1RJT05fRU5BQkxFRDsKKworCQlyZXR1cm47
CisJfQorCisJaWYgKHN0YXRlLT5jb250ZW50X3Byb3RlY3Rpb24gPT0gRFJNX01PREVfQ09OVEVO
VF9QUk9URUNUSU9OX1VOREVTSVJFRCkKKwkJaGRjcF9yZW1vdmVfZGlzcGxheShoZGNwX3csIGFj
b25uZWN0b3ItPmRjX2xpbmstPmxpbmtfaW5kZXgsIGFjb25uZWN0b3ItPmJhc2UuaW5kZXgpOwor
Cit9CisjZW5kaWYKIHN0YXRpYyB2b2lkIHJlbW92ZV9zdHJlYW0oc3RydWN0IGFtZGdwdV9kZXZp
Y2UgKmFkZXYsCiAJCQkgIHN0cnVjdCBhbWRncHVfY3J0YyAqYWNydGMsCiAJCQkgIHN0cnVjdCBk
Y19zdHJlYW1fc3RhdGUgKnN0cmVhbSkKQEAgLTYyNDEsNiArNjMxMywzMCBAQCBzdGF0aWMgdm9p
ZCBhbWRncHVfZG1fYXRvbWljX2NvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz
dGF0ZSkKIAkJCQlhY3J0Yy0+b3RnX2luc3QgPSBzdGF0dXMtPnByaW1hcnlfb3RnX2luc3Q7CiAJ
CX0KIAl9CisjaWZkZWYgQ09ORklHX0RSTV9BTURfRENfSERDUAorCWZvcl9lYWNoX29sZG5ld19j
b25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3Rvciwgb2xkX2Nvbl9zdGF0ZSwgbmV3X2Nv
bl9zdGF0ZSwgaSkgeworCQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0YXRlICpkbV9uZXdfY29uX3N0
YXRlID0gdG9fZG1fY29ubmVjdG9yX3N0YXRlKG5ld19jb25fc3RhdGUpOworCQlzdHJ1Y3QgYW1k
Z3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1X2NydGMoZG1fbmV3X2Nvbl9zdGF0ZS0+YmFzZS5j
cnRjKTsKKwkJc3RydWN0IGFtZGdwdV9kbV9jb25uZWN0b3IgKmFjb25uZWN0b3IgPSB0b19hbWRn
cHVfZG1fY29ubmVjdG9yKGNvbm5lY3Rvcik7CisKKwkJbmV3X2NydGNfc3RhdGUgPSBOVUxMOwor
CisJCWlmIChhY3J0YykKKwkJCW5ld19jcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfbmV3X2Ny
dGNfc3RhdGUoc3RhdGUsICZhY3J0Yy0+YmFzZSk7CisKKwkJZG1fbmV3X2NydGNfc3RhdGUgPSB0
b19kbV9jcnRjX3N0YXRlKG5ld19jcnRjX3N0YXRlKTsKKworCQlpZiAoZG1fbmV3X2NydGNfc3Rh
dGUgJiYgZG1fbmV3X2NydGNfc3RhdGUtPnN0cmVhbSA9PSBOVUxMICYmCisJCSAgICBjb25uZWN0
b3ItPnN0YXRlLT5jb250ZW50X3Byb3RlY3Rpb24gPT0gRFJNX01PREVfQ09OVEVOVF9QUk9URUNU
SU9OX0VOQUJMRUQpIHsKKwkJCWhkY3BfcmVzZXRfZGlzcGxheShhZGV2LT5kbS5oZGNwX3dvcmtx
dWV1ZSwgYWNvbm5lY3Rvci0+ZGNfbGluay0+bGlua19pbmRleCk7CisJCQluZXdfY29uX3N0YXRl
LT5jb250ZW50X3Byb3RlY3Rpb24gPSBEUk1fTU9ERV9DT05URU5UX1BST1RFQ1RJT05fREVTSVJF
RDsKKwkJCWNvbnRpbnVlOworCQl9CisKKwkJaWYgKGlzX2NvbnRlbnRfcHJvdGVjdGlvbl9kaWZm
ZXJlbnQobmV3X2Nvbl9zdGF0ZSwgb2xkX2Nvbl9zdGF0ZSwgY29ubmVjdG9yLCBhZGV2LT5kbS5o
ZGNwX3dvcmtxdWV1ZSkpCisJCQl1cGRhdGVfY29udGVudF9wcm90ZWN0aW9uKG5ld19jb25fc3Rh
dGUsIGNvbm5lY3RvciwgYWRldi0+ZG0uaGRjcF93b3JrcXVldWUpOworCX0KKyNlbmRpZgogCiAJ
LyogSGFuZGxlIGNvbm5lY3RvciBzdGF0ZSBjaGFuZ2VzICovCiAJZm9yX2VhY2hfb2xkbmV3X2Nv
bm5lY3Rvcl9pbl9zdGF0ZShzdGF0ZSwgY29ubmVjdG9yLCBvbGRfY29uX3N0YXRlLCBuZXdfY29u
X3N0YXRlLCBpKSB7Ci0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRl
c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v
YW1kLWdmeA==