From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark yao Subject: Re: [PATCH v3 7/8] drm: bridge/dw_hdmi: add atomic API support Date: Thu, 17 Dec 2015 11:15:52 +0800 Message-ID: <567228E8.4010904@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-2-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-2-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 Cc: Fabio Estevam , Russell King , Thierry Reding , Andy Yan List-Id: linux-rockchip.vger.kernel.org U29ycnksIE9wcywgZmF0IGZpbmdlciwgZGlzY2FyZCB0aGlzIGxvc3QgdGhyZWFkIG1haWwuCgpP biAyMDE15bm0MTLmnIgxN+aXpSAxMTowOCwgTWFyayBZYW8gd3JvdGU6Cj4gRmlsbCBhdG9taWMg bmVlZGVkIGZ1bmNzIHdpdGggZGVmYXVsdCBhdG9taWMgaGVscGVyIGxpYnJhcnkuCj4KPiBSb2Nr Y2hpcCB1c2UgZHdfaGRtaSwgYW5kIGRybS9yb2NrY2hpcCB3aWxsIGNvdmVydCB0byBhdG9taWMg YXBpLAo+IHdlIG5lZWQgZHdfaGRtaSBzdXBwb3J0IGF0b21pYyBmdW5jcy4KPgo+IE5vdyBhbm90 aGVyIGRybSBkcml2ZXIgdXNlIGR3X2hkbWkgaXMgaW14LCBub3QgeWV0IGF0b21pYywgc28KPiBj aGVjayBEUklWRVJfQVRPTUlDIGF0IHJ1bnRpbWUgdG8gc3BpbHQgYXRvbWljIGFuZCBub3QgYXRv bWljLgo+Cj4gQ2M6IFJ1c3NlbGwgS2luZyA8cm1rK2tlcm5lbEBhcm0ubGludXgub3JnLnVrPgo+ IENjOiBQaGlsaXBwIFphYmVsIDxwLnphYmVsQHBlbmd1dHJvbml4LmRlPgo+IENjOiBBbmR5IFlh biA8YW5keS55YW5Acm9jay1jaGlwcy5jb20+Cj4gQ2M6IEZhYmlvIEVzdGV2YW0gPGZhYmlvLmVz dGV2YW1AZnJlZXNjYWxlLmNvbT4KPiBDYzogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlh LmNvbT4KPgo+IFNpZ25lZC1vZmYtYnk6IE1hcmsgWWFvIDxtYXJrLnlhb0Byb2NrLWNoaXBzLmNv bT4KPiAtLS0KPiBDaGFuZ2VzIGluIHYzOiBOb25lCj4gQ2hhbmdlcyBpbiB2MjoKPiBBZHZpY2Vk IGJ5IERhbmllbCBWZXR0ZXIKPiAtIGNoZWNrIERSSVZFUl9BVE9NSUMgYXQgcnVudGltZSB0byBz cGlsdCBhdG9taWMgYW5kIG5vdCBhdG9taWMuCj4KPiAgIGRyaXZlcnMvZ3B1L2RybS9icmlkZ2Uv ZHdfaGRtaS5jIHwgICAyMyArKysrKysrKysrKysrKysrKysrKystLQo+ICAgMSBmaWxlIGNoYW5n ZWQsIDIxIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2JyaWRnZS9kd19oZG1pLmMgYi9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL2R3 X2hkbWkuYwo+IGluZGV4IDU2ZGU5ZjEuLmRjMGJkZDQgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9n cHUvZHJtL2JyaWRnZS9kd19oZG1pLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL2R3 X2hkbWkuYwo+IEBAIC0yMiw2ICsyMiw3IEBACj4gICAKPiAgICNpbmNsdWRlIDxkcm0vZHJtX29m Lmg+Cj4gICAjaW5jbHVkZSA8ZHJtL2RybVAuaD4KPiArI2luY2x1ZGUgPGRybS9kcm1fYXRvbWlj X2hlbHBlci5oPgo+ICAgI2luY2x1ZGUgPGRybS9kcm1fY3J0Y19oZWxwZXIuaD4KPiAgICNpbmNs dWRlIDxkcm0vZHJtX2VkaWQuaD4KPiAgICNpbmNsdWRlIDxkcm0vZHJtX2VuY29kZXJfc2xhdmUu aD4KPiBAQCAtMTUyMiw2ICsxNTIzLDE3IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9m dW5jcyBkd19oZG1pX2Nvbm5lY3Rvcl9mdW5jcyA9IHsKPiAgIAkuZm9yY2UgPSBkd19oZG1pX2Nv bm5lY3Rvcl9mb3JjZSwKPiAgIH07Cj4gICAKPiArc3RhdGljIHN0cnVjdCBkcm1fY29ubmVjdG9y X2Z1bmNzIGR3X2hkbWlfYXRvbWljX2Nvbm5lY3Rvcl9mdW5jcyA9IHsKPiArCS5kcG1zID0gZHJt X2F0b21pY19oZWxwZXJfY29ubmVjdG9yX2RwbXMsCj4gKwkuZmlsbF9tb2RlcyA9IGRybV9oZWxw ZXJfcHJvYmVfc2luZ2xlX2Nvbm5lY3Rvcl9tb2RlcywKPiArCS5kZXRlY3QgPSBkd19oZG1pX2Nv bm5lY3Rvcl9kZXRlY3QsCj4gKwkuZGVzdHJveSA9IGR3X2hkbWlfY29ubmVjdG9yX2Rlc3Ryb3ks Cj4gKwkuZm9yY2UgPSBkd19oZG1pX2Nvbm5lY3Rvcl9mb3JjZSwKPiArCS5yZXNldCA9IGRybV9h dG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9yZXNldCwKPiArCS5hdG9taWNfZHVwbGljYXRlX3N0YXRl ID0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX2R1cGxpY2F0ZV9zdGF0ZSwKPiArCS5hdG9t aWNfZGVzdHJveV9zdGF0ZSA9IGRybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9kZXN0cm95X3N0 YXRlLAo+ICt9Owo+ICsKPiAgIHN0YXRpYyBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9oZWxwZXJfZnVu Y3MgZHdfaGRtaV9jb25uZWN0b3JfaGVscGVyX2Z1bmNzID0gewo+ICAgCS5nZXRfbW9kZXMgPSBk d19oZG1pX2Nvbm5lY3Rvcl9nZXRfbW9kZXMsCj4gICAJLm1vZGVfdmFsaWQgPSBkd19oZG1pX2Nv bm5lY3Rvcl9tb2RlX3ZhbGlkLAo+IEBAIC0xNjQ1LDggKzE2NTcsMTUgQEAgc3RhdGljIGludCBk d19oZG1pX3JlZ2lzdGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkcm0sIHN0cnVjdCBkd19oZG1pICpo ZG1pKQo+ICAgCj4gICAJZHJtX2Nvbm5lY3Rvcl9oZWxwZXJfYWRkKCZoZG1pLT5jb25uZWN0b3Is Cj4gICAJCQkJICZkd19oZG1pX2Nvbm5lY3Rvcl9oZWxwZXJfZnVuY3MpOwo+IC0JZHJtX2Nvbm5l Y3Rvcl9pbml0KGRybSwgJmhkbWktPmNvbm5lY3RvciwgJmR3X2hkbWlfY29ubmVjdG9yX2Z1bmNz LAo+IC0JCQkgICBEUk1fTU9ERV9DT05ORUNUT1JfSERNSUEpOwo+ICsKPiArCWlmIChkcm1fY29y ZV9jaGVja19mZWF0dXJlKGRybSwgRFJJVkVSX0FUT01JQykpCj4gKwkJZHJtX2Nvbm5lY3Rvcl9p bml0KGRybSwgJmhkbWktPmNvbm5lY3RvciwKPiArCQkJCSAgICZkd19oZG1pX2F0b21pY19jb25u ZWN0b3JfZnVuY3MsCj4gKwkJCQkgICBEUk1fTU9ERV9DT05ORUNUT1JfSERNSUEpOwo+ICsJZWxz ZQo+ICsJCWRybV9jb25uZWN0b3JfaW5pdChkcm0sICZoZG1pLT5jb25uZWN0b3IsCj4gKwkJCQkg ICAmZHdfaGRtaV9jb25uZWN0b3JfZnVuY3MsCj4gKwkJCQkgICBEUk1fTU9ERV9DT05ORUNUT1Jf SERNSUEpOwo+ICAgCj4gICAJaGRtaS0+Y29ubmVjdG9yLmVuY29kZXIgPSBlbmNvZGVyOwo+ICAg CgoKLS0gCu+8rWFyayBZYW8KCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark yao) Date: Thu, 17 Dec 2015 11:15:52 +0800 Subject: [PATCH v3 7/8] drm: bridge/dw_hdmi: add atomic API support In-Reply-To: <1450321718-31389-2-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-2-git-send-email-mark.yao@rock-chips.com> Message-ID: <567228E8.4010904@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: > Fill atomic needed funcs with default atomic helper library. > > Rockchip use dw_hdmi, and drm/rockchip will covert to atomic api, > we need dw_hdmi support atomic funcs. > > Now another drm driver use dw_hdmi is imx, not yet atomic, so > check DRIVER_ATOMIC at runtime to spilt atomic and not atomic. > > Cc: Russell King > Cc: Philipp Zabel > Cc: Andy Yan > Cc: Fabio Estevam > Cc: Thierry Reding > > Signed-off-by: Mark Yao > --- > Changes in v3: None > Changes in v2: > Adviced by Daniel Vetter > - check DRIVER_ATOMIC at runtime to spilt atomic and not atomic. > > drivers/gpu/drm/bridge/dw_hdmi.c | 23 +++++++++++++++++++++-- > 1 file changed, 21 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c > index 56de9f1..dc0bdd4 100644 > --- a/drivers/gpu/drm/bridge/dw_hdmi.c > +++ b/drivers/gpu/drm/bridge/dw_hdmi.c > @@ -22,6 +22,7 @@ > > #include > #include > +#include > #include > #include > #include > @@ -1522,6 +1523,17 @@ static struct drm_connector_funcs dw_hdmi_connector_funcs = { > .force = dw_hdmi_connector_force, > }; > > +static struct drm_connector_funcs dw_hdmi_atomic_connector_funcs = { > + .dpms = drm_atomic_helper_connector_dpms, > + .fill_modes = drm_helper_probe_single_connector_modes, > + .detect = dw_hdmi_connector_detect, > + .destroy = dw_hdmi_connector_destroy, > + .force = dw_hdmi_connector_force, > + .reset = drm_atomic_helper_connector_reset, > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > +}; > + > static struct drm_connector_helper_funcs dw_hdmi_connector_helper_funcs = { > .get_modes = dw_hdmi_connector_get_modes, > .mode_valid = dw_hdmi_connector_mode_valid, > @@ -1645,8 +1657,15 @@ static int dw_hdmi_register(struct drm_device *drm, struct dw_hdmi *hdmi) > > drm_connector_helper_add(&hdmi->connector, > &dw_hdmi_connector_helper_funcs); > - drm_connector_init(drm, &hdmi->connector, &dw_hdmi_connector_funcs, > - DRM_MODE_CONNECTOR_HDMIA); > + > + if (drm_core_check_feature(drm, DRIVER_ATOMIC)) > + drm_connector_init(drm, &hdmi->connector, > + &dw_hdmi_atomic_connector_funcs, > + DRM_MODE_CONNECTOR_HDMIA); > + else > + drm_connector_init(drm, &hdmi->connector, > + &dw_hdmi_connector_funcs, > + DRM_MODE_CONNECTOR_HDMIA); > > hdmi->connector.encoder = encoder; > -- ?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 S934578AbbLQDQE (ORCPT ); Wed, 16 Dec 2015 22:16:04 -0500 Received: from regular1.263xmail.com ([211.150.99.130]:51711 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932239AbbLQDQB (ORCPT ); Wed, 16 Dec 2015 22:16:01 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 X-RL-SENDER: mark.yao@rock-chips.com X-FST-TO: treding@nvidia.com X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: <3e31cce4c570b55e39c71824f4936b02> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Message-ID: <567228E8.4010904@rock-chips.com> Date: Thu, 17 Dec 2015 11:15:52 +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 CC: Russell King , Philipp Zabel , Andy Yan , Fabio Estevam , Thierry Reding Subject: Re: [PATCH v3 7/8] drm: bridge/dw_hdmi: add atomic API support 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-2-git-send-email-mark.yao@rock-chips.com> In-Reply-To: <1450321718-31389-2-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: > Fill atomic needed funcs with default atomic helper library. > > Rockchip use dw_hdmi, and drm/rockchip will covert to atomic api, > we need dw_hdmi support atomic funcs. > > Now another drm driver use dw_hdmi is imx, not yet atomic, so > check DRIVER_ATOMIC at runtime to spilt atomic and not atomic. > > Cc: Russell King > Cc: Philipp Zabel > Cc: Andy Yan > Cc: Fabio Estevam > Cc: Thierry Reding > > Signed-off-by: Mark Yao > --- > Changes in v3: None > Changes in v2: > Adviced by Daniel Vetter > - check DRIVER_ATOMIC at runtime to spilt atomic and not atomic. > > drivers/gpu/drm/bridge/dw_hdmi.c | 23 +++++++++++++++++++++-- > 1 file changed, 21 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c > index 56de9f1..dc0bdd4 100644 > --- a/drivers/gpu/drm/bridge/dw_hdmi.c > +++ b/drivers/gpu/drm/bridge/dw_hdmi.c > @@ -22,6 +22,7 @@ > > #include > #include > +#include > #include > #include > #include > @@ -1522,6 +1523,17 @@ static struct drm_connector_funcs dw_hdmi_connector_funcs = { > .force = dw_hdmi_connector_force, > }; > > +static struct drm_connector_funcs dw_hdmi_atomic_connector_funcs = { > + .dpms = drm_atomic_helper_connector_dpms, > + .fill_modes = drm_helper_probe_single_connector_modes, > + .detect = dw_hdmi_connector_detect, > + .destroy = dw_hdmi_connector_destroy, > + .force = dw_hdmi_connector_force, > + .reset = drm_atomic_helper_connector_reset, > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > +}; > + > static struct drm_connector_helper_funcs dw_hdmi_connector_helper_funcs = { > .get_modes = dw_hdmi_connector_get_modes, > .mode_valid = dw_hdmi_connector_mode_valid, > @@ -1645,8 +1657,15 @@ static int dw_hdmi_register(struct drm_device *drm, struct dw_hdmi *hdmi) > > drm_connector_helper_add(&hdmi->connector, > &dw_hdmi_connector_helper_funcs); > - drm_connector_init(drm, &hdmi->connector, &dw_hdmi_connector_funcs, > - DRM_MODE_CONNECTOR_HDMIA); > + > + if (drm_core_check_feature(drm, DRIVER_ATOMIC)) > + drm_connector_init(drm, &hdmi->connector, > + &dw_hdmi_atomic_connector_funcs, > + DRM_MODE_CONNECTOR_HDMIA); > + else > + drm_connector_init(drm, &hdmi->connector, > + &dw_hdmi_connector_funcs, > + DRM_MODE_CONNECTOR_HDMIA); > > hdmi->connector.encoder = encoder; > -- Ｍark Yao