From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Stuebner Subject: Re: [PATCH v3.1 1/3] drm/rockchip: dw_hdmi: add RK3399 HDMI support Date: Thu, 22 Jun 2017 09:31:37 +0200 Message-ID: <1751555.73cFbViMXZ@phil> References: <1496992236-10634-1-git-send-email-mark.yao@rock-chips.com> <1498115845-7177-1-git-send-email-mark.yao@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1498115845-7177-1-git-send-email-mark.yao@rock-chips.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Mark Yao Cc: Mark Rutland , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, Rob Herring , linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org SGkgTWFyaywKCkFtIERvbm5lcnN0YWcsIDIyLiBKdW5pIDIwMTcsIDE1OjE3OjI0IENFU1Qgc2No cmllYiBNYXJrIFlhbzoKPiBSSzMzOTkgYW5kIFJLMzI4OCBzaGFyZWQgdGhlIHNhbWUgSERNSSBJ UCBjb250cm9sbGVyLCBvbmx5IHNvbWUgbGlnaHQKPiBkaWZmZXJlbmNlIHdpdGggR1JGIGNvbmZp Z3VyZS4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBZYWtpciBZYW5nIDx5a2tAcm9jay1jaGlwcy5jb20+ Cj4gU2lnbmVkLW9mZi1ieTogTWFyayBZYW8gPG1hcmsueWFvQHJvY2stY2hpcHMuY29tPgo+IC0t LQo+IENoYW5nZXMgaW4gdjMuMToKPiAgIENvcnJlY3QgZG9jdW1lbnRhdGlvbiBjb21wYXRpYmxl J3MgZm9ybWF0KFJvYiBIZXJyaW5nKS4KPiBDaGFuZ2VzIGluIHYzOgo+ICAgcmVtb3ZlIGhkbWlf cGh5X2NvbmZpZ3VyZV9kd2NfaGRtaV8zZF90eCBjYWxsYmFrLgo+IAo+IENoYW5nZXMgaW4gdjI6 Cj4gICByZXVzZSBoZG1pX3BoeV9jb25maWd1cmVfZHdjX2hkbWlfM2RfdHggZm9yIHBoeSBjb25m aWd1cmUKPiAgIGZpeHVwIERvY3VtZW50YXRpb24KPiAKPiAgLi4uL2JpbmRpbmdzL2Rpc3BsYXkv cm9ja2NoaXAvZHdfaGRtaS1yb2NrY2hpcC50eHQgfCAgNCArLQo+ICBkcml2ZXJzL2dwdS9kcm0v cm9ja2NoaXAvZHdfaGRtaS1yb2NrY2hpcC5jICAgICAgICB8IDY3ICsrKysrKysrKysrKysrKysr Ky0tLS0KPiAgMiBmaWxlcyBjaGFuZ2VkLCA1OSBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMo LSkKPiAKPiBkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL2Rp c3BsYXkvcm9ja2NoaXAvZHdfaGRtaS1yb2NrY2hpcC50eHQgYi9Eb2N1bWVudGF0aW9uL2Rldmlj ZXRyZWUvYmluZGluZ3MvZGlzcGxheS9yb2NrY2hpcC9kd19oZG1pLXJvY2tjaGlwLnR4dAo+IGlu ZGV4IDA0NjA3NmMuLjcwMzlhMTUgMTAwNjQ0Cj4gLS0tIGEvRG9jdW1lbnRhdGlvbi9kZXZpY2V0 cmVlL2JpbmRpbmdzL2Rpc3BsYXkvcm9ja2NoaXAvZHdfaGRtaS1yb2NrY2hpcC50eHQKPiArKysg Yi9Eb2N1bWVudGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3MvZGlzcGxheS9yb2NrY2hpcC9kd19o ZG1pLXJvY2tjaGlwLnR4dAo+IEBAIC0xMSw3ICsxMSw5IEBAIGZvbGxvd2luZyBkZXZpY2Utc3Bl Y2lmaWMgcHJvcGVydGllcy4KPiAgCj4gIFJlcXVpcmVkIHByb3BlcnRpZXM6Cj4gIAo+IC0tIGNv bXBhdGlibGU6IFNoYWxsIGNvbnRhaW4gInJvY2tjaGlwLHJrMzI4OC1kdy1oZG1pIi4KPiArLSBj b21wYXRpYmxlOiBzaG91bGQgYmUgb25lIG9mIHRoZSBmb2xsb3dpbmc6Cj4gKwkJInJvY2tjaGlw LHJrMzI4OC1kdy1oZG1pIgo+ICsJCSJyb2NrY2hpcCxyazMzOTktZHctaGRtaSIKPiAgLSByZWc6 IFNlZSBkd19oZG1pLnR4dC4KPiAgLSByZWctaW8td2lkdGg6IFNlZSBkd19oZG1pLnR4dC4gU2hh bGwgYmUgNC4KPiAgLSBpbnRlcnJ1cHRzOiBIRE1JIGludGVycnVwdCBudW1iZXIKPiBkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3X2hkbWktcm9ja2NoaXAuYyBiL2RyaXZl cnMvZ3B1L2RybS9yb2NrY2hpcC9kd19oZG1pLXJvY2tjaGlwLmMKPiBpbmRleCA2M2RhYjZmLi45 MGFhYWY0IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kd19oZG1pLXJv Y2tjaGlwLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHdfaGRtaS1yb2NrY2hp cC5jCj4gQEAgLTIwLDEzICsyMCwzMCBAQAo+ICAjaW5jbHVkZSAicm9ja2NoaXBfZHJtX2Rydi5o Igo+ICAjaW5jbHVkZSAicm9ja2NoaXBfZHJtX3ZvcC5oIgo+ICAKPiAtI2RlZmluZSBHUkZfU09D X0NPTjYgICAgICAgICAgICAgICAgICAgIDB4MDI1Ywo+IC0jZGVmaW5lIEhETUlfU0VMX1ZPUF9M SVQgICAgICAgICAgICAgICAgKDEgPDwgNCkKPiArI2RlZmluZSBSSzMyODhfR1JGX1NPQ19DT042 CQkweDAyNUMKPiArI2RlZmluZSBSSzMyODhfSERNSV9MQ0RDX1NFTAkJQklUKDQpCj4gKyNkZWZp bmUgUkszMzk5X0dSRl9TT0NfQ09OMjAJCTB4NjI1MAo+ICsjZGVmaW5lIFJLMzM5OV9IRE1JX0xD RENfU0VMCQlCSVQoNikKPiArCj4gKyNkZWZpbmUgSElXT1JEX1VQREFURSh2YWwsIG1hc2spCSh2 YWwgfCAobWFzaykgPDwgMTYpCj4gKwo+ICsvKioKPiArICogc3RydWN0IHJvY2tjaGlwX2hkbWlf Y2hpcF9kYXRhIC0gc3BsaXRlIHRoZSBncmYgc2V0dGluZyBvZiBraW5kIG9mIGNoaXBzCj4gKyAq IEBsY2RzZWxfZ3JmX3JlZzogZ3JmIHJlZ2lzdGVyIG9mZnNldCBvZiBsY2RjIHNlbGVjdAo+ICsg KiBAbGNkc2VsX2JpZzogcmVnIHZhbHVlIG9mIHNlbGVjdGluZyB2b3AgYmlnIGZvciBIRE1JCj4g KyAqIEBsY2RzZWxfbGl0OiByZWcgdmFsdWUgb2Ygc2VsZWN0aW5nIHZvcCBsaXR0bGUgZm9yIEhE TUkKPiArICovCj4gK3N0cnVjdCByb2NrY2hpcF9oZG1pX2NoaXBfZGF0YSB7Cj4gKwl1MzIJbGNk c2VsX2dyZl9yZWc7CgpIb3cgZG8geW91IHBsYW4gb24gaGFuZGxpbmcgdGhlIHJrMzM2OCAod2l0 aCBvbmx5IG9uZSBWT1AgYW5kIHRodXMKbm8gc2VsZWN0aW9uIGhhcHBlbmluZyk/IEknZCBqdXN0 IG1ha2UgdGhlIGFib3ZlIGFuIGludCwgc28gd2UgY291bGQKc2V0IGl0IHRvIC0xIGZvciB0aGF0 IGNhc2UuICh2YWx1ZSAwIGlzIGFmdGVyIGFsbCBhIHZhbGlkIHJlZykuCgoKSGVpa28KCgo+ICsJ dTMyCWxjZHNlbF9iaWc7Cj4gKwl1MzIJbGNkc2VsX2xpdDsKPiArfTsKPiAgCj4gIHN0cnVjdCBy b2NrY2hpcF9oZG1pIHsKPiAgCXN0cnVjdCBkZXZpY2UgKmRldjsKPiAgCXN0cnVjdCByZWdtYXAg KnJlZ21hcDsKPiAgCXN0cnVjdCBkcm1fZW5jb2RlciBlbmNvZGVyOwo+ICsJY29uc3Qgc3RydWN0 IHJvY2tjaGlwX2hkbWlfY2hpcF9kYXRhICpjaGlwX2RhdGE7Cj4gIH07Cj4gIAo+ICAjZGVmaW5l IHRvX3JvY2tjaGlwX2hkbWkoeCkJY29udGFpbmVyX29mKHgsIHN0cnVjdCByb2NrY2hpcF9oZG1p LCB4KQo+IEBAIC0xOTgsMTcgKzIxNSwyMCBAQCBzdGF0aWMgdm9pZCBkd19oZG1pX3JvY2tjaGlw X2VuY29kZXJfZW5hYmxlKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKPiAgewo+ICAJc3Ry dWN0IHJvY2tjaGlwX2hkbWkgKmhkbWkgPSB0b19yb2NrY2hpcF9oZG1pKGVuY29kZXIpOwo+ICAJ dTMyIHZhbDsKPiAtCWludCBtdXg7Cj4gKwlpbnQgcmV0Owo+ICAKPiAtCW11eCA9IGRybV9vZl9l bmNvZGVyX2FjdGl2ZV9lbmRwb2ludF9pZChoZG1pLT5kZXYtPm9mX25vZGUsIGVuY29kZXIpOwo+ IC0JaWYgKG11eCkKPiAtCQl2YWwgPSBIRE1JX1NFTF9WT1BfTElUIHwgKEhETUlfU0VMX1ZPUF9M SVQgPDwgMTYpOwo+ICsJcmV0ID0gZHJtX29mX2VuY29kZXJfYWN0aXZlX2VuZHBvaW50X2lkKGhk bWktPmRldi0+b2Zfbm9kZSwgZW5jb2Rlcik7Cj4gKwlpZiAocmV0KQo+ICsJCXZhbCA9IGhkbWkt PmNoaXBfZGF0YS0+bGNkc2VsX2xpdDsKPiAgCWVsc2UKPiAtCQl2YWwgPSBIRE1JX1NFTF9WT1Bf TElUIDw8IDE2Owo+ICsJCXZhbCA9IGhkbWktPmNoaXBfZGF0YS0+bGNkc2VsX2JpZzsKPiArCj4g KwlyZXQgPSByZWdtYXBfd3JpdGUoaGRtaS0+cmVnbWFwLCBoZG1pLT5jaGlwX2RhdGEtPmxjZHNl bF9ncmZfcmVnLCB2YWwpOwo+ICsJaWYgKHJldCAhPSAwKQo+ICsJCWRldl9lcnIoaGRtaS0+ZGV2 LCAiQ291bGQgbm90IHdyaXRlIHRvIEdSRjogJWRcbiIsIHJldCk7Cj4gIAo+IC0JcmVnbWFwX3dy aXRlKGhkbWktPnJlZ21hcCwgR1JGX1NPQ19DT042LCB2YWwpOwo+ICAJZGV2X2RiZyhoZG1pLT5k ZXYsICJ2b3AgJXMgb3V0cHV0IHRvIGhkbWlcbiIsCj4gLQkJKG11eCkgPyAiTElUIiA6ICJCSUci KTsKPiArCQlyZXQgPyAiTElUIiA6ICJCSUciKTsKPiAgfQo+ICAKPiAgc3RhdGljIGludAo+IEBA IC0yMzIsMTYgKzI1Miw0MCBAQCBzdGF0aWMgdm9pZCBkd19oZG1pX3JvY2tjaGlwX2VuY29kZXJf ZW5hYmxlKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKPiAgCS5hdG9taWNfY2hlY2sgPSBk d19oZG1pX3JvY2tjaGlwX2VuY29kZXJfYXRvbWljX2NoZWNrLAo+ICB9Owo+ICAKPiAtc3RhdGlj IGNvbnN0IHN0cnVjdCBkd19oZG1pX3BsYXRfZGF0YSByb2NrY2hpcF9oZG1pX2Rydl9kYXRhID0g ewo+ICtzdGF0aWMgc3RydWN0IHJvY2tjaGlwX2hkbWlfY2hpcF9kYXRhIHJrMzI4OF9jaGlwX2Rh dGEgPSB7Cj4gKwkubGNkc2VsX2dyZl9yZWcgPSBSSzMyODhfR1JGX1NPQ19DT042LAo+ICsJLmxj ZHNlbF9iaWcgPSBISVdPUkRfVVBEQVRFKDAsIFJLMzI4OF9IRE1JX0xDRENfU0VMKSwKPiArCS5s Y2RzZWxfbGl0ID0gSElXT1JEX1VQREFURShSSzMyODhfSERNSV9MQ0RDX1NFTCwgUkszMjg4X0hE TUlfTENEQ19TRUwpLAo+ICt9Owo+ICsKPiArc3RhdGljIGNvbnN0IHN0cnVjdCBkd19oZG1pX3Bs YXRfZGF0YSByazMyODhfaGRtaV9kcnZfZGF0YSA9IHsKPiArCS5tb2RlX3ZhbGlkID0gZHdfaGRt aV9yb2NrY2hpcF9tb2RlX3ZhbGlkLAo+ICsJLm1wbGxfY2ZnICAgPSByb2NrY2hpcF9tcGxsX2Nm ZywKPiArCS5jdXJfY3RyICAgID0gcm9ja2NoaXBfY3VyX2N0ciwKPiArCS5waHlfY29uZmlnID0g cm9ja2NoaXBfcGh5X2NvbmZpZywKPiArCS5waHlfZGF0YSA9ICZyazMyODhfY2hpcF9kYXRhLAo+ ICt9Owo+ICsKPiArc3RhdGljIHN0cnVjdCByb2NrY2hpcF9oZG1pX2NoaXBfZGF0YSByazMzOTlf Y2hpcF9kYXRhID0gewo+ICsJLmxjZHNlbF9ncmZfcmVnID0gUkszMzk5X0dSRl9TT0NfQ09OMjAs Cj4gKwkubGNkc2VsX2JpZyA9IEhJV09SRF9VUERBVEUoMCwgUkszMzk5X0hETUlfTENEQ19TRUwp LAo+ICsJLmxjZHNlbF9saXQgPSBISVdPUkRfVVBEQVRFKFJLMzM5OV9IRE1JX0xDRENfU0VMLCBS SzMzOTlfSERNSV9MQ0RDX1NFTCksCj4gK307Cj4gKwo+ICtzdGF0aWMgY29uc3Qgc3RydWN0IGR3 X2hkbWlfcGxhdF9kYXRhIHJrMzM5OV9oZG1pX2Rydl9kYXRhID0gewo+ICAJLm1vZGVfdmFsaWQg PSBkd19oZG1pX3JvY2tjaGlwX21vZGVfdmFsaWQsCj4gIAkubXBsbF9jZmcgICA9IHJvY2tjaGlw X21wbGxfY2ZnLAo+ICAJLmN1cl9jdHIgICAgPSByb2NrY2hpcF9jdXJfY3RyLAo+ICAJLnBoeV9j b25maWcgPSByb2NrY2hpcF9waHlfY29uZmlnLAo+ICsJLnBoeV9kYXRhID0gJnJrMzM5OV9jaGlw X2RhdGEsCj4gIH07Cj4gIAo+ICBzdGF0aWMgY29uc3Qgc3RydWN0IG9mX2RldmljZV9pZCBkd19o ZG1pX3JvY2tjaGlwX2R0X2lkc1tdID0gewo+ICAJeyAuY29tcGF0aWJsZSA9ICJyb2NrY2hpcCxy azMyODgtZHctaGRtaSIsCj4gLQkgIC5kYXRhID0gJnJvY2tjaGlwX2hkbWlfZHJ2X2RhdGEKPiAr CSAgLmRhdGEgPSAmcmszMjg4X2hkbWlfZHJ2X2RhdGEKPiArCX0sCj4gKwl7IC5jb21wYXRpYmxl ID0gInJvY2tjaGlwLHJrMzM5OS1kdy1oZG1pIiwKPiArCSAgLmRhdGEgPSAmcmszMzk5X2hkbWlf ZHJ2X2RhdGEKPiAgCX0sCj4gIAl7fSwKPiAgfTsKPiBAQCAtMjY4LDYgKzMxMiw3IEBAIHN0YXRp YyBpbnQgZHdfaGRtaV9yb2NrY2hpcF9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRl dmljZSAqbWFzdGVyLAo+ICAJbWF0Y2ggPSBvZl9tYXRjaF9ub2RlKGR3X2hkbWlfcm9ja2NoaXBf ZHRfaWRzLCBwZGV2LT5kZXYub2Zfbm9kZSk7Cj4gIAlwbGF0X2RhdGEgPSBtYXRjaC0+ZGF0YTsK PiAgCWhkbWktPmRldiA9ICZwZGV2LT5kZXY7Cj4gKwloZG1pLT5jaGlwX2RhdGEgPSBwbGF0X2Rh dGEtPnBoeV9kYXRhOwo+ICAJZW5jb2RlciA9ICZoZG1pLT5lbmNvZGVyOwo+ICAKPiAgCWVuY29k ZXItPnBvc3NpYmxlX2NydGNzID0gZHJtX29mX2ZpbmRfcG9zc2libGVfY3J0Y3MoZHJtLCBkZXYt Pm9mX25vZGUpOwo+IAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: heiko@sntech.de (Heiko Stuebner) Date: Thu, 22 Jun 2017 09:31:37 +0200 Subject: [PATCH v3.1 1/3] drm/rockchip: dw_hdmi: add RK3399 HDMI support In-Reply-To: <1498115845-7177-1-git-send-email-mark.yao@rock-chips.com> References: <1496992236-10634-1-git-send-email-mark.yao@rock-chips.com> <1498115845-7177-1-git-send-email-mark.yao@rock-chips.com> Message-ID: <1751555.73cFbViMXZ@phil> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Mark, Am Donnerstag, 22. Juni 2017, 15:17:24 CEST schrieb Mark Yao: > RK3399 and RK3288 shared the same HDMI IP controller, only some light > difference with GRF configure. > > Signed-off-by: Yakir Yang > Signed-off-by: Mark Yao > --- > Changes in v3.1: > Correct documentation compatible's format(Rob Herring). > Changes in v3: > remove hdmi_phy_configure_dwc_hdmi_3d_tx callbak. > > Changes in v2: > reuse hdmi_phy_configure_dwc_hdmi_3d_tx for phy configure > fixup Documentation > > .../bindings/display/rockchip/dw_hdmi-rockchip.txt | 4 +- > drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 67 ++++++++++++++++++---- > 2 files changed, 59 insertions(+), 12 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt b/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt > index 046076c..7039a15 100644 > --- a/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt > +++ b/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt > @@ -11,7 +11,9 @@ following device-specific properties. > > Required properties: > > -- compatible: Shall contain "rockchip,rk3288-dw-hdmi". > +- compatible: should be one of the following: > + "rockchip,rk3288-dw-hdmi" > + "rockchip,rk3399-dw-hdmi" > - reg: See dw_hdmi.txt. > - reg-io-width: See dw_hdmi.txt. Shall be 4. > - interrupts: HDMI interrupt number > diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c > index 63dab6f..90aaaf4 100644 > --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c > +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c > @@ -20,13 +20,30 @@ > #include "rockchip_drm_drv.h" > #include "rockchip_drm_vop.h" > > -#define GRF_SOC_CON6 0x025c > -#define HDMI_SEL_VOP_LIT (1 << 4) > +#define RK3288_GRF_SOC_CON6 0x025C > +#define RK3288_HDMI_LCDC_SEL BIT(4) > +#define RK3399_GRF_SOC_CON20 0x6250 > +#define RK3399_HDMI_LCDC_SEL BIT(6) > + > +#define HIWORD_UPDATE(val, mask) (val | (mask) << 16) > + > +/** > + * struct rockchip_hdmi_chip_data - splite the grf setting of kind of chips > + * @lcdsel_grf_reg: grf register offset of lcdc select > + * @lcdsel_big: reg value of selecting vop big for HDMI > + * @lcdsel_lit: reg value of selecting vop little for HDMI > + */ > +struct rockchip_hdmi_chip_data { > + u32 lcdsel_grf_reg; How do you plan on handling the rk3368 (with only one VOP and thus no selection happening)? I'd just make the above an int, so we could set it to -1 for that case. (value 0 is after all a valid reg). Heiko > + u32 lcdsel_big; > + u32 lcdsel_lit; > +}; > > struct rockchip_hdmi { > struct device *dev; > struct regmap *regmap; > struct drm_encoder encoder; > + const struct rockchip_hdmi_chip_data *chip_data; > }; > > #define to_rockchip_hdmi(x) container_of(x, struct rockchip_hdmi, x) > @@ -198,17 +215,20 @@ static void dw_hdmi_rockchip_encoder_enable(struct drm_encoder *encoder) > { > struct rockchip_hdmi *hdmi = to_rockchip_hdmi(encoder); > u32 val; > - int mux; > + int ret; > > - mux = drm_of_encoder_active_endpoint_id(hdmi->dev->of_node, encoder); > - if (mux) > - val = HDMI_SEL_VOP_LIT | (HDMI_SEL_VOP_LIT << 16); > + ret = drm_of_encoder_active_endpoint_id(hdmi->dev->of_node, encoder); > + if (ret) > + val = hdmi->chip_data->lcdsel_lit; > else > - val = HDMI_SEL_VOP_LIT << 16; > + val = hdmi->chip_data->lcdsel_big; > + > + ret = regmap_write(hdmi->regmap, hdmi->chip_data->lcdsel_grf_reg, val); > + if (ret != 0) > + dev_err(hdmi->dev, "Could not write to GRF: %d\n", ret); > > - regmap_write(hdmi->regmap, GRF_SOC_CON6, val); > dev_dbg(hdmi->dev, "vop %s output to hdmi\n", > - (mux) ? "LIT" : "BIG"); > + ret ? "LIT" : "BIG"); > } > > static int > @@ -232,16 +252,40 @@ static void dw_hdmi_rockchip_encoder_enable(struct drm_encoder *encoder) > .atomic_check = dw_hdmi_rockchip_encoder_atomic_check, > }; > > -static const struct dw_hdmi_plat_data rockchip_hdmi_drv_data = { > +static struct rockchip_hdmi_chip_data rk3288_chip_data = { > + .lcdsel_grf_reg = RK3288_GRF_SOC_CON6, > + .lcdsel_big = HIWORD_UPDATE(0, RK3288_HDMI_LCDC_SEL), > + .lcdsel_lit = HIWORD_UPDATE(RK3288_HDMI_LCDC_SEL, RK3288_HDMI_LCDC_SEL), > +}; > + > +static const struct dw_hdmi_plat_data rk3288_hdmi_drv_data = { > + .mode_valid = dw_hdmi_rockchip_mode_valid, > + .mpll_cfg = rockchip_mpll_cfg, > + .cur_ctr = rockchip_cur_ctr, > + .phy_config = rockchip_phy_config, > + .phy_data = &rk3288_chip_data, > +}; > + > +static struct rockchip_hdmi_chip_data rk3399_chip_data = { > + .lcdsel_grf_reg = RK3399_GRF_SOC_CON20, > + .lcdsel_big = HIWORD_UPDATE(0, RK3399_HDMI_LCDC_SEL), > + .lcdsel_lit = HIWORD_UPDATE(RK3399_HDMI_LCDC_SEL, RK3399_HDMI_LCDC_SEL), > +}; > + > +static const struct dw_hdmi_plat_data rk3399_hdmi_drv_data = { > .mode_valid = dw_hdmi_rockchip_mode_valid, > .mpll_cfg = rockchip_mpll_cfg, > .cur_ctr = rockchip_cur_ctr, > .phy_config = rockchip_phy_config, > + .phy_data = &rk3399_chip_data, > }; > > static const struct of_device_id dw_hdmi_rockchip_dt_ids[] = { > { .compatible = "rockchip,rk3288-dw-hdmi", > - .data = &rockchip_hdmi_drv_data > + .data = &rk3288_hdmi_drv_data > + }, > + { .compatible = "rockchip,rk3399-dw-hdmi", > + .data = &rk3399_hdmi_drv_data > }, > {}, > }; > @@ -268,6 +312,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, > match = of_match_node(dw_hdmi_rockchip_dt_ids, pdev->dev.of_node); > plat_data = match->data; > hdmi->dev = &pdev->dev; > + hdmi->chip_data = plat_data->phy_data; > encoder = &hdmi->encoder; > > encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node); > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752361AbdFVHbq (ORCPT ); Thu, 22 Jun 2017 03:31:46 -0400 Received: from gloria.sntech.de ([95.129.55.99]:46976 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751115AbdFVHbp (ORCPT ); Thu, 22 Jun 2017 03:31:45 -0400 From: Heiko Stuebner To: Mark Yao Cc: David Airlie , Rob Herring , Mark Rutland , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3.1 1/3] drm/rockchip: dw_hdmi: add RK3399 HDMI support Date: Thu, 22 Jun 2017 09:31:37 +0200 Message-ID: <1751555.73cFbViMXZ@phil> User-Agent: KMail/5.2.3 (Linux/4.9.0-2-amd64; KDE/5.28.0; x86_64; ; ) In-Reply-To: <1498115845-7177-1-git-send-email-mark.yao@rock-chips.com> References: <1496992236-10634-1-git-send-email-mark.yao@rock-chips.com> <1498115845-7177-1-git-send-email-mark.yao@rock-chips.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Mark, Am Donnerstag, 22. Juni 2017, 15:17:24 CEST schrieb Mark Yao: > RK3399 and RK3288 shared the same HDMI IP controller, only some light > difference with GRF configure. > > Signed-off-by: Yakir Yang > Signed-off-by: Mark Yao > --- > Changes in v3.1: > Correct documentation compatible's format(Rob Herring). > Changes in v3: > remove hdmi_phy_configure_dwc_hdmi_3d_tx callbak. > > Changes in v2: > reuse hdmi_phy_configure_dwc_hdmi_3d_tx for phy configure > fixup Documentation > > .../bindings/display/rockchip/dw_hdmi-rockchip.txt | 4 +- > drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 67 ++++++++++++++++++---- > 2 files changed, 59 insertions(+), 12 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt b/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt > index 046076c..7039a15 100644 > --- a/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt > +++ b/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt > @@ -11,7 +11,9 @@ following device-specific properties. > > Required properties: > > -- compatible: Shall contain "rockchip,rk3288-dw-hdmi". > +- compatible: should be one of the following: > + "rockchip,rk3288-dw-hdmi" > + "rockchip,rk3399-dw-hdmi" > - reg: See dw_hdmi.txt. > - reg-io-width: See dw_hdmi.txt. Shall be 4. > - interrupts: HDMI interrupt number > diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c > index 63dab6f..90aaaf4 100644 > --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c > +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c > @@ -20,13 +20,30 @@ > #include "rockchip_drm_drv.h" > #include "rockchip_drm_vop.h" > > -#define GRF_SOC_CON6 0x025c > -#define HDMI_SEL_VOP_LIT (1 << 4) > +#define RK3288_GRF_SOC_CON6 0x025C > +#define RK3288_HDMI_LCDC_SEL BIT(4) > +#define RK3399_GRF_SOC_CON20 0x6250 > +#define RK3399_HDMI_LCDC_SEL BIT(6) > + > +#define HIWORD_UPDATE(val, mask) (val | (mask) << 16) > + > +/** > + * struct rockchip_hdmi_chip_data - splite the grf setting of kind of chips > + * @lcdsel_grf_reg: grf register offset of lcdc select > + * @lcdsel_big: reg value of selecting vop big for HDMI > + * @lcdsel_lit: reg value of selecting vop little for HDMI > + */ > +struct rockchip_hdmi_chip_data { > + u32 lcdsel_grf_reg; How do you plan on handling the rk3368 (with only one VOP and thus no selection happening)? I'd just make the above an int, so we could set it to -1 for that case. (value 0 is after all a valid reg). Heiko > + u32 lcdsel_big; > + u32 lcdsel_lit; > +}; > > struct rockchip_hdmi { > struct device *dev; > struct regmap *regmap; > struct drm_encoder encoder; > + const struct rockchip_hdmi_chip_data *chip_data; > }; > > #define to_rockchip_hdmi(x) container_of(x, struct rockchip_hdmi, x) > @@ -198,17 +215,20 @@ static void dw_hdmi_rockchip_encoder_enable(struct drm_encoder *encoder) > { > struct rockchip_hdmi *hdmi = to_rockchip_hdmi(encoder); > u32 val; > - int mux; > + int ret; > > - mux = drm_of_encoder_active_endpoint_id(hdmi->dev->of_node, encoder); > - if (mux) > - val = HDMI_SEL_VOP_LIT | (HDMI_SEL_VOP_LIT << 16); > + ret = drm_of_encoder_active_endpoint_id(hdmi->dev->of_node, encoder); > + if (ret) > + val = hdmi->chip_data->lcdsel_lit; > else > - val = HDMI_SEL_VOP_LIT << 16; > + val = hdmi->chip_data->lcdsel_big; > + > + ret = regmap_write(hdmi->regmap, hdmi->chip_data->lcdsel_grf_reg, val); > + if (ret != 0) > + dev_err(hdmi->dev, "Could not write to GRF: %d\n", ret); > > - regmap_write(hdmi->regmap, GRF_SOC_CON6, val); > dev_dbg(hdmi->dev, "vop %s output to hdmi\n", > - (mux) ? "LIT" : "BIG"); > + ret ? "LIT" : "BIG"); > } > > static int > @@ -232,16 +252,40 @@ static void dw_hdmi_rockchip_encoder_enable(struct drm_encoder *encoder) > .atomic_check = dw_hdmi_rockchip_encoder_atomic_check, > }; > > -static const struct dw_hdmi_plat_data rockchip_hdmi_drv_data = { > +static struct rockchip_hdmi_chip_data rk3288_chip_data = { > + .lcdsel_grf_reg = RK3288_GRF_SOC_CON6, > + .lcdsel_big = HIWORD_UPDATE(0, RK3288_HDMI_LCDC_SEL), > + .lcdsel_lit = HIWORD_UPDATE(RK3288_HDMI_LCDC_SEL, RK3288_HDMI_LCDC_SEL), > +}; > + > +static const struct dw_hdmi_plat_data rk3288_hdmi_drv_data = { > + .mode_valid = dw_hdmi_rockchip_mode_valid, > + .mpll_cfg = rockchip_mpll_cfg, > + .cur_ctr = rockchip_cur_ctr, > + .phy_config = rockchip_phy_config, > + .phy_data = &rk3288_chip_data, > +}; > + > +static struct rockchip_hdmi_chip_data rk3399_chip_data = { > + .lcdsel_grf_reg = RK3399_GRF_SOC_CON20, > + .lcdsel_big = HIWORD_UPDATE(0, RK3399_HDMI_LCDC_SEL), > + .lcdsel_lit = HIWORD_UPDATE(RK3399_HDMI_LCDC_SEL, RK3399_HDMI_LCDC_SEL), > +}; > + > +static const struct dw_hdmi_plat_data rk3399_hdmi_drv_data = { > .mode_valid = dw_hdmi_rockchip_mode_valid, > .mpll_cfg = rockchip_mpll_cfg, > .cur_ctr = rockchip_cur_ctr, > .phy_config = rockchip_phy_config, > + .phy_data = &rk3399_chip_data, > }; > > static const struct of_device_id dw_hdmi_rockchip_dt_ids[] = { > { .compatible = "rockchip,rk3288-dw-hdmi", > - .data = &rockchip_hdmi_drv_data > + .data = &rk3288_hdmi_drv_data > + }, > + { .compatible = "rockchip,rk3399-dw-hdmi", > + .data = &rk3399_hdmi_drv_data > }, > {}, > }; > @@ -268,6 +312,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, > match = of_match_node(dw_hdmi_rockchip_dt_ids, pdev->dev.of_node); > plat_data = match->data; > hdmi->dev = &pdev->dev; > + hdmi->chip_data = plat_data->phy_data; > encoder = &hdmi->encoder; > > encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node); >