From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrzej Hajda Subject: Re: [RFC v2 2/5] drm/dsi: Try to match non-DT dsi devices Date: Fri, 30 Oct 2015 13:42:08 +0100 Message-ID: <563365A0.5000507@samsung.com> References: <1435641851-27295-1-git-send-email-architt@codeaurora.org> <1444123482-25579-1-git-send-email-architt@codeaurora.org> <1444123482-25579-3-git-send-email-architt@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-reply-to: <1444123482-25579-3-git-send-email-architt@codeaurora.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Archit Taneja , dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, treding@nvidia.com List-Id: linux-arm-msm@vger.kernel.org T24gMTAvMDYvMjAxNSAxMToyNCBBTSwgQXJjaGl0IFRhbmVqYSB3cm90ZToKPiBBZGQgYSBkZXZp Y2UgbmFtZSBmaWVsZCBpbiBtaXBpX2RzaV9kZXZpY2UuIFRoaXMgbmFtZSBpcyBkaWZmZXJlbnQg ZnJvbQo+IHRoZSBhY3R1YWwgZGV2IG5hbWUgKHdoaWNoIGlzIG9mIHRoZSBmb3JtYXQgImhvc3Ru YW1lLnJlZyIpLiBXaGVuIHRoZQo+IGRldmljZSBpcyBjcmVhdGVkIHZpYSBEVCwgdGhpcyBuYW1l IGlzIHNldCB0byB0aGUgbW9kYWxpYXMgc3RyaW5nLgo+IEluIHRoZSBub24tRFQgY2FzZSwgdGhl IGRyaXZlciBjcmVhdGluZyB0aGUgRFNJIGRldmljZSBwcm92aWRlcyB0aGUKPiBuYW1lIGJ5IHBv cHVsYXRpbmcgYSBmaWxlZCBpbiBtaXBpX2RzaV9kZXZpY2VfaW5mby4KPgo+IE1hdGNoaW5nIGZv ciBEVCBjYXNlIHdvdWxkIGJlIGFzIGl0IHdhcyBiZWZvcmUuIEZvciB0aGUgbm9uLURUIGNhc2Us Cj4gd2UgY29tcGFyZSB0aGUgZGV2aWNlIGFuZCBkcml2ZXIgbmFtZXMuIE1hdGNoaW5nIGJ5IGNv bXBhcmluZyBkcml2ZXIgYW5kCj4gZGV2aWNlIG5hbWVzIGlzbid0IHRoZSBiZXN0IHRoaW5nIHRv IGRvLiBJJ2QgYXBwcmVjaWF0ZSBzb21lIHN1Z2dlc3Rpb25zCj4gaGVyZS4KPgo+IE90aGVyIGJ1 c2VzIChsaWtlIGkyYy9zcGkpIHBlcmZvcm0gYSBub24tRFQgbWF0Y2ggYnkgY29tcGFyaW5nIHRo ZQo+IGRldmljZSBuYW1lIGFuZCBlbnRyaWVzIGluIHRoZSBkcml2ZXIncyBpZF90YWJsZS4gVGhl IGlkX3RhYmxlIHN0cnVjdHMKPiBmb3IgZGlmZmVyZW50IGJ1c2VzIGFyZSBkZWZpbmVkIGluICJp bmNsdWRlL2xpbnV4L21vZF9kZXZpY2V0YWJsZS5oIiwgSQo+IGRpZG4ndCB3YW50IHRvIHRvdWNo IHRoYXQgZm9yIG5vdy4KPgo+IFNpZ25lZC1vZmYtYnk6IEFyY2hpdCBUYW5lamEgPGFyY2hpdHRA Y29kZWF1cm9yYS5vcmc+CkJlc2lkZSBzbWFsbCBjb21tZW50cyBiZWxvdy4KClJldmlld2VkLWJ5 OiBBbmRyemVqIEhhamRhIDxhLmhhamRhQHNhbXN1bmcuY29tPgoKPiAtLS0KPiAgZHJpdmVycy9n cHUvZHJtL2RybV9taXBpX2RzaS5jIHwgMjkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0K PiAgaW5jbHVkZS9kcm0vZHJtX21pcGlfZHNpLmggICAgIHwgIDggKysrKysrKysKPiAgMiBmaWxl cyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCj4KPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2RybV9taXBpX2RzaS5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9t aXBpX2RzaS5jCj4gaW5kZXggMjQ1ZWNmZS4uNDZlZTUxNSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJz L2dwdS9kcm0vZHJtX21pcGlfZHNpLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX21pcGlf ZHNpLmMKPiBAQCAtNDUsOSArNDUsMzAgQEAKPiAgICogc3Vic2V0IG9mIHRoZSBNSVBJIERDUyBj b21tYW5kIHNldC4KPiAgICovCj4gIAo+ICtzdGF0aWMgY29uc3Qgc3RydWN0IGRldmljZV90eXBl IG1pcGlfZHNpX2RldmljZV90eXBlOwo+ICsKPiAgc3RhdGljIGludCBtaXBpX2RzaV9kZXZpY2Vf bWF0Y2goc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlX2RyaXZlciAqZHJ2KQo+ICB7 Cj4gLQlyZXR1cm4gb2ZfZHJpdmVyX21hdGNoX2RldmljZShkZXYsIGRydik7Cj4gKwlzdHJ1Y3Qg bWlwaV9kc2lfZGV2aWNlICpkc2k7Cj4gKwo+ICsJaWYgKGRldi0+dHlwZSA9PSAmbWlwaV9kc2lf ZGV2aWNlX3R5cGUpCj4gKwkJZHNpID0gdG9fbWlwaV9kc2lfZGV2aWNlKGRldik7Cj4gKwllbHNl Cj4gKwkJcmV0dXJuIDA7Cj4gKwo+ICsJLyogQXR0ZW1wdCBPRiBzdHlsZSBtYXRjaCAqLwo+ICsJ aWYgKG9mX2RyaXZlcl9tYXRjaF9kZXZpY2UoZGV2LCBkcnYpKQo+ICsJCXJldHVybiAxOwo+ICsK PiArCS8qCj4gKwkgKiBUcnkgdG8gY29tcGFyZSBkc2kgZGV2aWNlIGFuZCBkcml2ZXIgbmFtZXMu IElmIHRoaXMgbWF0Y2hpbmcgYXBwcm9hY2gKPiArCSAqIGlzbid0IHN0cm9uZywgd2UnZCBwcm9i YWJseSB3YW50IHRoZSBkc2kgZHJpdmVycyB0byBwb3B1bGF0ZSB0aGUKPiArCSAqIGlkX3RhYmxl IGZpZWxkIGFuZCB1c2UgdGhhdCBpbnN0ZWFkCj4gKwkgKi8KPiArCWlmICghc3RyY21wKGRzaS0+ bmFtZSwgZHJ2LT5uYW1lKSkKPiArCQlyZXR1cm4gMTsKPiArCj4gKwlyZXR1cm4gMDsKPiAgfQo+ ICAKPiAgc3RhdGljIGNvbnN0IHN0cnVjdCBkZXZfcG1fb3BzIG1pcGlfZHNpX2RldmljZV9wbV9v cHMgPSB7Cj4gQEAgLTEyNSw2ICsxNDYsNyBAQCBzdHJ1Y3QgbWlwaV9kc2lfZGV2aWNlICptaXBp X2RzaV9kZXZpY2VfbmV3KHN0cnVjdCBtaXBpX2RzaV9ob3N0ICpob3N0LAo+ICAJZHNpLT5kZXYu dHlwZSA9ICZtaXBpX2RzaV9kZXZpY2VfdHlwZTsKPiAgCWRzaS0+ZGV2Lm9mX25vZGUgPSBpbmZv LT5ub2RlOwo+ICAJZHNpLT5jaGFubmVsID0gaW5mby0+cmVnOwo+ICsJc3RybGNweShkc2ktPm5h bWUsIGluZm8tPm5hbWUsIHNpemVvZihkc2ktPm5hbWUpKTsKPiAgCj4gIAlkZXZfc2V0X25hbWUo JmRzaS0+ZGV2LCAiJXMuJWQiLCBkZXZfbmFtZShob3N0LT5kZXYpLCBpbmZvLT5yZWcpOwo+ICAK PiBAQCAtMTQ3LDYgKzE2OSwxMSBAQCBvZl9taXBpX2RzaV9kZXZpY2VfYWRkKHN0cnVjdCBtaXBp X2RzaV9ob3N0ICpob3N0LCBzdHJ1Y3QgZGV2aWNlX25vZGUgKm5vZGUpCj4gIAlpbnQgcmV0Owo+ ICAJdTMyIHJlZzsKPiAgCj4gKwlpZiAob2ZfbW9kYWxpYXNfbm9kZShub2RlLCBpbmZvLm5hbWUs IHNpemVvZihpbmZvLm5hbWUpKSA8IDApIHsKPiArCQlkZXZfZXJyKGRldiwgIm1vZGFsaWFzIGZh aWx1cmUgb24gJXNcbiIsIG5vZGUtPmZ1bGxfbmFtZSk7Cj4gKwkJcmV0dXJuIEVSUl9QVFIoLUVJ TlZBTCk7Cj4gKwl9Cj4gKwo+ICAJcmV0ID0gb2ZfcHJvcGVydHlfcmVhZF91MzIobm9kZSwgInJl ZyIsICZyZWcpOwo+ICAJaWYgKHJldCkgewo+ICAJCWRldl9lcnIoZGV2LCAiZGV2aWNlIG5vZGUg JXMgaGFzIG5vIHZhbGlkIHJlZyBwcm9wZXJ0eTogJWRcbiIsCj4gZGlmZiAtLWdpdCBhL2luY2x1 ZGUvZHJtL2RybV9taXBpX2RzaS5oIGIvaW5jbHVkZS9kcm0vZHJtX21pcGlfZHNpLmgKPiBpbmRl eCA5MGY0ZjNjLi45M2RlYzdiIDEwMDY0NAo+IC0tLSBhL2luY2x1ZGUvZHJtL2RybV9taXBpX2Rz aS5oCj4gKysrIGIvaW5jbHVkZS9kcm0vZHJtX21pcGlfZHNpLmgKPiBAQCAtMTM5LDggKzEzOSwx MSBAQCBlbnVtIG1pcGlfZHNpX3BpeGVsX2Zvcm1hdCB7Cj4gIAlNSVBJX0RTSV9GTVRfUkdCNTY1 LAo+ICB9Owo+ICAKPiArI2RlZmluZSBEU0lfREVWX05BTUVfU0laRQkJMjAKPiArCj4gIC8qKgo+ ICAgKiBzdHJ1Y3QgbWlwaV9kc2lfZGV2aWNlX2luZm8gLSB0ZW1wbGF0ZSBmb3IgY3JlYXRpbmcg YSBtaXBpX2RzaV9kZXZpY2UKPiArICogQG5hbWU6IG5hbWUgb2YgdGhlIGRzaSBwZXJpcGhlcmFs Cj4gICAqIEByZWc6IERTSSB2aXJ0dWFsIGNoYW5uZWwgYXNzaWduZWQgdG8gcGVyaXBoZXJhbAo+ ICAgKiBAbm9kZTogcG9pbnRlciB0byBPRiBkZXZpY2Ugbm9kZQo+ICAgKgo+IEBAIC0xNDgsMTQg KzE1MSwxNyBAQCBlbnVtIG1pcGlfZHNpX3BpeGVsX2Zvcm1hdCB7Cj4gICAqIERTSSBkZXZpY2UK PiAgICovCj4gIHN0cnVjdCBtaXBpX2RzaV9kZXZpY2VfaW5mbyB7Cj4gKwljaGFyIG5hbWVbRFNJ X0RFVl9OQU1FX1NJWkVdOwpJIHdvbmRlciBpZiBpdCBzaG91bGRuJ3QgYmUgY2FsbGVkIHR5cGUg YXMgaW4gY2FzZSBvZiBpMmMsCmJ1dCBubyBzdHJvbmcgZmVlbGluZ3MuCj4gIAl1MzIgcmVnOwo+ ICAJc3RydWN0IGRldmljZV9ub2RlICpub2RlOwo+ICB9Owo+ICAKPiArCkVtcHR5IGxpbmUuCgo+ ICAvKioKPiAgICogc3RydWN0IG1pcGlfZHNpX2RldmljZSAtIERTSSBwZXJpcGhlcmFsIGRldmlj ZQo+ICAgKiBAaG9zdDogRFNJIGhvc3QgZm9yIHRoaXMgcGVyaXBoZXJhbAo+ICAgKiBAZGV2OiBk cml2ZXIgbW9kZWwgZGV2aWNlIG5vZGUgZm9yIHRoaXMgcGVyaXBoZXJhbAo+ICsgKiBAbmFtZTog bmFtZSBvZiB0aGUgZHNpIHBlcmlwaGVyYWwKPiAgICogQGNoYW5uZWw6IHZpcnR1YWwgY2hhbm5l bCBhc3NpZ25lZCB0byB0aGUgcGVyaXBoZXJhbAo+ICAgKiBAZm9ybWF0OiBwaXhlbCBmb3JtYXQg Zm9yIHZpZGVvIG1vZGUKPiAgICogQGxhbmVzOiBudW1iZXIgb2YgYWN0aXZlIGRhdGEgbGFuZXMK PiBAQCAtMTY1LDYgKzE3MSw4IEBAIHN0cnVjdCBtaXBpX2RzaV9kZXZpY2Ugewo+ICAJc3RydWN0 IG1pcGlfZHNpX2hvc3QgKmhvc3Q7Cj4gIAlzdHJ1Y3QgZGV2aWNlIGRldjsKPiAgCj4gKwljaGFy IG5hbWVbRFNJX0RFVl9OQU1FX1NJWkVdOwo+ICsKVGhpcyBlbXB0eSBsaW5lIGNhbiBiZSBhbHNv IHJlbW92ZWQuCgpSZWdhcmRzCkFuZHJ6ZWoKCj4gIAl1bnNpZ25lZCBpbnQgY2hhbm5lbDsKPiAg CXVuc2lnbmVkIGludCBsYW5lczsKPiAgCWVudW0gbWlwaV9kc2lfcGl4ZWxfZm9ybWF0IGZvcm1h dDsKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1k ZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754434AbbJ3MmS (ORCPT ); Fri, 30 Oct 2015 08:42:18 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:22577 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754019AbbJ3MmP (ORCPT ); Fri, 30 Oct 2015 08:42:15 -0400 X-AuditID: cbfec7f5-f794b6d000001495-56-563365a5a7a5 Subject: Re: [RFC v2 2/5] drm/dsi: Try to match non-DT dsi devices To: Archit Taneja , dri-devel@lists.freedesktop.org References: <1435641851-27295-1-git-send-email-architt@codeaurora.org> <1444123482-25579-1-git-send-email-architt@codeaurora.org> <1444123482-25579-3-git-send-email-architt@codeaurora.org> Cc: linux-kernel@vger.kernel.org, airlied@linux.ie, daniel@ffwll.ch, treding@nvidia.com, l.stach@pengutronix.de, robh@kernel.org, linux-arm-msm@vger.kernel.org, jani.nikula@linux.intel.com From: Andrzej Hajda Message-id: <563365A0.5000507@samsung.com> Date: Fri, 30 Oct 2015 13:42:08 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-version: 1.0 In-reply-to: <1444123482-25579-3-git-send-email-architt@codeaurora.org> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRmVeSWpSXmKPExsVy+t/xa7pLU43DDCbtZrfoPXeSyaKp4y2r xf9tE5ktrnx9z2ax/PJ6RosHc28yWUzcf5bd4vKuOWwW//fsYLe4/ZvPgcvjcl8vk8febwtY PDat6mTz2P7tAavHvJOBHve7jzN59Da/Y/Po/2vg8XmTXABnFJdNSmpOZllqkb5dAlfGpdbf rAWvlCsaT89namDcI9PFyMkhIWAicfzzXGYIW0ziwr31bF2MXBxCAksZJe68u8UC4TxnlGg9 doIRpEpYwEni+N6lYB0iAt4Sc1b3gcWFBA4wSjSdrQJpYAax+6evAkuwCWhK/N18kw3E5hXQ kjj55xtYM4uAqsTttSfYQWxRgQiJiRMaWCFqBCV+TL7HAmJzCrhLHGw/D1TDATRUT+L+RS2Q MLOAvMTmNW+ZJzAKzELSMQuhahaSqgWMzKsYRVNLkwuKk9JzjfSKE3OLS/PS9ZLzczcxQqLk 6w7GpcesDjEKcDAq8fD+SDAKE2JNLCuuzD3EKMHBrCTC2+NkHCbEm5JYWZValB9fVJqTWnyI UZqDRUmcd+au9yFCAumJJanZqakFqUUwWSYOTqkGxgXz7od/FXRQerSgNGRTdF7Rno+7XU/s O1RQXmXLeLfC2fZy+84jXvt2H/5ztsR9UvWzqKTZty5cOcE8QeVKxzp2kd9Cs3efsfp116B4 xuTIndIS5+9pmUaVTpq1s2ttRXDjqbrb1dYLD91Qm34rYOOfb30/uue+yUz8o3M30awp4VNS nB1XmqwSS3FGoqEWc1FxIgC5qrTWjgIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/06/2015 11:24 AM, Archit Taneja wrote: > Add a device name field in mipi_dsi_device. This name is different from > the actual dev name (which is of the format "hostname.reg"). When the > device is created via DT, this name is set to the modalias string. > In the non-DT case, the driver creating the DSI device provides the > name by populating a filed in mipi_dsi_device_info. > > Matching for DT case would be as it was before. For the non-DT case, > we compare the device and driver names. Matching by comparing driver and > device names isn't the best thing to do. I'd appreciate some suggestions > here. > > Other buses (like i2c/spi) perform a non-DT match by comparing the > device name and entries in the driver's id_table. The id_table structs > for different buses are defined in "include/linux/mod_devicetable.h", I > didn't want to touch that for now. > > Signed-off-by: Archit Taneja Beside small comments below. Reviewed-by: Andrzej Hajda > --- > drivers/gpu/drm/drm_mipi_dsi.c | 29 ++++++++++++++++++++++++++++- > include/drm/drm_mipi_dsi.h | 8 ++++++++ > 2 files changed, 36 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c > index 245ecfe..46ee515 100644 > --- a/drivers/gpu/drm/drm_mipi_dsi.c > +++ b/drivers/gpu/drm/drm_mipi_dsi.c > @@ -45,9 +45,30 @@ > * subset of the MIPI DCS command set. > */ > > +static const struct device_type mipi_dsi_device_type; > + > static int mipi_dsi_device_match(struct device *dev, struct device_driver *drv) > { > - return of_driver_match_device(dev, drv); > + struct mipi_dsi_device *dsi; > + > + if (dev->type == &mipi_dsi_device_type) > + dsi = to_mipi_dsi_device(dev); > + else > + return 0; > + > + /* Attempt OF style match */ > + if (of_driver_match_device(dev, drv)) > + return 1; > + > + /* > + * Try to compare dsi device and driver names. If this matching approach > + * isn't strong, we'd probably want the dsi drivers to populate the > + * id_table field and use that instead > + */ > + if (!strcmp(dsi->name, drv->name)) > + return 1; > + > + return 0; > } > > static const struct dev_pm_ops mipi_dsi_device_pm_ops = { > @@ -125,6 +146,7 @@ struct mipi_dsi_device *mipi_dsi_device_new(struct mipi_dsi_host *host, > dsi->dev.type = &mipi_dsi_device_type; > dsi->dev.of_node = info->node; > dsi->channel = info->reg; > + strlcpy(dsi->name, info->name, sizeof(dsi->name)); > > dev_set_name(&dsi->dev, "%s.%d", dev_name(host->dev), info->reg); > > @@ -147,6 +169,11 @@ of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node) > int ret; > u32 reg; > > + if (of_modalias_node(node, info.name, sizeof(info.name)) < 0) { > + dev_err(dev, "modalias failure on %s\n", node->full_name); > + return ERR_PTR(-EINVAL); > + } > + > ret = of_property_read_u32(node, "reg", ®); > if (ret) { > dev_err(dev, "device node %s has no valid reg property: %d\n", > diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h > index 90f4f3c..93dec7b 100644 > --- a/include/drm/drm_mipi_dsi.h > +++ b/include/drm/drm_mipi_dsi.h > @@ -139,8 +139,11 @@ enum mipi_dsi_pixel_format { > MIPI_DSI_FMT_RGB565, > }; > > +#define DSI_DEV_NAME_SIZE 20 > + > /** > * struct mipi_dsi_device_info - template for creating a mipi_dsi_device > + * @name: name of the dsi peripheral > * @reg: DSI virtual channel assigned to peripheral > * @node: pointer to OF device node > * > @@ -148,14 +151,17 @@ enum mipi_dsi_pixel_format { > * DSI device > */ > struct mipi_dsi_device_info { > + char name[DSI_DEV_NAME_SIZE]; I wonder if it shouldn't be called type as in case of i2c, but no strong feelings. > u32 reg; > struct device_node *node; > }; > > + Empty line. > /** > * struct mipi_dsi_device - DSI peripheral device > * @host: DSI host for this peripheral > * @dev: driver model device node for this peripheral > + * @name: name of the dsi peripheral > * @channel: virtual channel assigned to the peripheral > * @format: pixel format for video mode > * @lanes: number of active data lanes > @@ -165,6 +171,8 @@ struct mipi_dsi_device { > struct mipi_dsi_host *host; > struct device dev; > > + char name[DSI_DEV_NAME_SIZE]; > + This empty line can be also removed. Regards Andrzej > unsigned int channel; > unsigned int lanes; > enum mipi_dsi_pixel_format format;