From mboxrd@z Thu Jan 1 00:00:00 1970 From: Inki Dae Subject: Re: [PATCH] drm/exynos: init vblank with real number of crtcs Date: Wed, 08 Oct 2014 10:33:54 +0900 Message-ID: <54349482.2020208@samsung.com> References: <1411131440-15395-1-git-send-email-a.hajda@samsung.com> <5433DC15.5000000@samsung.com> <5434069C.3030004@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-reply-to: <5434069C.3030004@samsung.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Andrzej Hajda Cc: Kukjin Kim , Seung-Woo Kim , open list , "open list:DRM DRIVERS FOR E..." , drake@endlessm.com, Kyungmin Park , "moderated list:ARM/S5P EXYNOS AR..." , m.szyprowski@samsung.com List-Id: linux-samsung-soc@vger.kernel.org T24gMjAxNOuFhCAxMOyblCAwOOydvCAwMDoyOCwgSW5raSBEYWUgd3JvdGU6Cj4gCj4gU29ycnkg Zm9yIGxhdGUuCj4gCj4gT24gMjAxNOuFhCAxMOyblCAwN+ydvCAyMToyNywgQW5kcnplaiBIYWpk YSB3cm90ZToKPj4gSGkgSW5raSwKPj4KPj4gR2VudGx5IHBpbmcuCj4+Cj4+IEFuZHJ6ZWoKPj4K Pj4KPj4gT24gMDkvMTkvMjAxNCAwMjo1NyBQTSwgQW5kcnplaiBIYWpkYSB3cm90ZToKPj4+IElu aXRpYWxpemF0aW9uIG9mIHZibGFuayB3aXRoIE1BWF9DUlRDIGNhdXNlZCBhdHRlbXB0cwo+Pj4g dG8gZGlzYWJsaW5nIHZibGFua3MgZm9yIG5vbi1leGlzdGluZyBjcnRjcyBpbiBjYXNlCj4+PiBk cm0gdXNlZCBmZXdlciBjcnRjcy4gVGhlIHBhdGNoIGZpeGVzIGl0Lgo+IAo+IE5pY2UgY2F0Y2h+ IFRoaXMgcGF0Y2ggYWxzbyByZXNvbHZlcyB1bmJpbmQgaXNzdWUuIFdoZW4gZXh5bm9zIGRyaXZl ciBpcwo+IHVuYm91bmQsIGRpc2FibGVfdmJsYW5rIGNhbGxiYWNrIGlzIGNhbGxlZCBhcyBkZXYt Pm51bV9jcnRjcyBzbyBpZiB0aGUKPiBudW1iZXIgb2YgcHJvYmVkIGNydGMgZHJpdmVycyBpcyBk aWZmZXJlbnQgZnJvbSB0aGUgb25lIG9mIGVuYWJsZWQgY3J0YwoKT29wcywgcy90aGUgb25lIG9m IGVuYWJsZWQgY3J0YyBkcml2ZXJzL01BWF9DUlRDCgo+IGRyaXZlcnMgdGhlbiBpdCBjb3VsZCBh dHRlbXB0IHRvIGRpc2FibGluZyB2YmxhbmsgZm9yIG5vbi1leGlzdGluZyBjcnRjLAo+IHdoaWNo IGluIHR1cm4sIG51bGwgcG9pbnRlciBhY2Nlc3Mgb2NjdXJzLgo+IAo+IFRoYW5rcywKPiBJbmtp IERhZQo+IAo+Pj4KPj4+IFNpZ25lZC1vZmYtYnk6IEFuZHJ6ZWogSGFqZGEgPGEuaGFqZGFAc2Ft c3VuZy5jb20+Cj4+PiAtLS0KPj4+ICBkcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcm1f ZHJ2LmMgfCAxOCArKysrKysrKystLS0tLS0tLS0KPj4+ICAxIGZpbGUgY2hhbmdlZCwgOSBpbnNl cnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQo+Pj4KPj4+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vZXh5bm9zL2V4eW5vc19kcm1fZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4 eW5vc19kcm1fZHJ2LmMKPj4+IGluZGV4IDliMDBlNGUuLmRjNGFmZmQgMTAwNjQ0Cj4+PiAtLS0g YS9kcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcm1fZHJ2LmMKPj4+ICsrKyBiL2RyaXZl cnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9kcnYuYwo+Pj4gQEAgLTk0LDEwICs5NCw2IEBA IHN0YXRpYyBpbnQgZXh5bm9zX2RybV9sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2ln bmVkIGxvbmcgZmxhZ3MpCj4+PiAgCS8qIGluaXQga21zIHBvbGwgZm9yIGhhbmRsaW5nIGhwZCAq Lwo+Pj4gIAlkcm1fa21zX2hlbHBlcl9wb2xsX2luaXQoZGV2KTsKPj4+ICAKPj4+IC0JcmV0ID0g ZHJtX3ZibGFua19pbml0KGRldiwgTUFYX0NSVEMpOwo+Pj4gLQlpZiAocmV0KQo+Pj4gLQkJZ290 byBlcnJfbW9kZV9jb25maWdfY2xlYW51cDsKPj4+IC0KPj4+ICAJLyogc2V0dXAgcG9zc2libGVf Y2xvbmVzLiAqLwo+Pj4gIAlleHlub3NfZHJtX2VuY29kZXJfc2V0dXAoZGV2KTsKPj4+ICAKPj4+ IEBAIC0xMDYsMjIgKzEwMiwyNiBAQCBzdGF0aWMgaW50IGV4eW5vc19kcm1fbG9hZChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBsb25nIGZsYWdzKQo+Pj4gIAkvKiBUcnkgdG8gYmlu ZCBhbGwgc3ViIGRyaXZlcnMuICovCj4+PiAgCXJldCA9IGNvbXBvbmVudF9iaW5kX2FsbChkZXYt PmRldiwgZGV2KTsKPj4+ICAJaWYgKHJldCkKPj4+IC0JCWdvdG8gZXJyX2NsZWFudXBfdmJsYW5r Owo+Pj4gKwkJZ290byBlcnJfbW9kZV9jb25maWdfY2xlYW51cDsKPj4+ICsKPj4+ICsJcmV0ID0g ZHJtX3ZibGFua19pbml0KGRldiwgZGV2LT5tb2RlX2NvbmZpZy5udW1fY3J0Yyk7Cj4+PiArCWlm IChyZXQpCj4+PiArCQlnb3RvIGVycl91bmJpbmRfYWxsOwo+Pj4gIAo+Pj4gIAkvKiBQcm9iZSBu b24ga21zIHN1YiBkcml2ZXJzIGFuZCB2aXJ0dWFsIGRpc3BsYXkgZHJpdmVyLiAqLwo+Pj4gIAly ZXQgPSBleHlub3NfZHJtX2RldmljZV9zdWJkcnZfcHJvYmUoZGV2KTsKPj4+ICAJaWYgKHJldCkK Pj4+IC0JCWdvdG8gZXJyX3VuYmluZF9hbGw7Cj4+PiArCQlnb3RvIGVycl9jbGVhbnVwX3ZibGFu azsKPj4+ICAKPj4+ICAJLyogZm9yY2UgY29ubmVjdG9ycyBkZXRlY3Rpb24gKi8KPj4+ICAJZHJt X2hlbHBlcl9ocGRfaXJxX2V2ZW50KGRldik7Cj4+PiAgCj4+PiAgCXJldHVybiAwOwo+Pj4gIAo+ Pj4gLWVycl91bmJpbmRfYWxsOgo+Pj4gLQljb21wb25lbnRfdW5iaW5kX2FsbChkZXYtPmRldiwg ZGV2KTsKPj4+ICBlcnJfY2xlYW51cF92Ymxhbms6Cj4+PiAgCWRybV92YmxhbmtfY2xlYW51cChk ZXYpOwo+Pj4gK2Vycl91bmJpbmRfYWxsOgo+Pj4gKwljb21wb25lbnRfdW5iaW5kX2FsbChkZXYt PmRldiwgZGV2KTsKPj4+ICBlcnJfbW9kZV9jb25maWdfY2xlYW51cDoKPj4+ICAJZHJtX21vZGVf Y29uZmlnX2NsZWFudXAoZGV2KTsKPj4+ICAJZHJtX3JlbGVhc2VfaW9tbXVfbWFwcGluZyhkZXYp Owo+Pj4gQEAgLTEzOCw4ICsxMzgsOCBAQCBzdGF0aWMgaW50IGV4eW5vc19kcm1fdW5sb2FkKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4+PiAgCWV4eW5vc19kcm1fZmJkZXZfZmluaShkZXYpOwo+ Pj4gIAlkcm1fa21zX2hlbHBlcl9wb2xsX2ZpbmkoZGV2KTsKPj4+ICAKPj4+IC0JY29tcG9uZW50 X3VuYmluZF9hbGwoZGV2LT5kZXYsIGRldik7Cj4+PiAgCWRybV92YmxhbmtfY2xlYW51cChkZXYp Owo+Pj4gKwljb21wb25lbnRfdW5iaW5kX2FsbChkZXYtPmRldiwgZGV2KTsKPj4+ICAJZHJtX21v ZGVfY29uZmlnX2NsZWFudXAoZGV2KTsKPj4+ICAJZHJtX3JlbGVhc2VfaW9tbXVfbWFwcGluZyhk ZXYpOwo+Pj4gIAo+Pj4KPj4KPj4KPiAKPiAtLQo+IFRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBs aXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmliZSBsaW51eC1zYW1zdW5nLXNvYyIgaW4KPiB0 aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jkb21vQHZnZXIua2VybmVsLm9yZwo+IE1vcmUg bWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92Z2VyLmtlcm5lbC5vcmcvbWFqb3Jkb21vLWluZm8u aHRtbAo+IAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K ZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932624AbaJHBeK (ORCPT ); Tue, 7 Oct 2014 21:34:10 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:53828 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756266AbaJHBd6 (ORCPT ); Tue, 7 Oct 2014 21:33:58 -0400 MIME-version: 1.0 Content-type: text/plain; charset=UTF-8 X-AuditID: cbfee68f-f791c6d000004834-fd-54349483b880 Content-transfer-encoding: 8BIT Message-id: <54349482.2020208@samsung.com> Date: Wed, 08 Oct 2014 10:33:54 +0900 From: Inki Dae User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 To: Andrzej Hajda Cc: Joonyoung Shim , Seung-Woo Kim , Kyungmin Park , David Airlie , Kukjin Kim , "open list:DRM DRIVERS FOR E..." , "moderated list:ARM/S5P EXYNOS AR..." , open list , drake@endlessm.com, daniel@ffwll.ch, m.szyprowski@samsung.com Subject: Re: [PATCH] drm/exynos: init vblank with real number of crtcs References: <1411131440-15395-1-git-send-email-a.hajda@samsung.com> <5433DC15.5000000@samsung.com> <5434069C.3030004@samsung.com> In-reply-to: <5434069C.3030004@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsWyRsSkRLd5ikmIwY5mVYtb686xWvSeO8lk 8X/bRGaLR/MfM1tc+fqezeLFvYssFr0LrrJZnG16w25xedccNosZ5/cxWaw9cpfdYsbkl2wO PB6Lvmd57P22gMVj+7cHrB73u48zefRtWcXo8XmTXABbFJdNSmpOZllqkb5dAlfGqQ1HmQvW SlZ8/RXfwPhApIuRg0NCwERi0QadLkZOIFNM4sK99WxdjFwcQgJLGSWu/F/ICpEwkdj68xcL iC0kMJ1R4vpsPhCbV0BQ4sfkeywgc5gF5CWOXMoGCTMLqEtMmreIGWLOK0aJG7vb2SHqtSS2 X70OZrMIqEr0PrwMZrMB2RNX3GcDsUUFwiRevNrFDGKLAA2affIOM8TQU8wSN9pUQGxhATeJ KY9fMEPc08wocXJDDIjNKaAtcX5qB9TNX9klOh7rQuwSkPg2+RALxL+yEpsOMEOUSEocXHGD ZQKj2Cwk38xC+GYWkm8WMDKvYhRNLUguKE5KLzLWK07MLS7NS9dLzs/dxAiM09P/nvXvYLx7 wPoQowAHoxIPr2GzSYgQa2JZcWXuIUZToCMmMkuJJucDk0FeSbyhsZmRhamJqbGRuaWZkjjv QqmfwUIC6YklqdmpqQWpRfFFpTmpxYcYmTg4pRoY+9RvTj3NbcC+jvPRccG9eS3zWCVl1n9j WN/06lr1mluH/4dLJu76f+FMxht15uvP1jbdPnmDOcpO+NZh1ekOv3v4BP+wHvuXvO7mla6T xz+YzYtXrT5UkLQ8n1dty+qJYVe7P3aWHa+yST67YlaHtvSEzumvjjM8DVnbzNGS/MtoqkGw kd/jRiWW4oxEQy3mouJEAFeh/qDOAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpnleLIzCtJLcpLzFFi42I5/e+xoG7zFJMQg8nz5SxurTvHatF77iST xf9tE5ktHs1/zGxx5et7NosX9y6yWPQuuMpmcbbpDbvF5V1z2CxmnN/HZLH2yF12ixmTX7I5 8Hgs+p7lsffbAhaP7d8esHrc7z7O5NG3ZRWjx+dNcgFsUQ2MNhmpiSmpRQqpecn5KZl56bZK 3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlARyoplCXmlAKFAhKLi5X07TBNCA1x07WA aYzQ9Q0JgusxMkADCWsYM05tOMpcsFay4uuv+AbGByJdjJwcEgImElt//mKBsMUkLtxbzwZi CwlMZ5S4PpsPxOYVEJT4MfkeUA0HB7OAvMSRS9kgYWYBdYlJ8xYxdzFyAZW/YpS4sbudHaJe S2L71etgNouAqkTvw8tgNhuQPXHFfbD5ogJhEi9e7WIGsUWABs0+eYcZYugpZokbbSogtrCA m8SUxy+YIe5pZpQ4uSEGxOYU0JY4P7WDdQKjwCwk581COG8WkvMWMDKvYhRNLUguKE5KzzXS K07MLS7NS9dLzs/dxAhOBM+kdzCuarA4xCjAwajEw2vQbBIixJpYVlyZe4hRgoNZSYQ3Mhoo xJuSWFmVWpQfX1Sak1p8iNEU6LmJzFKiyfnAJJVXEm9obGJmZGlkbmhhZGyuJM57sNU6UEgg PbEkNTs1tSC1CKaPiYNTqoFxheT9awe2yEXG5S56cfqz+822//lnjFR1t7Soxr2zWXjkoEiD 5q09Chr/2m81G76YMIvPndtD1vXQllWTwhWOOPetCF8fqCRY176zSy/DtSf8Q1Cf+o8j0SEd G009Zv+sqXivlTH3jVCCTPLNuj/1OeLvXtWVesUk5JUWRPj9PS7ZcLk4OlqJpTgj0VCLuag4 EQDvCSunGgMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2014년 10월 08일 00:28, Inki Dae wrote: > > Sorry for late. > > On 2014년 10월 07일 21:27, Andrzej Hajda wrote: >> Hi Inki, >> >> Gently ping. >> >> Andrzej >> >> >> On 09/19/2014 02:57 PM, Andrzej Hajda wrote: >>> Initialization of vblank with MAX_CRTC caused attempts >>> to disabling vblanks for non-existing crtcs in case >>> drm used fewer crtcs. The patch fixes it. > > Nice catch~ This patch also resolves unbind issue. When exynos driver is > unbound, disable_vblank callback is called as dev->num_crtcs so if the > number of probed crtc drivers is different from the one of enabled crtc Oops, s/the one of enabled crtc drivers/MAX_CRTC > drivers then it could attempt to disabling vblank for non-existing crtc, > which in turn, null pointer access occurs. > > Thanks, > Inki Dae > >>> >>> Signed-off-by: Andrzej Hajda >>> --- >>> drivers/gpu/drm/exynos/exynos_drm_drv.c | 18 +++++++++--------- >>> 1 file changed, 9 insertions(+), 9 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c >>> index 9b00e4e..dc4affd 100644 >>> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c >>> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c >>> @@ -94,10 +94,6 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags) >>> /* init kms poll for handling hpd */ >>> drm_kms_helper_poll_init(dev); >>> >>> - ret = drm_vblank_init(dev, MAX_CRTC); >>> - if (ret) >>> - goto err_mode_config_cleanup; >>> - >>> /* setup possible_clones. */ >>> exynos_drm_encoder_setup(dev); >>> >>> @@ -106,22 +102,26 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags) >>> /* Try to bind all sub drivers. */ >>> ret = component_bind_all(dev->dev, dev); >>> if (ret) >>> - goto err_cleanup_vblank; >>> + goto err_mode_config_cleanup; >>> + >>> + ret = drm_vblank_init(dev, dev->mode_config.num_crtc); >>> + if (ret) >>> + goto err_unbind_all; >>> >>> /* Probe non kms sub drivers and virtual display driver. */ >>> ret = exynos_drm_device_subdrv_probe(dev); >>> if (ret) >>> - goto err_unbind_all; >>> + goto err_cleanup_vblank; >>> >>> /* force connectors detection */ >>> drm_helper_hpd_irq_event(dev); >>> >>> return 0; >>> >>> -err_unbind_all: >>> - component_unbind_all(dev->dev, dev); >>> err_cleanup_vblank: >>> drm_vblank_cleanup(dev); >>> +err_unbind_all: >>> + component_unbind_all(dev->dev, dev); >>> err_mode_config_cleanup: >>> drm_mode_config_cleanup(dev); >>> drm_release_iommu_mapping(dev); >>> @@ -138,8 +138,8 @@ static int exynos_drm_unload(struct drm_device *dev) >>> exynos_drm_fbdev_fini(dev); >>> drm_kms_helper_poll_fini(dev); >>> >>> - component_unbind_all(dev->dev, dev); >>> drm_vblank_cleanup(dev); >>> + component_unbind_all(dev->dev, dev); >>> drm_mode_config_cleanup(dev); >>> drm_release_iommu_mapping(dev); >>> >>> >> >> > > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >