From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 09/44] drm/mediatek: Remove redundant calls to drm_connector_register_all() Date: Wed, 15 Jun 2016 13:17:54 +0100 Message-ID: <1465993109-19523-10-git-send-email-chris@chris-wilson.co.uk> References: <1465993109-19523-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1465993109-19523-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org List-Id: linux-mediatek@lists.infradead.org VXAgdG8gbm93LCB0aGUgcmVjb21tZW5kYXRpb24gd2FzIGZvciBkcml2ZXJzIHRvIGNhbGwgZHJt X2Rldl9yZWdpc3RlcigpCmZvbGxvd2VkIGJ5IGRybV9jb25uZWN0b3JfcmVnaXN0ZXJfYWxsKCku IE5vdyB0aGF0CmRybV9jb25uZWN0b3JfcmVnaXN0ZXIoKSBpcyBzYWZlIGFnYWluc3QgbXVsdGlw bGUgaW52b2NhdGlvbnMsIHdlIGNhbgptb3ZlIGRybV9jb25uZWN0b3JfcmVnaXN0ZXJfYWxsKCkg dG8gZHJtX2Rldl9yZWdpc3RlcigpIGFuZCBub3Qgc3VmZmVyCmZyb20gYW55IGJhY2t3YXJkcyBj b21wYXRpYmlsaXR5IGlzc3VlcyB3aXRoIGRyaXZlcnMgbm90IGZvbGxvd2luZyB0aGUKbW9yZSBy aWdvcm91cyBpbml0IG9yZGVyaW5nLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJp c0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZm d2xsLmNoPgpDYzogTWF0dGhpYXMgQnJ1Z2dlciA8bWF0dGhpYXMuYmdnQGdtYWlsLmNvbT4KQ2M6 IERhdmlkIEFpcmxpZSA8YWlybGllZEBsaW51eC5pZT4KQ2M6IGRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKQ2M6IGxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpDYzog bGludXgtbWVkaWF0ZWtAbGlzdHMuaW5mcmFkZWFkLm9yZwotLS0KIGRyaXZlcnMvZ3B1L2RybS9t ZWRpYXRlay9tdGtfZHJtX2Rydi5jIHwgNyAtLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9k cnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2Rydi5jCmluZGV4IGMzM2Jm OThjNWQ1ZS4uN2FiOTFmNGEyMDBmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0 ZWsvbXRrX2RybV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9k cnYuYwpAQCAtMjkzLDE0ICsyOTMsOCBAQCBzdGF0aWMgaW50IG10a19kcm1fYmluZChzdHJ1Y3Qg ZGV2aWNlICpkZXYpCiAJaWYgKHJldCA8IDApCiAJCWdvdG8gZXJyX2RlaW5pdDsKIAotCXJldCA9 IGRybV9jb25uZWN0b3JfcmVnaXN0ZXJfYWxsKGRybSk7Ci0JaWYgKHJldCA8IDApCi0JCWdvdG8g ZXJyX3VucmVnaXN0ZXI7Ci0KIAlyZXR1cm4gMDsKIAotZXJyX3VucmVnaXN0ZXI6Ci0JZHJtX2Rl dl91bnJlZ2lzdGVyKGRybSk7CiBlcnJfZGVpbml0OgogCW10a19kcm1fa21zX2RlaW5pdChkcm0p OwogZXJyX2ZyZWU6CkBAIC00NTUsNyArNDQ5LDYgQEAgc3RhdGljIGludCBtdGtfZHJtX3JlbW92 ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCXN0cnVjdCBkcm1fZGV2aWNlICpkcm0g PSBwcml2YXRlLT5kcm07CiAJaW50IGk7CiAKLQlkcm1fY29ubmVjdG9yX3VucmVnaXN0ZXJfYWxs KGRybSk7CiAJZHJtX2Rldl91bnJlZ2lzdGVyKGRybSk7CiAJbXRrX2RybV9rbXNfZGVpbml0KGRy bSk7CiAJZHJtX2Rldl91bnJlZihkcm0pOwotLSAKMi44LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: chris@chris-wilson.co.uk (Chris Wilson) Date: Wed, 15 Jun 2016 13:17:54 +0100 Subject: [PATCH 09/44] drm/mediatek: Remove redundant calls to drm_connector_register_all() In-Reply-To: <1465993109-19523-1-git-send-email-chris@chris-wilson.co.uk> References: <1465993109-19523-1-git-send-email-chris@chris-wilson.co.uk> Message-ID: <1465993109-19523-10-git-send-email-chris@chris-wilson.co.uk> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Up to now, the recommendation was for drivers to call drm_dev_register() followed by drm_connector_register_all(). Now that drm_connector_register() is safe against multiple invocations, we can move drm_connector_register_all() to drm_dev_register() and not suffer from any backwards compatibility issues with drivers not following the more rigorous init ordering. Signed-off-by: Chris Wilson Cc: Daniel Vetter Cc: Matthias Brugger Cc: David Airlie Cc: dri-devel at lists.freedesktop.org Cc: linux-arm-kernel at lists.infradead.org Cc: linux-mediatek at lists.infradead.org --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index c33bf98c5d5e..7ab91f4a200f 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -293,14 +293,8 @@ static int mtk_drm_bind(struct device *dev) if (ret < 0) goto err_deinit; - ret = drm_connector_register_all(drm); - if (ret < 0) - goto err_unregister; - return 0; -err_unregister: - drm_dev_unregister(drm); err_deinit: mtk_drm_kms_deinit(drm); err_free: @@ -455,7 +449,6 @@ static int mtk_drm_remove(struct platform_device *pdev) struct drm_device *drm = private->drm; int i; - drm_connector_unregister_all(drm); drm_dev_unregister(drm); mtk_drm_kms_deinit(drm); drm_dev_unref(drm); -- 2.8.1