From patchwork Wed Dec 30 15:29:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iskren Chernev X-Patchwork-Id: 11993959 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 6EAB2C433DB for ; Thu, 31 Dec 2020 10:42:34 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3DCE6223E4 for ; Thu, 31 Dec 2020 10:42:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3DCE6223E4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 00B0389B3B; Thu, 31 Dec 2020 10:42:15 +0000 (UTC) Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by gabe.freedesktop.org (Postfix) with ESMTPS id C321489056; Wed, 30 Dec 2020 15:30:04 +0000 (UTC) Received: by mail-ed1-x52f.google.com with SMTP id cw27so15742423edb.5; Wed, 30 Dec 2020 07:30:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=34sdCTMrNUObLPeLZuPMjVUhdN1zCiYujY6a/wW1ipc=; b=bt3oJcCNtOW3cWrm50FMG+rjfDl+IXCXWBtd5YDNz+/SbYjQYkue7+pUezRIOa0hTW HhcYTecp87p8ebxL7RLEOQ8bp9vtbe+L/TInVLvKKx7G77cG/ZHA4IP4wQB3pwnTsRj4 KDkEkNH8gwFXCJoqhLcTD1KhHYoRW9VJ9avTV/mg1B9d4lwacnrJly4NyIbhDV2i8Eoq 0oM+DR9ZHpVy1yRH+7rYrt5o47uSe8m3Rb4Snn0kY0fp5y+zUC6pDBWi0zL5PFtOFVe5 tJhoPsmlPYZkY+QchldNivTAAvAp7ODD+tiUG35Wtol/D4mr+3244lX8TeMHm+yMUG4L AJYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=34sdCTMrNUObLPeLZuPMjVUhdN1zCiYujY6a/wW1ipc=; b=VbuANEAnWp2gWz6aqzXqV21Bu2H26bdLHBEa/tDCBsfYIvfQf4Vm2ND7UKK86lq/pK /rP+TFQST4xnIfIIPrLgq4ki2sKikOqmo4EKVhZSdFsjWnU9+BN8I44BaLurMblV0Kkf yiFdIxjBYTspy+4nfupatYnriKceNn2TV9kKphwU2LgCjv1YlovS0AMoF7PIAX2Hng0R JzT+F0S9EN2tjFJdmWCzIMcdPlrBbVSnaOFf2ESGT9ih4J38FJa0uWYPiiasMQPChl/i AHSj3rb+XZTCzx0E5//4dCY6o3GV8zeUaj3EmlpmPlJfYyIVoJNtkHlx5IRLXIFPA3g9 vDCA== X-Gm-Message-State: AOAM533S5K5dyX3XoRDCJaUx+HP0EJ/1OiaUwoZLQaGlEEm2tml7AUUa 3VjFC2A5KmRemhlgQ2rHtqCm+EBZheegnimM X-Google-Smtp-Source: ABdhPJwK7Gav6N/d5gKjfxc10ZINhRcsguTBCZmmG/0yuTe6suMA2Y19hrEBCWuQP4axLFc51DDVCg== X-Received: by 2002:a50:c315:: with SMTP id a21mr51111550edb.50.1609342203425; Wed, 30 Dec 2020 07:30:03 -0800 (PST) Received: from localhost (178-169-161-196.razgrad.ddns.bulsat.com. [178.169.161.196]) by smtp.gmail.com with ESMTPSA id r7sm31630588edh.86.2020.12.30.07.30.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 30 Dec 2020 07:30:02 -0800 (PST) From: Iskren Chernev To: Rob Clark Subject: [PATCH 1/2] drm/msm: Call msm_init_vram before binding the gpu Date: Wed, 30 Dec 2020 17:29:42 +0200 Message-Id: <20201230152944.3635488-1-iskren.chernev@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 31 Dec 2020 10:42:13 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sean Paul , Wambui Karuga , Craig Tatlor , Jonathan Marek , David Airlie , linux-arm-msm@vger.kernel.org, Sharat Masetty , Akhil P Oommen , dri-devel@lists.freedesktop.org, Bjorn Andersson , Iskren Chernev , ~postmarketos/upstreaming@lists.sr.ht, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Brian Masney Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Craig Tatlor vram.size is needed when binding a gpu without an iommu and is defined in msm_init_vram(), so run that before binding it. Signed-off-by: Craig Tatlor Tested-by: Alexey Minnekhanov --- drivers/gpu/drm/msm/msm_drv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) base-commit: d7a03a44a5e93f39ece70ec75d25c6088caa0fdb prerequisite-patch-id: aba6f684932cab35d98457c21e4ff7a5ac75c753 prerequisite-patch-id: 4884d57df1bd197896b69e115d9002d6c26ae2e2 diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 535a0263ceeb4..108c405e03dd9 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -457,14 +457,14 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) drm_mode_config_init(ddev); - /* Bind all our sub-components: */ - ret = component_bind_all(dev, ddev); + ret = msm_init_vram(ddev); if (ret) goto err_destroy_mdss; - ret = msm_init_vram(ddev); + /* Bind all our sub-components: */ + ret = component_bind_all(dev, ddev); if (ret) - goto err_msm_uninit; + goto err_destroy_mdss; dma_set_max_seg_size(dev, UINT_MAX);