From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 15/45] drm/mediatek: set DMA max segment size Date: Thu, 29 Aug 2019 14:15:15 -0400 Message-ID: <20190829181547.8280-15-sashal@kernel.org> References: <20190829181547.8280-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1C8906E129 for ; Thu, 29 Aug 2019 18:16:09 +0000 (UTC) In-Reply-To: <20190829181547.8280-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , dri-devel@lists.freedesktop.org, Alexandre Courbot , Tomasz Figa List-Id: dri-devel@lists.freedesktop.org RnJvbTogQWxleGFuZHJlIENvdXJib3QgPGFjb3VyYm90QGNocm9taXVtLm9yZz4KClsgVXBzdHJl YW0gY29tbWl0IDA3MDk1NTU1OGU4MjBiOWE4OWM1NzBiOTFiMWYyMTc2MmY2MmIyODggXQoKVGhp cyBkcml2ZXIgcmVxdWlyZXMgaW1wb3J0ZWQgUFJJTUUgYnVmZmVycyB0byBhcHBlYXIgY29udGln dW91c2x5IGluCml0cyBJTyBhZGRyZXNzIHNwYWNlLiBNYWtlIHN1cmUgdGhpcyBpcyB0aGUgY2Fz ZSBieSBzZXR0aW5nIHRoZSBtYXhpbXVtCkRNQSBzZWdtZW50IHNpemUgdG8gYSBtb3JlIHN1aXRh YmxlIHZhbHVlIHRoYW4gdGhlIGRlZmF1bHQgNjRLQi4KClNpZ25lZC1vZmYtYnk6IEFsZXhhbmRy ZSBDb3VyYm90IDxhY291cmJvdEBjaHJvbWl1bS5vcmc+ClJldmlld2VkLWJ5OiBUb21hc3ogRmln YSA8dGZpZ2FAY2hyb21pdW0ub3JnPgpTaWduZWQtb2ZmLWJ5OiBDSyBIdSA8Y2suaHVAbWVkaWF0 ZWsuY29tPgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0t LQogZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZHJ2LmMgfCAzNSArKysrKysrKysr KysrKysrKysrKysrKystLQogZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZHJ2Lmgg fCAgMiArKwogMiBmaWxlcyBjaGFuZ2VkLCAzNSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2Rydi5jIGIv ZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZHJ2LmMKaW5kZXggZmZiOTk3NDQwODUx ZC4uZjYzODk0NzlmY2NiNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210 a19kcm1fZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZHJ2LmMK QEAgLTIyMCw2ICsyMjAsNyBAQCBzdGF0aWMgaW50IG10a19kcm1fa21zX2luaXQoc3RydWN0IGRy bV9kZXZpY2UgKmRybSkKIAlzdHJ1Y3QgbXRrX2RybV9wcml2YXRlICpwcml2YXRlID0gZHJtLT5k ZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2OwogCXN0cnVjdCBkZXZp Y2Vfbm9kZSAqbnA7CisJc3RydWN0IGRldmljZSAqZG1hX2RldjsKIAlpbnQgcmV0OwogCiAJaWYg KCFpb21tdV9wcmVzZW50KCZwbGF0Zm9ybV9idXNfdHlwZSkpCkBAIC0yODIsNyArMjgzLDI5IEBA IHN0YXRpYyBpbnQgbXRrX2RybV9rbXNfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZHJtKQogCQln b3RvIGVycl9jb21wb25lbnRfdW5iaW5kOwogCX0KIAotCXByaXZhdGUtPmRtYV9kZXYgPSAmcGRl di0+ZGV2OworCWRtYV9kZXYgPSAmcGRldi0+ZGV2OworCXByaXZhdGUtPmRtYV9kZXYgPSBkbWFf ZGV2OworCisJLyoKKwkgKiBDb25maWd1cmUgdGhlIERNQSBzZWdtZW50IHNpemUgdG8gbWFrZSBz dXJlIHdlIGdldCBjb250aWd1b3VzIElPVkEKKwkgKiB3aGVuIGltcG9ydGluZyBQUklNRSBidWZm ZXJzLgorCSAqLworCWlmICghZG1hX2Rldi0+ZG1hX3Bhcm1zKSB7CisJCXByaXZhdGUtPmRtYV9w YXJtc19hbGxvY2F0ZWQgPSB0cnVlOworCQlkbWFfZGV2LT5kbWFfcGFybXMgPQorCQkJZGV2bV9r emFsbG9jKGRybS0+ZGV2LCBzaXplb2YoKmRtYV9kZXYtPmRtYV9wYXJtcyksCisJCQkJICAgICBH RlBfS0VSTkVMKTsKKwl9CisJaWYgKCFkbWFfZGV2LT5kbWFfcGFybXMpIHsKKwkJcmV0ID0gLUVO T01FTTsKKwkJZ290byBlcnJfY29tcG9uZW50X3VuYmluZDsKKwl9CisKKwlyZXQgPSBkbWFfc2V0 X21heF9zZWdfc2l6ZShkbWFfZGV2LCAodW5zaWduZWQgaW50KURNQV9CSVRfTUFTSygzMikpOwor CWlmIChyZXQpIHsKKwkJZGV2X2VycihkbWFfZGV2LCAiRmFpbGVkIHRvIHNldCBETUEgc2VnbWVu dCBzaXplXG4iKTsKKwkJZ290byBlcnJfdW5zZXRfZG1hX3Bhcm1zOworCX0KIAogCS8qCiAJICog V2UgZG9uJ3QgdXNlIHRoZSBkcm1faXJxX2luc3RhbGwoKSBoZWxwZXJzIHByb3ZpZGVkIGJ5IHRo ZSBEUk0KQEAgLTI5MiwxMyArMzE1LDE2IEBAIHN0YXRpYyBpbnQgbXRrX2RybV9rbXNfaW5pdChz dHJ1Y3QgZHJtX2RldmljZSAqZHJtKQogCWRybS0+aXJxX2VuYWJsZWQgPSB0cnVlOwogCXJldCA9 IGRybV92YmxhbmtfaW5pdChkcm0sIE1BWF9DUlRDKTsKIAlpZiAocmV0IDwgMCkKLQkJZ290byBl cnJfY29tcG9uZW50X3VuYmluZDsKKwkJZ290byBlcnJfdW5zZXRfZG1hX3Bhcm1zOwogCiAJZHJt X2ttc19oZWxwZXJfcG9sbF9pbml0KGRybSk7CiAJZHJtX21vZGVfY29uZmlnX3Jlc2V0KGRybSk7 CiAKIAlyZXR1cm4gMDsKIAorZXJyX3Vuc2V0X2RtYV9wYXJtczoKKwlpZiAocHJpdmF0ZS0+ZG1h X3Bhcm1zX2FsbG9jYXRlZCkKKwkJZG1hX2Rldi0+ZG1hX3Bhcm1zID0gTlVMTDsKIGVycl9jb21w b25lbnRfdW5iaW5kOgogCWNvbXBvbmVudF91bmJpbmRfYWxsKGRybS0+ZGV2LCBkcm0pOwogZXJy X2NvbmZpZ19jbGVhbnVwOgpAQCAtMzA5LDkgKzMzNSwxNCBAQCBzdGF0aWMgaW50IG10a19kcm1f a21zX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRybSkKIAogc3RhdGljIHZvaWQgbXRrX2RybV9r bXNfZGVpbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkcm0pCiB7CisJc3RydWN0IG10a19kcm1fcHJp dmF0ZSAqcHJpdmF0ZSA9IGRybS0+ZGV2X3ByaXZhdGU7CisKIAlkcm1fa21zX2hlbHBlcl9wb2xs X2ZpbmkoZHJtKTsKIAlkcm1fYXRvbWljX2hlbHBlcl9zaHV0ZG93bihkcm0pOwogCisJaWYgKHBy aXZhdGUtPmRtYV9wYXJtc19hbGxvY2F0ZWQpCisJCXByaXZhdGUtPmRtYV9kZXYtPmRtYV9wYXJt cyA9IE5VTEw7CisKIAljb21wb25lbnRfdW5iaW5kX2FsbChkcm0tPmRldiwgZHJtKTsKIAlkcm1f bW9kZV9jb25maWdfY2xlYW51cChkcm0pOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L21lZGlhdGVrL210a19kcm1fZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2Ry bV9kcnYuaAppbmRleCBlY2MwMGNhMzIyMWRhLi44ZmE2MGQ0NmY4NjA1IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vbWVkaWF0ZWsvbXRrX2RybV9kcnYuaApAQCAtNTksNiArNTksOCBAQCBzdHJ1Y3QgbXRrX2Ry bV9wcml2YXRlIHsKIAl9IGNvbW1pdDsKIAogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdXNw ZW5kX3N0YXRlOworCisJYm9vbCBkbWFfcGFybXNfYWxsb2NhdGVkOwogfTsKIAogZXh0ZXJuIHN0 cnVjdCBwbGF0Zm9ybV9kcml2ZXIgbXRrX2RkcF9kcml2ZXI7Ci0tIAoyLjIwLjEKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5n IGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E202BC3A5A6 for ; Thu, 29 Aug 2019 18:25:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BBC1421874 for ; Thu, 29 Aug 2019 18:25:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567103133; bh=CJPgBc2u5kNJyRvqyDs3bnG5Bx6fqAsJ8/fwTwRDc4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lHRGLqL1MpbWCb8sdELf5q47jkpBC/Xo+gEwO8/j+gGeMFJWooUHav81WzvPpUq3R h5XnOufRIw/y0cTsKU16zfGmPosyq5qFSd2Hqv2APGjXf+zfBfX4/m9Oiz0YJFrQCB w5RdUv+9EPCNfuknQQ+6OtnA0/riBBXGrBtbhURQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729650AbfH2SQM (ORCPT ); Thu, 29 Aug 2019 14:16:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:58100 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729568AbfH2SQK (ORCPT ); Thu, 29 Aug 2019 14:16:10 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3F10923403; Thu, 29 Aug 2019 18:16:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567102569; bh=CJPgBc2u5kNJyRvqyDs3bnG5Bx6fqAsJ8/fwTwRDc4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FLRGR72JfY61fEGSz6Xz1fl+ZjwEzaJM3qg9XNgC3NTs/I+91wbMwVmJifEGKMMQU ghir79SFAK2JJXCbOg3J9AtGdNrmpFz7oNnZ2v8kHXG+mp0lj9e2IasamhY9dHdRre sNATwggpI3BWyvQhX4md8w56ezQmzARgV28/YyrM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexandre Courbot , Tomasz Figa , CK Hu , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 15/45] drm/mediatek: set DMA max segment size Date: Thu, 29 Aug 2019 14:15:15 -0400 Message-Id: <20190829181547.8280-15-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190829181547.8280-1-sashal@kernel.org> References: <20190829181547.8280-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexandre Courbot [ Upstream commit 070955558e820b9a89c570b91b1f21762f62b288 ] This driver requires imported PRIME buffers to appear contiguously in its IO address space. Make sure this is the case by setting the maximum DMA segment size to a more suitable value than the default 64KB. Signed-off-by: Alexandre Courbot Reviewed-by: Tomasz Figa Signed-off-by: CK Hu Signed-off-by: Sasha Levin --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 35 ++++++++++++++++++++++++-- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 ++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index ffb997440851d..f6389479fccb5 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -220,6 +220,7 @@ static int mtk_drm_kms_init(struct drm_device *drm) struct mtk_drm_private *private = drm->dev_private; struct platform_device *pdev; struct device_node *np; + struct device *dma_dev; int ret; if (!iommu_present(&platform_bus_type)) @@ -282,7 +283,29 @@ static int mtk_drm_kms_init(struct drm_device *drm) goto err_component_unbind; } - private->dma_dev = &pdev->dev; + dma_dev = &pdev->dev; + private->dma_dev = dma_dev; + + /* + * Configure the DMA segment size to make sure we get contiguous IOVA + * when importing PRIME buffers. + */ + if (!dma_dev->dma_parms) { + private->dma_parms_allocated = true; + dma_dev->dma_parms = + devm_kzalloc(drm->dev, sizeof(*dma_dev->dma_parms), + GFP_KERNEL); + } + if (!dma_dev->dma_parms) { + ret = -ENOMEM; + goto err_component_unbind; + } + + ret = dma_set_max_seg_size(dma_dev, (unsigned int)DMA_BIT_MASK(32)); + if (ret) { + dev_err(dma_dev, "Failed to set DMA segment size\n"); + goto err_unset_dma_parms; + } /* * We don't use the drm_irq_install() helpers provided by the DRM @@ -292,13 +315,16 @@ static int mtk_drm_kms_init(struct drm_device *drm) drm->irq_enabled = true; ret = drm_vblank_init(drm, MAX_CRTC); if (ret < 0) - goto err_component_unbind; + goto err_unset_dma_parms; drm_kms_helper_poll_init(drm); drm_mode_config_reset(drm); return 0; +err_unset_dma_parms: + if (private->dma_parms_allocated) + dma_dev->dma_parms = NULL; err_component_unbind: component_unbind_all(drm->dev, drm); err_config_cleanup: @@ -309,9 +335,14 @@ static int mtk_drm_kms_init(struct drm_device *drm) static void mtk_drm_kms_deinit(struct drm_device *drm) { + struct mtk_drm_private *private = drm->dev_private; + drm_kms_helper_poll_fini(drm); drm_atomic_helper_shutdown(drm); + if (private->dma_parms_allocated) + private->dma_dev->dma_parms = NULL; + component_unbind_all(drm->dev, drm); drm_mode_config_cleanup(drm); } diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h index ecc00ca3221da..8fa60d46f8605 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h @@ -59,6 +59,8 @@ struct mtk_drm_private { } commit; struct drm_atomic_state *suspend_state; + + bool dma_parms_allocated; }; extern struct platform_driver mtk_ddp_driver; -- 2.20.1