From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark yao Subject: Re: [PATCH 8/8] drm/rockchip: dw_hdmi: use encoder enable function Date: Thu, 17 Dec 2015 11:16:24 +0800 Message-ID: <56722908.6030200@rock-chips.com> References: <1450321275-31154-1-git-send-email-mark.yao@rock-chips.com> <1450321718-31389-1-git-send-email-mark.yao@rock-chips.com> <1450321718-31389-3-git-send-email-mark.yao@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1450321718-31389-3-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: David Airlie , Heiko Stuebner , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org List-Id: linux-rockchip.vger.kernel.org U29ycnksIE9wcywgZmF0IGZpbmdlciwgZGlzY2FyZCB0aGlzIGxvc3QgdGhyZWFkIG1haWwuCgpP biAyMDE15bm0MTLmnIgxN+aXpSAxMTowOCwgTWFyayBZYW8gd3JvdGU6Cj4gZW5jb2Rlci5lbmFi bGUgaXMgbW9yZSBjb21wYXRpYmxlIHRvIGF0b21pYyBhcGkgdGhhbiBlbmNvZGVyLnByZXBhcmUv Y29tbWl0Cj4KPiBTaWduZWQtb2ZmLWJ5OiBNYXJrIFlhbyA8bWFyay55YW9Acm9jay1jaGlwcy5j b20+Cj4gLS0tCj4gQ2hhbmdlcyBpbiB2MzogTm9uZQo+IENoYW5nZXMgaW4gdjI6IE5vbmUKPgo+ ICAgZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3X2hkbWktcm9ja2NoaXAuYyB8ICAgMTQgKysr KystLS0tLS0tLS0KPiAgIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDkgZGVsZXRp b25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3X2hkbWkt cm9ja2NoaXAuYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kd19oZG1pLXJvY2tjaGlwLmMK PiBpbmRleCA1MjViNWE4Li44ZTE2MDVjIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9y b2NrY2hpcC9kd19oZG1pLXJvY2tjaGlwLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2No aXAvZHdfaGRtaS1yb2NrY2hpcC5jCj4gQEAgLTE5NSwxMiArMTk1LDE1IEBAIHN0YXRpYyB2b2lk IGR3X2hkbWlfcm9ja2NoaXBfZW5jb2Rlcl9tb2RlX3NldChzdHJ1Y3QgZHJtX2VuY29kZXIgKmVu Y29kZXIsCj4gICB7Cj4gICB9Cj4gICAKPiAtc3RhdGljIHZvaWQgZHdfaGRtaV9yb2NrY2hpcF9l bmNvZGVyX2NvbW1pdChzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIpCj4gK3N0YXRpYyB2b2lk IGR3X2hkbWlfcm9ja2NoaXBfZW5jb2Rlcl9lbmFibGUoc3RydWN0IGRybV9lbmNvZGVyICplbmNv ZGVyKQo+ICAgewo+ICAgCXN0cnVjdCByb2NrY2hpcF9oZG1pICpoZG1pID0gdG9fcm9ja2NoaXBf aGRtaShlbmNvZGVyKTsKPiAgIAl1MzIgdmFsOwo+ICAgCWludCBtdXg7Cj4gICAKPiArCXJvY2tj aGlwX2RybV9jcnRjX21vZGVfY29uZmlnKGVuY29kZXItPmNydGMsIERSTV9NT0RFX0NPTk5FQ1RP Ul9IRE1JQSwKPiArCQkJCSAgICAgIFJPQ0tDSElQX09VVF9NT0RFX0FBQUEpOwo+ICsKPiAgIAlt dXggPSByb2NrY2hpcF9kcm1fZW5jb2Rlcl9nZXRfbXV4X2lkKGhkbWktPmRldi0+b2Zfbm9kZSwg ZW5jb2Rlcik7Cj4gICAJaWYgKG11eCkKPiAgIAkJdmFsID0gSERNSV9TRUxfVk9QX0xJVCB8IChI RE1JX1NFTF9WT1BfTElUIDw8IDE2KTsKPiBAQCAtMjEyLDE3ICsyMTUsMTAgQEAgc3RhdGljIHZv aWQgZHdfaGRtaV9yb2NrY2hpcF9lbmNvZGVyX2NvbW1pdChzdHJ1Y3QgZHJtX2VuY29kZXIgKmVu Y29kZXIpCj4gICAJCShtdXgpID8gIkxJVCIgOiAiQklHIik7Cj4gICB9Cj4gICAKPiAtc3RhdGlj IHZvaWQgZHdfaGRtaV9yb2NrY2hpcF9lbmNvZGVyX3ByZXBhcmUoc3RydWN0IGRybV9lbmNvZGVy ICplbmNvZGVyKQo+IC17Cj4gLQlyb2NrY2hpcF9kcm1fY3J0Y19tb2RlX2NvbmZpZyhlbmNvZGVy LT5jcnRjLCBEUk1fTU9ERV9DT05ORUNUT1JfSERNSUEsCj4gLQkJCQkgICAgICBST0NLQ0hJUF9P VVRfTU9ERV9BQUFBKTsKPiAtfQo+IC0KPiAgIHN0YXRpYyBzdHJ1Y3QgZHJtX2VuY29kZXJfaGVs cGVyX2Z1bmNzIGR3X2hkbWlfcm9ja2NoaXBfZW5jb2Rlcl9oZWxwZXJfZnVuY3MgPSB7Cj4gICAJ Lm1vZGVfZml4dXAgPSBkd19oZG1pX3JvY2tjaGlwX2VuY29kZXJfbW9kZV9maXh1cCwKPiAgIAku bW9kZV9zZXQgICA9IGR3X2hkbWlfcm9ja2NoaXBfZW5jb2Rlcl9tb2RlX3NldCwKPiAtCS5wcmVw YXJlICAgID0gZHdfaGRtaV9yb2NrY2hpcF9lbmNvZGVyX3ByZXBhcmUsCj4gLQkuY29tbWl0ICAg ICA9IGR3X2hkbWlfcm9ja2NoaXBfZW5jb2Rlcl9jb21taXQsCj4gKwkuZW5hYmxlICAgICA9IGR3 X2hkbWlfcm9ja2NoaXBfZW5jb2Rlcl9lbmFibGUsCj4gICAJLmRpc2FibGUgICAgPSBkd19oZG1p X3JvY2tjaGlwX2VuY29kZXJfZGlzYWJsZSwKPiAgIH07Cj4gICAKCgotLSAK77ytYXJrIFlhbwoK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark yao) Date: Thu, 17 Dec 2015 11:16:24 +0800 Subject: [PATCH 8/8] drm/rockchip: dw_hdmi: use encoder enable function In-Reply-To: <1450321718-31389-3-git-send-email-mark.yao@rock-chips.com> References: <1450321275-31154-1-git-send-email-mark.yao@rock-chips.com> <1450321718-31389-1-git-send-email-mark.yao@rock-chips.com> <1450321718-31389-3-git-send-email-mark.yao@rock-chips.com> Message-ID: <56722908.6030200@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Sorry, Ops, fat finger, discard this lost thread mail. On 2015?12?17? 11:08, Mark Yao wrote: > encoder.enable is more compatible to atomic api than encoder.prepare/commit > > Signed-off-by: Mark Yao > --- > Changes in v3: None > Changes in v2: None > > drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c > index 525b5a8..8e1605c 100644 > --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c > +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c > @@ -195,12 +195,15 @@ static void dw_hdmi_rockchip_encoder_mode_set(struct drm_encoder *encoder, > { > } > > -static void dw_hdmi_rockchip_encoder_commit(struct drm_encoder *encoder) > +static void dw_hdmi_rockchip_encoder_enable(struct drm_encoder *encoder) > { > struct rockchip_hdmi *hdmi = to_rockchip_hdmi(encoder); > u32 val; > int mux; > > + rockchip_drm_crtc_mode_config(encoder->crtc, DRM_MODE_CONNECTOR_HDMIA, > + ROCKCHIP_OUT_MODE_AAAA); > + > mux = rockchip_drm_encoder_get_mux_id(hdmi->dev->of_node, encoder); > if (mux) > val = HDMI_SEL_VOP_LIT | (HDMI_SEL_VOP_LIT << 16); > @@ -212,17 +215,10 @@ static void dw_hdmi_rockchip_encoder_commit(struct drm_encoder *encoder) > (mux) ? "LIT" : "BIG"); > } > > -static void dw_hdmi_rockchip_encoder_prepare(struct drm_encoder *encoder) > -{ > - rockchip_drm_crtc_mode_config(encoder->crtc, DRM_MODE_CONNECTOR_HDMIA, > - ROCKCHIP_OUT_MODE_AAAA); > -} > - > static struct drm_encoder_helper_funcs dw_hdmi_rockchip_encoder_helper_funcs = { > .mode_fixup = dw_hdmi_rockchip_encoder_mode_fixup, > .mode_set = dw_hdmi_rockchip_encoder_mode_set, > - .prepare = dw_hdmi_rockchip_encoder_prepare, > - .commit = dw_hdmi_rockchip_encoder_commit, > + .enable = dw_hdmi_rockchip_encoder_enable, > .disable = dw_hdmi_rockchip_encoder_disable, > }; > -- ?ark Yao From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934605AbbLQDQe (ORCPT ); Wed, 16 Dec 2015 22:16:34 -0500 Received: from regular1.263xmail.com ([211.150.99.135]:42487 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932239AbbLQDQc (ORCPT ); Wed, 16 Dec 2015 22:16:32 -0500 X-263anti-spam: KSV:0;BIG:0;ABS:1;DNS:0;ATT:0;SPF:S; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 1 X-SKE-CHECKED: 1 X-ADDR-CHECKED: 0 X-RL-SENDER: mark.yao@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: <96547246eccd6ef1f9e5db3d4ec51763> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Message-ID: <56722908.6030200@rock-chips.com> Date: Thu, 17 Dec 2015 11:16:24 +0800 From: Mark yao User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: David Airlie , Heiko Stuebner , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 8/8] drm/rockchip: dw_hdmi: use encoder enable function References: <1450321275-31154-1-git-send-email-mark.yao@rock-chips.com> <1450321718-31389-1-git-send-email-mark.yao@rock-chips.com> <1450321718-31389-3-git-send-email-mark.yao@rock-chips.com> In-Reply-To: <1450321718-31389-3-git-send-email-mark.yao@rock-chips.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sorry, Ops, fat finger, discard this lost thread mail. On 2015年12月17日 11:08, Mark Yao wrote: > encoder.enable is more compatible to atomic api than encoder.prepare/commit > > Signed-off-by: Mark Yao > --- > Changes in v3: None > Changes in v2: None > > drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c > index 525b5a8..8e1605c 100644 > --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c > +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c > @@ -195,12 +195,15 @@ static void dw_hdmi_rockchip_encoder_mode_set(struct drm_encoder *encoder, > { > } > > -static void dw_hdmi_rockchip_encoder_commit(struct drm_encoder *encoder) > +static void dw_hdmi_rockchip_encoder_enable(struct drm_encoder *encoder) > { > struct rockchip_hdmi *hdmi = to_rockchip_hdmi(encoder); > u32 val; > int mux; > > + rockchip_drm_crtc_mode_config(encoder->crtc, DRM_MODE_CONNECTOR_HDMIA, > + ROCKCHIP_OUT_MODE_AAAA); > + > mux = rockchip_drm_encoder_get_mux_id(hdmi->dev->of_node, encoder); > if (mux) > val = HDMI_SEL_VOP_LIT | (HDMI_SEL_VOP_LIT << 16); > @@ -212,17 +215,10 @@ static void dw_hdmi_rockchip_encoder_commit(struct drm_encoder *encoder) > (mux) ? "LIT" : "BIG"); > } > > -static void dw_hdmi_rockchip_encoder_prepare(struct drm_encoder *encoder) > -{ > - rockchip_drm_crtc_mode_config(encoder->crtc, DRM_MODE_CONNECTOR_HDMIA, > - ROCKCHIP_OUT_MODE_AAAA); > -} > - > static struct drm_encoder_helper_funcs dw_hdmi_rockchip_encoder_helper_funcs = { > .mode_fixup = dw_hdmi_rockchip_encoder_mode_fixup, > .mode_set = dw_hdmi_rockchip_encoder_mode_set, > - .prepare = dw_hdmi_rockchip_encoder_prepare, > - .commit = dw_hdmi_rockchip_encoder_commit, > + .enable = dw_hdmi_rockchip_encoder_enable, > .disable = dw_hdmi_rockchip_encoder_disable, > }; > -- Ｍark Yao