From patchwork Tue Jul 4 17:45:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 699721 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86B71EB64DA for ; Tue, 4 Jul 2023 17:46:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230218AbjGDRp7 (ORCPT ); Tue, 4 Jul 2023 13:45:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229645AbjGDRp6 (ORCPT ); Tue, 4 Jul 2023 13:45:58 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4466110D7 for ; Tue, 4 Jul 2023 10:45:57 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-4faaaa476a9so9445751e87.2 for ; Tue, 04 Jul 2023 10:45:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688492755; x=1691084755; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y62jOGwoLkRx2s8sLUVgr34ikoHyPLMwXSSE5xWIknI=; b=TzUDS4NIWLhl82RJllpN7bNhIQfbbewvB9BnnPSJSh6j6kC268hgdUxSjOr2cBr1NS kL1Y7IrSyuNTVhYOU8EJOqZ5Q5s6W8/OnQfPK3FdWkQ3cnqJ32hstOMNBtQsGW9i+b6H KSf0WBXxavQScz9MWkXKbUsq5Ily6k+9dmxFtkROCaS9dHBBkXJYZ9MxCZ7lMmjhzqQn Xxl2CDlxbfplITulEq8PbpPfIqWmgAMY98/3AbFeaNTJ8GUpw8GKdgkX6vdbECAGs/nq 2NEOfm6UjrF3GgiYlTDgEGBKbv8Sgnm4OFl/a7/uara+tA28qsof/p9BpTWKRb6RmdU1 MBNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688492755; x=1691084755; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y62jOGwoLkRx2s8sLUVgr34ikoHyPLMwXSSE5xWIknI=; b=XZJGSCehDgeHHrjs+ckyukBFw1mpijtcdqYNGAxhpEMpep3pzDLL8FecmN61j9vd+i 3p036VpMYf9p1MfgQ9HkNNiR3p5En4T9t2Vp3sbJ1sdPfYoCmuYk2shYtuZX6WKfdNBF JCJnNAKOuMCVTcj7scbAKoXywl5zLMISp+Zu/4VUBUKZ2s9kQFWGOtxC4HNmiHrV9yhX Oq99xGfRJFrUpc+AbpWaC1iI7PbE4QLCtwfuEI+97irlEd2ALj/5O+kZnlUiGxvGNlgw 1R1Bo6cRlIfPDLVAfH7qY+k0Wx2NlW+spMG3t+9QOuOl2whYD4zYPAFsf7vX50vH53Nu 23GA== X-Gm-Message-State: ABy/qLYev1yaXoJPY4DB3zup4OBIafK7AyaR1G6GiHbxcowiadvkVEzh lSu7ihFUFIU//k4TwDEMEc8OMQ== X-Google-Smtp-Source: APBJJlHl2m3O9Fnv7tb/dTtAFgub1GypmSBUjcod6x0kEY0TXWJrS6A9DSMeCkYlCzs89du3buKWCQ== X-Received: by 2002:ac2:5e2c:0:b0:4fb:81f2:4228 with SMTP id o12-20020ac25e2c000000b004fb81f24228mr8458767lfg.31.1688492755392; Tue, 04 Jul 2023 10:45:55 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id n25-20020a195519000000b004fb6c61e79bsm4709779lfe.117.2023.07.04.10.45.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 10:45:54 -0700 (PDT) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Abhinav Kumar , Marijn Suijten Cc: Stephen Boyd , David Airlie , Daniel Vetter , Bjorn Andersson , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH v4 1/4] drm/msm: allow passing struct msm_kms to msm_drv_probe() Date: Tue, 4 Jul 2023 20:45:50 +0300 Message-Id: <20230704174553.216248-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704174553.216248-1-dmitry.baryshkov@linaro.org> References: <20230704174553.216248-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org In preparation of moving resource allocation to the probe time, allow MSM KMS drivers to pass struct msm_kms pointer via msm_drv_probe(). Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 2 +- drivers/gpu/drm/msm/msm_drv.c | 6 ++++-- drivers/gpu/drm/msm/msm_drv.h | 3 ++- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 44b0daf70c4e..22e5b430770e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1244,7 +1244,7 @@ static int dpu_kms_init(struct drm_device *ddev) static int dpu_dev_probe(struct platform_device *pdev) { - return msm_drv_probe(&pdev->dev, dpu_kms_init); + return msm_drv_probe(&pdev->dev, dpu_kms_init, NULL); } static int dpu_dev_remove(struct platform_device *pdev) diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c index 6e37072ed302..e57a1e5f9da0 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -558,7 +558,7 @@ static const struct dev_pm_ops mdp4_pm_ops = { static int mdp4_probe(struct platform_device *pdev) { - return msm_drv_probe(&pdev->dev, mdp4_kms_init); + return msm_drv_probe(&pdev->dev, mdp4_kms_init, NULL); } static int mdp4_remove(struct platform_device *pdev) diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c index 323079cfd698..83a5b3bd09d9 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -939,7 +939,7 @@ static int mdp5_dev_probe(struct platform_device *pdev) if (ret) return ret; - return msm_drv_probe(&pdev->dev, mdp5_kms_init); + return msm_drv_probe(&pdev->dev, mdp5_kms_init, NULL); } static int mdp5_dev_remove(struct platform_device *pdev) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 891eff8433a9..f06a06ab26fa 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1233,7 +1233,8 @@ const struct component_master_ops msm_drm_ops = { }; int msm_drv_probe(struct device *master_dev, - int (*kms_init)(struct drm_device *dev)) + int (*kms_init)(struct drm_device *dev), + struct msm_kms *kms) { struct msm_drm_private *priv; struct component_match *match = NULL; @@ -1243,6 +1244,7 @@ int msm_drv_probe(struct device *master_dev, if (!priv) return -ENOMEM; + priv->kms = kms; priv->kms_init = kms_init; dev_set_drvdata(master_dev, priv); @@ -1278,7 +1280,7 @@ int msm_drv_probe(struct device *master_dev, static int msm_pdev_probe(struct platform_device *pdev) { - return msm_drv_probe(&pdev->dev, NULL); + return msm_drv_probe(&pdev->dev, NULL, NULL); } static int msm_pdev_remove(struct platform_device *pdev) diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index e13a8cbd61c9..6787bd302dfa 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -562,7 +562,8 @@ int msm_pm_prepare(struct device *dev); void msm_pm_complete(struct device *dev); int msm_drv_probe(struct device *dev, - int (*kms_init)(struct drm_device *dev)); + int (*kms_init)(struct drm_device *dev), + struct msm_kms *kms); void msm_drv_shutdown(struct platform_device *pdev);