From patchwork Fri May 19 15:47:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 684010 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 58BB9C7EE2A for ; Fri, 19 May 2023 15:47:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232195AbjESPrz (ORCPT ); Fri, 19 May 2023 11:47:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231438AbjESPry (ORCPT ); Fri, 19 May 2023 11:47:54 -0400 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2527C128 for ; Fri, 19 May 2023 08:47:53 -0700 (PDT) Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2af2958db45so3970741fa.1 for ; Fri, 19 May 2023 08:47:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684511271; x=1687103271; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RPw2/wB1a5ZqseDCDRMmAwDzMdHfzNEkNDX8ElfTmdw=; b=roV1m639JX7XBsz3BmGSKFiitta7X+SYkGy2N/SMoe3hjkbU8B5jP0y+UTTktFUTkq uF4UH2Hvv5LzERNSR2n9lAEzEK9avypc7/HH2G9ytH5Q/XbkMicNiwnRvSUp/fJQN1X1 KkQFc5Zk9h5SFXiCxI6Cx7KBqFBHYOovAZdk7Mn0epJNA4rHXXw18mAQTjObcksOfvZM MWo3qq7jq29BfX5aOcPwAABT6MPlZTMJUD3jzftTVVnkpDoC/ZVYry1OY0l87zN5wGmS 9frG/RfuV53EUVo2zcXiuET7/xGojW6hI7maIYatOIeNaA2dMaB2H1BrNXJZ56HCsOIo SPsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684511271; x=1687103271; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RPw2/wB1a5ZqseDCDRMmAwDzMdHfzNEkNDX8ElfTmdw=; b=Xapg8g8sp49UBRagSbZc3Jhps7SEysxnWEchVdGHNnl7/JBMuqUb7CFFlcLlr3mKTJ zoZMPg0jIY5zzy8f4tKIyde3v4uBZ6RKmVL7uLDVEZxZwhHPBRMMSdhklVwccOwNTgWE vMzh4lJXk71m5V46WFfmikIo4JI2wqsHqwgB8C8jwjygY/M9qrX0mZ2dE/GEExhEVl7u pMxwvc/PaVF+JfRIqfB0cinf2hRZRsPhgQqECIzJi4TnnX8upzclUZSuyZNsQGOWz5sL E/tDhiwLEYb/NpkrYK9jEwwU2Ur2eoC+sl21Pl5ETIB2eESBDzDWxabXSXv/yLqPdfEn 7KRA== X-Gm-Message-State: AC+VfDz6MwnzUcd3QXzJB2GcrYQu70x+fVF8MqLcIkU+ygrnu+eHzkD8 zXWQ4awhAye1Vga5pGLojECq/pyaRdzOh3qIC8c= X-Google-Smtp-Source: ACHHUZ5mKJcxK22GMxd5QGzvlOE/KNHVP9lo733tvPxBo3D9MLjj4k9kBAbHKUI/5EPokGvqj3AsYA== X-Received: by 2002:ac2:59d1:0:b0:4f3:822e:f025 with SMTP id x17-20020ac259d1000000b004f3822ef025mr987754lfn.49.1684511271385; Fri, 19 May 2023 08:47:51 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d19-20020ac25453000000b004eff1163c37sm633949lfn.308.2023.05.19.08.47.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 08:47:51 -0700 (PDT) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Abhinav Kumar 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 v2 1/4] drm/msm: allow passing struct msm_kms to msm_drv_probe() Date: Fri, 19 May 2023 18:47:47 +0300 Message-Id: <20230519154750.3929813-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 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 0e7a68714e9e..ec6fb8634196 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1217,7 +1217,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 29ae5c9613f3..7fd89c93a491 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 b4cfa44a8a5c..a18a8dde3b4b 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1232,7 +1232,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; @@ -1242,6 +1243,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); @@ -1277,7 +1279,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);