From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Lowry Li (Arm Technology China)" Subject: [PATCH] drm/komeda: Adds VRR support Date: Wed, 3 Jul 2019 07:26:16 +0000 Message-ID: <1562138723-29546-1-git-send-email-lowry.li@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30084.outbound.protection.outlook.com [40.107.3.84]) by gabe.freedesktop.org (Postfix) with ESMTPS id 080096E0B0 for ; Wed, 3 Jul 2019 07:26:21 +0000 (UTC) Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Liviu Dudau , "james qian wang (Arm Technology China)" , "maarten.lankhorst@linux.intel.com" , "seanpaul@chromium.org" , "airlied@linux.ie" , Brian Starkey Cc: Ayan Halder , "Jonathan Chai (Arm Technology China)" , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , "Julien Yin (Arm Technology China)" , nd List-Id: dri-devel@lists.freedesktop.org QWRkcyBhIG5ldyBkcm0gcHJvcGVydHkgInZyciIgYW5kICJ2cnJfZW5hYmxlIiBhbmQgaW1wbGVt ZW50ZWQKdGhlIHNldC9nZXQgZnVuY3Rpb25zLCB0aHJvdWdoIHdoaWNoIHVzZXJzcGFjZSBjb3Vs ZCBzZXQgdmZwCmRhdGEgdG8ga29tZWRhLgoKU2lnbmVkLW9mZi1ieTogTG93cnkgTGkgKEFybSBU ZWNobm9sb2d5IENoaW5hKSA8bG93cnkubGlAYXJtLmNvbT4KLS0tCiAuLi4vZ3B1L2RybS9hcm0v ZGlzcGxheS9rb21lZGEvZDcxL2Q3MV9jb21wb25lbnQuYyB8ICA2ICsrKwogZHJpdmVycy9ncHUv ZHJtL2FybS9kaXNwbGF5L2tvbWVkYS9rb21lZGFfY3J0Yy5jICAgfCA2MiArKysrKysrKysrKysr KysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vYXJtL2Rpc3BsYXkva29tZWRhL2tvbWVkYV9rbXMu aCAgICB8IDEyICsrKysrCiAuLi4vZ3B1L2RybS9hcm0vZGlzcGxheS9rb21lZGEva29tZWRhX3Bp cGVsaW5lLmggICB8ICA0ICstCiA0IGZpbGVzIGNoYW5nZWQsIDgzIGluc2VydGlvbnMoKyksIDEg ZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYXJtL2Rpc3BsYXkva29t ZWRhL2Q3MS9kNzFfY29tcG9uZW50LmMgYi9kcml2ZXJzL2dwdS9kcm0vYXJtL2Rpc3BsYXkva29t ZWRhL2Q3MS9kNzFfY29tcG9uZW50LmMKaW5kZXggZWQzZjI3My4uYzEzNTVmNSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FybS9kaXNwbGF5L2tvbWVkYS9kNzEvZDcxX2NvbXBvbmVudC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hcm0vZGlzcGxheS9rb21lZGEvZDcxL2Q3MV9jb21wb25l bnQuYwpAQCAtMTA2NSw2ICsxMDY1LDcgQEAgc3RhdGljIHZvaWQgZDcxX3RpbWluZ19jdHJscl91 cGRhdGUoc3RydWN0IGtvbWVkYV9jb21wb25lbnQgKmMsCiAJCQkJICAgIHN0cnVjdCBrb21lZGFf Y29tcG9uZW50X3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNf c3QgPSBzdGF0ZS0+Y3J0Yy0+c3RhdGU7CisJc3RydWN0IGtvbWVkYV9jcnRjX3N0YXRlICprY3J0 Y19zdCA9IHRvX2tjcnRjX3N0KGNydGNfc3QpOwogCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpt b2RlID0gJmNydGNfc3QtPmFkanVzdGVkX21vZGU7CiAJdTMyIF9faW9tZW0gKnJlZyA9IGMtPnJl ZzsKIAl1MzIgaGFjdGl2ZSwgaGZyb250X3BvcmNoLCBoYmFja19wb3JjaCwgaHN5bmNfbGVuOwpA QCAtMTEwMiw2ICsxMTAzLDkgQEAgc3RhdGljIHZvaWQgZDcxX3RpbWluZ19jdHJscl91cGRhdGUo c3RydWN0IGtvbWVkYV9jb21wb25lbnQgKmMsCiAJCXZhbHVlIHw9IEJTX0NUUkxfREw7CiAJfQog CisJaWYgKGtjcnRjX3N0LT5lbl92cnIpCisJCW1hbGlkcF93cml0ZTMyX21hc2socmVnLCBCU19W SU5URVJWQUxTLCAweDNGRkYsIGtjcnRjX3N0LT52ZnApOworCiAJbWFsaWRwX3dyaXRlMzIocmVn LCBCTEtfQ09OVFJPTCwgdmFsdWUpOwogfQogCkBAIC0xMTcxLDYgKzExNzUsOCBAQCBzdGF0aWMg aW50IGQ3MV90aW1pbmdfY3RybHJfaW5pdChzdHJ1Y3QgZDcxX2RldiAqZDcxLAogCWN0cmxyID0g dG9fY3RybHIoYyk7CiAKIAljdHJsci0+c3VwcG9ydHNfZHVhbF9saW5rID0gdHJ1ZTsKKwljdHJs ci0+c3VwcG9ydHNfdnJyID0gdHJ1ZTsKKwlzZXRfcmFuZ2UoJmN0cmxyLT52ZnBfcmFuZ2UsIDAs IDB4M0ZGKTsKIAogCXJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Fy bS9kaXNwbGF5L2tvbWVkYS9rb21lZGFfY3J0Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2FybS9kaXNw bGF5L2tvbWVkYS9rb21lZGFfY3J0Yy5jCmluZGV4IDRmNTgwYjAuLjM3NDRlNmQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9hcm0vZGlzcGxheS9rb21lZGEva29tZWRhX2NydGMuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vYXJtL2Rpc3BsYXkva29tZWRhL2tvbWVkYV9jcnRjLmMKQEAgLTQ2 Nyw2ICs0NjcsOCBAQCBzdGF0aWMgdm9pZCBrb21lZGFfY3J0Y19yZXNldChzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMpCiAKIAlzdGF0ZSA9IGt6YWxsb2Moc2l6ZW9mKCpzdGF0ZSksIEdGUF9LRVJORUwp OwogCWlmIChzdGF0ZSkgeworCQlzdGF0ZS0+dmZwID0gMDsKKwkJc3RhdGUtPmVuX3ZyciA9IDA7 CiAJCWNydGMtPnN0YXRlID0gJnN0YXRlLT5iYXNlOwogCQljcnRjLT5zdGF0ZS0+Y3J0YyA9IGNy dGM7CiAJfQpAQCAtNDg3LDYgKzQ4OSw4IEBAIHN0YXRpYyB2b2lkIGtvbWVkYV9jcnRjX3Jlc2V0 KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAluZXctPmFmZmVjdGVkX3BpcGVzID0gb2xkLT5hY3Rp dmVfcGlwZXM7CiAJbmV3LT5jbG9ja19yYXRpbyA9IG9sZC0+Y2xvY2tfcmF0aW87CiAJbmV3LT5t YXhfc2xhdmVfem9yZGVyID0gb2xkLT5tYXhfc2xhdmVfem9yZGVyOworCW5ldy0+dmZwID0gb2xk LT52ZnA7CisJbmV3LT5lbl92cnIgPSBvbGQtPmVuX3ZycjsKIAogCXJldHVybiAmbmV3LT5iYXNl OwogfQpAQCAtNTI1LDYgKzUyOSwzMCBAQCBzdGF0aWMgdm9pZCBrb21lZGFfY3J0Y192Ymxhbmtf ZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlpZiAocHJvcGVydHkgPT0ga2NydGMt PmNsb2NrX3JhdGlvX3Byb3BlcnR5KSB7CiAJCSp2YWwgPSBrY3J0Y19zdC0+Y2xvY2tfcmF0aW87 CisJfSBlbHNlIGlmIChwcm9wZXJ0eSA9PSBrY3J0Yy0+dnJyX3Byb3BlcnR5KSB7CisJCSp2YWwg PSBrY3J0Y19zdC0+dmZwOworCX0gZWxzZSBpZiAocHJvcGVydHkgPT0ga2NydGMtPnZycl9lbmFi bGVfcHJvcGVydHkpIHsKKwkJKnZhbCA9IGtjcnRjX3N0LT5lbl92cnI7CisJfSBlbHNlIHsKKwkJ RFJNX0RFQlVHX0RSSVZFUigiVW5rbm93biBwcm9wZXJ0eSAlc1xuIiwgcHJvcGVydHktPm5hbWUp OworCQlyZXR1cm4gLUVJTlZBTDsKKwl9CisKKwlyZXR1cm4gMDsKK30KKworc3RhdGljIGludCBr b21lZGFfY3J0Y19hdG9taWNfc2V0X3Byb3BlcnR5KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKKwkJ CQkJICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSwKKwkJCQkJICAgc3RydWN0IGRybV9w cm9wZXJ0eSAqcHJvcGVydHksCisJCQkJCSAgIHVpbnQ2NF90IHZhbCkKK3sKKwlzdHJ1Y3Qga29t ZWRhX2NydGMgKmtjcnRjID0gdG9fa2NydGMoY3J0Yyk7CisJc3RydWN0IGtvbWVkYV9jcnRjX3N0 YXRlICprY3J0Y19zdCA9IHRvX2tjcnRjX3N0KHN0YXRlKTsKKworCWlmIChwcm9wZXJ0eSA9PSBr Y3J0Yy0+dnJyX3Byb3BlcnR5KSB7CisJCWtjcnRjX3N0LT52ZnAgPSB2YWw7CisJfSBlbHNlIGlm IChwcm9wZXJ0eSA9PSBrY3J0Yy0+dnJyX2VuYWJsZV9wcm9wZXJ0eSkgeworCQlrY3J0Y19zdC0+ ZW5fdnJyID0gdmFsOwogCX0gZWxzZSB7CiAJCURSTV9ERUJVR19EUklWRVIoIlVua25vd24gcHJv cGVydHkgJXNcbiIsIHByb3BlcnR5LT5uYW1lKTsKIAkJcmV0dXJuIC1FSU5WQUw7CkBAIC01NDQs NiArNTcyLDcgQEAgc3RhdGljIHZvaWQga29tZWRhX2NydGNfdmJsYW5rX2Rpc2FibGUoc3RydWN0 IGRybV9jcnRjICpjcnRjKQogCS5lbmFibGVfdmJsYW5rCQk9IGtvbWVkYV9jcnRjX3ZibGFua19l bmFibGUsCiAJLmRpc2FibGVfdmJsYW5rCQk9IGtvbWVkYV9jcnRjX3ZibGFua19kaXNhYmxlLAog CS5hdG9taWNfZ2V0X3Byb3BlcnR5CT0ga29tZWRhX2NydGNfYXRvbWljX2dldF9wcm9wZXJ0eSwK KwkuYXRvbWljX3NldF9wcm9wZXJ0eQk9IGtvbWVkYV9jcnRjX2F0b21pY19zZXRfcHJvcGVydHks CiB9OwogCiBpbnQga29tZWRhX2ttc19zZXR1cF9jcnRjcyhzdHJ1Y3Qga29tZWRhX2ttc19kZXYg KmttcywKQEAgLTYxMyw2ICs2NDIsMzUgQEAgc3RhdGljIGludCBrb21lZGFfY3J0Y19jcmVhdGVf c2xhdmVfcGxhbmVzX3Byb3BlcnR5KHN0cnVjdCBrb21lZGFfY3J0YyAqa2NydGMpCiAJcmV0dXJu IDA7CiB9CiAKK3N0YXRpYyBpbnQga29tZWRhX2NydGNfY3JlYXRlX3Zycl9wcm9wZXJ0eShzdHJ1 Y3Qga29tZWRhX2NydGMgKmtjcnRjKQoreworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9ICZrY3J0 Yy0+YmFzZTsKKwlzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpwcm9wOworCXN0cnVjdCBrb21lZGFfdGlt aW5nX2N0cmxyICpjdHJsciA9IGtjcnRjLT5tYXN0ZXItPmN0cmxyOworCisJaWYgKCFjdHJsci0+ c3VwcG9ydHNfdnJyKQorCQlyZXR1cm4gMDsKKworCXByb3AgPSBkcm1fcHJvcGVydHlfY3JlYXRl X3JhbmdlKGNydGMtPmRldiwgRFJNX01PREVfUFJPUF9BVE9NSUMsICJ2cnIiLAorCQkJCQkgY3Ry bHItPnZmcF9yYW5nZS5zdGFydCwKKwkJCQkJIGN0cmxyLT52ZnBfcmFuZ2UuZW5kKTsKKwlpZiAo IXByb3ApCisJCXJldHVybiAtRU5PTUVNOworCisJZHJtX29iamVjdF9hdHRhY2hfcHJvcGVydHko JmNydGMtPmJhc2UsIHByb3AsIDApOworCWtjcnRjLT52cnJfcHJvcGVydHkgPSBwcm9wOworCisJ cHJvcCA9IGRybV9wcm9wZXJ0eV9jcmVhdGVfYm9vbChjcnRjLT5kZXYsIERSTV9NT0RFX1BST1Bf QVRPTUlDLAorCQkJCQkiZW5hYmxlX3ZyciIpOworCWlmICghcHJvcCkKKwkJcmV0dXJuIC1FTk9N RU07CisKKwlkcm1fb2JqZWN0X2F0dGFjaF9wcm9wZXJ0eSgmY3J0Yy0+YmFzZSwgcHJvcCwgMCk7 CisJa2NydGMtPnZycl9lbmFibGVfcHJvcGVydHkgPSBwcm9wOworCisJcmV0dXJuIDA7Cit9CisK IHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICoKIGdldF9jcnRjX3ByaW1hcnkoc3RydWN0IGtvbWVk YV9rbXNfZGV2ICprbXMsIHN0cnVjdCBrb21lZGFfY3J0YyAqY3J0YykKIHsKQEAgLTY1OSw2ICs3 MTcsMTAgQEAgc3RhdGljIGludCBrb21lZGFfY3J0Y19hZGQoc3RydWN0IGtvbWVkYV9rbXNfZGV2 ICprbXMsCiAJaWYgKGVycikKIAkJcmV0dXJuIGVycjsKIAorCWVyciA9IGtvbWVkYV9jcnRjX2Ny ZWF0ZV92cnJfcHJvcGVydHkoa2NydGMpOworCWlmIChlcnIpCisJCXJldHVybiBlcnI7CisKIAly ZXR1cm4gZXJyOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYXJtL2Rpc3BsYXkv a29tZWRhL2tvbWVkYV9rbXMuaCBiL2RyaXZlcnMvZ3B1L2RybS9hcm0vZGlzcGxheS9rb21lZGEv a29tZWRhX2ttcy5oCmluZGV4IGRjMWQ0MzYuLmQwY2Y4MzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9hcm0vZGlzcGxheS9rb21lZGEva29tZWRhX2ttcy5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hcm0vZGlzcGxheS9rb21lZGEva29tZWRhX2ttcy5oCkBAIC05OCw2ICs5OCwxMiBAQCBz dHJ1Y3Qga29tZWRhX2NydGMgewogCiAJLyoqIEBzbGF2ZV9wbGFuZXNfcHJvcGVydHk6IHByb3Bl cnR5IGZvciBzbGF2ZXMgb2YgdGhlIHBsYW5lcyAqLwogCXN0cnVjdCBkcm1fcHJvcGVydHkgKnNs YXZlX3BsYW5lc19wcm9wZXJ0eTsKKworCS8qKiBAdnJyX3Byb3BlcnR5OiBwcm9wZXJ0eSBmb3Ig dmFyaWFibGUgcmVmcmVzaCByYXRlICovCisJc3RydWN0IGRybV9wcm9wZXJ0eSAqdnJyX3Byb3Bl cnR5OworCisJLyoqIEB2cnJfZW5hYmxlX3Byb3BlcnR5OiBwcm9wZXJ0eSBmb3IgZW5hYmxlL2Rp c2FibGUgdGhlIHZyciAqLworCXN0cnVjdCBkcm1fcHJvcGVydHkgKnZycl9lbmFibGVfcHJvcGVy dHk7CiB9OwogCiAvKioKQEAgLTEyNiw2ICsxMzIsMTIgQEAgc3RydWN0IGtvbWVkYV9jcnRjX3N0 YXRlIHsKIAogCS8qKiBAbWF4X3NsYXZlX3pvcmRlcjogdGhlIG1heGltdW0gb2Ygc2xhdmUgem9y ZGVyICovCiAJdTMyIG1heF9zbGF2ZV96b3JkZXI7CisKKwkvKiogQHZmcDogdGhlIHZhbHVlIG9m IHZlcnRpY2FsIGZyb250IHBvcmNoICovCisJdTMyIHZmcDsKKworCS8qKiBAZW5fdnJyOiBlbmFi bGUgc3RhdHVzIG9mIHZhcmlhYmxlIHJlZnJlc2ggcmF0ZSAqLworCXU4IGVuX3ZyciA6IDE7CiB9 OwogCiAvKiogc3RydWN0IGtvbWVkYV9rbXNfZGV2IC0gZm9yIGdhdGhlciBLTVMgcmVsYXRlZCB0 aGluZ3MgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hcm0vZGlzcGxheS9rb21lZGEv a29tZWRhX3BpcGVsaW5lLmggYi9kcml2ZXJzL2dwdS9kcm0vYXJtL2Rpc3BsYXkva29tZWRhL2tv bWVkYV9waXBlbGluZS5oCmluZGV4IDAwZTgwODMuLjY2ZDc2NjQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hcm0vZGlzcGxheS9rb21lZGEva29tZWRhX3BpcGVsaW5lLmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2FybS9kaXNwbGF5L2tvbWVkYS9rb21lZGFfcGlwZWxpbmUuaApAQCAtMzM2 LDcgKzMzNiw5IEBAIHN0cnVjdCBrb21lZGFfaW1wcm9jX3N0YXRlIHsKIC8qIGRpc3BsYXkgdGlt aW5nIGNvbnRyb2xsZXIgKi8KIHN0cnVjdCBrb21lZGFfdGltaW5nX2N0cmxyIHsKIAlzdHJ1Y3Qg a29tZWRhX2NvbXBvbmVudCBiYXNlOwotCXU4IHN1cHBvcnRzX2R1YWxfbGluayA6IDE7CisJdTgg c3VwcG9ydHNfZHVhbF9saW5rIDogMSwKKwkgICBzdXBwb3J0c192cnIgOiAxOworCXN0cnVjdCBt YWxpZHBfcmFuZ2UgdmZwX3JhbmdlOwogfTsKIAogc3RydWN0IGtvbWVkYV90aW1pbmdfY3RybHJf c3RhdGUgewotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29219C5B578 for ; Wed, 3 Jul 2019 07:26:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD80B21881 for ; Wed, 3 Jul 2019 07:26:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.b="GLby5wWg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727236AbfGCH0b (ORCPT ); Wed, 3 Jul 2019 03:26:31 -0400 Received: from mail-eopbgr30081.outbound.protection.outlook.com ([40.107.3.81]:33494 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726670AbfGCH0b (ORCPT ); Wed, 3 Jul 2019 03:26:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p94gQcHHaYt181M+IKhIYpLo3Nz4FNMsEt2G88aW/oI=; b=GLby5wWgPfGDOcPiKH709/KQKqDSs+viE9AiUBBumMBqM3ySpIaFCBZj4idxXUcTwHe+LqphuqrkH6DFgl1mBkAAtAAYw0Vxb8P1PEk7pKV4bUWSBhcqFe4LHzh7DGfbZFmdNUTiJG+gPKK/1wDfnCjd10PR880P9RJ7G/gCsrY= Received: from VI1PR08MB5488.eurprd08.prod.outlook.com (52.133.246.150) by VI1PR08MB3887.eurprd08.prod.outlook.com (20.178.80.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2032.20; Wed, 3 Jul 2019 07:26:16 +0000 Received: from VI1PR08MB5488.eurprd08.prod.outlook.com ([fe80::390b:b8a9:542b:9ef9]) by VI1PR08MB5488.eurprd08.prod.outlook.com ([fe80::390b:b8a9:542b:9ef9%3]) with mapi id 15.20.2032.019; Wed, 3 Jul 2019 07:26:16 +0000 From: "Lowry Li (Arm Technology China)" To: Liviu Dudau , "james qian wang (Arm Technology China)" , "maarten.lankhorst@linux.intel.com" , "seanpaul@chromium.org" , "airlied@linux.ie" , Brian Starkey CC: "Julien Yin (Arm Technology China)" , "Jonathan Chai (Arm Technology China)" , Ayan Halder , "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" , nd Subject: [PATCH] drm/komeda: Adds VRR support Thread-Topic: [PATCH] drm/komeda: Adds VRR support Thread-Index: AQHVMXCZgYg0h2S+S0iZ8YXT6sjbYw== Date: Wed, 3 Jul 2019 07:26:16 +0000 Message-ID: <1562138723-29546-1-git-send-email-lowry.li@arm.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [113.29.88.7] x-clientproxiedby: HK0P153CA0023.APCP153.PROD.OUTLOOK.COM (2603:1096:203:18::35) To VI1PR08MB5488.eurprd08.prod.outlook.com (2603:10a6:803:137::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Lowry.Li@arm.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 1.9.1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a5a257d2-b24d-46bf-cc34-08d6ff87bc3f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020);SRVR:VI1PR08MB3887; x-ms-traffictypediagnostic: VI1PR08MB3887: x-microsoft-antispam-prvs: nodisclaimer: True x-ms-oob-tlc-oobclassifiers: OLM:792; x-forefront-prvs: 00872B689F x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(366004)(396003)(136003)(39860400002)(376002)(346002)(199004)(189003)(68736007)(50226002)(66556008)(64756008)(66446008)(81156014)(81166006)(66066001)(66476007)(2501003)(2906002)(5660300002)(72206003)(7736002)(8676002)(478600001)(8936002)(305945005)(66946007)(52116002)(6636002)(71200400001)(4326008)(186003)(2201001)(6486002)(53936002)(14454004)(6436002)(99286004)(6512007)(71190400001)(26005)(256004)(3846002)(386003)(110136005)(5024004)(73956011)(14444005)(6506007)(55236004)(316002)(2616005)(486006)(476003)(86362001)(54906003)(6116002)(102836004)(25786009)(36756003);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR08MB3887;H:VI1PR08MB5488.eurprd08.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: DKGrf7a1hu0QScsDXkMu9QY+JDSpWsA9q/pE0IKvjMQYZiiDnpm8DX2e6BlZWQ7acplwBxgHxrLOJz+nytu79Qdlp7zWK+4i0i9OZxz7lsnJpLGu6pW4VwfL+Q6OYn50z/5hOjVLjbvPbfjCmgYroOXxxYug2F+bhTUICHi0WxHcJEPJOdt1aL921pvWbuuaywMJTe1lU5tJTGWDNw/mCNgRPNnqMeihEDZpZdGOzWJr7OCBEF3luNaEqzoODBKLFyZe6IIKJwqLyRqbnUVMKQP8L1x6YMiS+iagw8J3C27hMiCJobDcHW3Mkzd8Ih56VPr3DJ3gWaoT3joV2xj3d+GY4hpINqN0lFxataM8aQlCLhUTZu2HAndbgoeFKU0G9ziND6b5z8xkGK35C4i4QjLyrd+HtcwIljMgKtFEHIE= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5a257d2-b24d-46bf-cc34-08d6ff87bc3f X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Jul 2019 07:26:16.6401 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Lowry.Li@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3887 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adds a new drm property "vrr" and "vrr_enable" and implemented the set/get functions, through which userspace could set vfp data to komeda. Signed-off-by: Lowry Li (Arm Technology China) --- .../gpu/drm/arm/display/komeda/d71/d71_component.c | 6 +++ drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 62 ++++++++++++++++++= ++++ drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 12 +++++ .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 4 +- 4 files changed, 83 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c b/drive= rs/gpu/drm/arm/display/komeda/d71/d71_component.c index ed3f273..c1355f5 100644 --- a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c @@ -1065,6 +1065,7 @@ static void d71_timing_ctrlr_update(struct komeda_com= ponent *c, struct komeda_component_state *state) { struct drm_crtc_state *crtc_st =3D state->crtc->state; + struct komeda_crtc_state *kcrtc_st =3D to_kcrtc_st(crtc_st); struct drm_display_mode *mode =3D &crtc_st->adjusted_mode; u32 __iomem *reg =3D c->reg; u32 hactive, hfront_porch, hback_porch, hsync_len; @@ -1102,6 +1103,9 @@ static void d71_timing_ctrlr_update(struct komeda_com= ponent *c, value |=3D BS_CTRL_DL; } =20 + if (kcrtc_st->en_vrr) + malidp_write32_mask(reg, BS_VINTERVALS, 0x3FFF, kcrtc_st->vfp); + malidp_write32(reg, BLK_CONTROL, value); } =20 @@ -1171,6 +1175,8 @@ static int d71_timing_ctrlr_init(struct d71_dev *d71, ctrlr =3D to_ctrlr(c); =20 ctrlr->supports_dual_link =3D true; + ctrlr->supports_vrr =3D true; + set_range(&ctrlr->vfp_range, 0, 0x3FF); =20 return 0; } diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu= /drm/arm/display/komeda/komeda_crtc.c index 4f580b0..3744e6d 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -467,6 +467,8 @@ static void komeda_crtc_reset(struct drm_crtc *crtc) =20 state =3D kzalloc(sizeof(*state), GFP_KERNEL); if (state) { + state->vfp =3D 0; + state->en_vrr =3D 0; crtc->state =3D &state->base; crtc->state->crtc =3D crtc; } @@ -487,6 +489,8 @@ static void komeda_crtc_reset(struct drm_crtc *crtc) new->affected_pipes =3D old->active_pipes; new->clock_ratio =3D old->clock_ratio; new->max_slave_zorder =3D old->max_slave_zorder; + new->vfp =3D old->vfp; + new->en_vrr =3D old->en_vrr; =20 return &new->base; } @@ -525,6 +529,30 @@ static void komeda_crtc_vblank_disable(struct drm_crtc= *crtc) =20 if (property =3D=3D kcrtc->clock_ratio_property) { *val =3D kcrtc_st->clock_ratio; + } else if (property =3D=3D kcrtc->vrr_property) { + *val =3D kcrtc_st->vfp; + } else if (property =3D=3D kcrtc->vrr_enable_property) { + *val =3D kcrtc_st->en_vrr; + } else { + DRM_DEBUG_DRIVER("Unknown property %s\n", property->name); + return -EINVAL; + } + + return 0; +} + +static int komeda_crtc_atomic_set_property(struct drm_crtc *crtc, + struct drm_crtc_state *state, + struct drm_property *property, + uint64_t val) +{ + struct komeda_crtc *kcrtc =3D to_kcrtc(crtc); + struct komeda_crtc_state *kcrtc_st =3D to_kcrtc_st(state); + + if (property =3D=3D kcrtc->vrr_property) { + kcrtc_st->vfp =3D val; + } else if (property =3D=3D kcrtc->vrr_enable_property) { + kcrtc_st->en_vrr =3D val; } else { DRM_DEBUG_DRIVER("Unknown property %s\n", property->name); return -EINVAL; @@ -544,6 +572,7 @@ static void komeda_crtc_vblank_disable(struct drm_crtc = *crtc) .enable_vblank =3D komeda_crtc_vblank_enable, .disable_vblank =3D komeda_crtc_vblank_disable, .atomic_get_property =3D komeda_crtc_atomic_get_property, + .atomic_set_property =3D komeda_crtc_atomic_set_property, }; =20 int komeda_kms_setup_crtcs(struct komeda_kms_dev *kms, @@ -613,6 +642,35 @@ static int komeda_crtc_create_slave_planes_property(st= ruct komeda_crtc *kcrtc) return 0; } =20 +static int komeda_crtc_create_vrr_property(struct komeda_crtc *kcrtc) +{ + struct drm_crtc *crtc =3D &kcrtc->base; + struct drm_property *prop; + struct komeda_timing_ctrlr *ctrlr =3D kcrtc->master->ctrlr; + + if (!ctrlr->supports_vrr) + return 0; + + prop =3D drm_property_create_range(crtc->dev, DRM_MODE_PROP_ATOMIC, "vrr"= , + ctrlr->vfp_range.start, + ctrlr->vfp_range.end); + if (!prop) + return -ENOMEM; + + drm_object_attach_property(&crtc->base, prop, 0); + kcrtc->vrr_property =3D prop; + + prop =3D drm_property_create_bool(crtc->dev, DRM_MODE_PROP_ATOMIC, + "enable_vrr"); + if (!prop) + return -ENOMEM; + + drm_object_attach_property(&crtc->base, prop, 0); + kcrtc->vrr_enable_property =3D prop; + + return 0; +} + static struct drm_plane * get_crtc_primary(struct komeda_kms_dev *kms, struct komeda_crtc *crtc) { @@ -659,6 +717,10 @@ static int komeda_crtc_add(struct komeda_kms_dev *kms, if (err) return err; =20 + err =3D komeda_crtc_create_vrr_property(kcrtc); + if (err) + return err; + return err; } =20 diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h b/drivers/gpu/= drm/arm/display/komeda/komeda_kms.h index dc1d436..d0cf838 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h @@ -98,6 +98,12 @@ struct komeda_crtc { =20 /** @slave_planes_property: property for slaves of the planes */ struct drm_property *slave_planes_property; + + /** @vrr_property: property for variable refresh rate */ + struct drm_property *vrr_property; + + /** @vrr_enable_property: property for enable/disable the vrr */ + struct drm_property *vrr_enable_property; }; =20 /** @@ -126,6 +132,12 @@ struct komeda_crtc_state { =20 /** @max_slave_zorder: the maximum of slave zorder */ u32 max_slave_zorder; + + /** @vfp: the value of vertical front porch */ + u32 vfp; + + /** @en_vrr: enable status of variable refresh rate */ + u8 en_vrr : 1; }; =20 /** struct komeda_kms_dev - for gather KMS related things */ diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h b/drivers= /gpu/drm/arm/display/komeda/komeda_pipeline.h index 00e8083..66d7664 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h @@ -336,7 +336,9 @@ struct komeda_improc_state { /* display timing controller */ struct komeda_timing_ctrlr { struct komeda_component base; - u8 supports_dual_link : 1; + u8 supports_dual_link : 1, + supports_vrr : 1; + struct malidp_range vfp_range; }; =20 struct komeda_timing_ctrlr_state { --=20 1.9.1