From patchwork Mon Jul 3 00:37:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 698783 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 070FBEB64DD for ; Mon, 3 Jul 2023 00:37:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229784AbjGCAhw (ORCPT ); Sun, 2 Jul 2023 20:37:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229497AbjGCAhv (ORCPT ); Sun, 2 Jul 2023 20:37:51 -0400 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F2291BF for ; Sun, 2 Jul 2023 17:37:48 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2b6a084a34cso56605851fa.1 for ; Sun, 02 Jul 2023 17:37:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688344666; x=1690936666; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=uEqbnXVxf/GNYZWDqu5WzEIx3jBHqt95bZSu9ReOEu4=; b=tA4b1xkWhX6GhJ89GDMNG7DrGR4HxIQ4tfldfYQXhZglVBcEvyJe9GQmPkL8NhfeO7 yJhk3NreIbXtGKqSAd88epwtGtepPwTUq1ijfRkPhr97ijeqjs4P2oJ+Ssc0IWIVPOKV jqWs1af7Vqa4+13dwidHvNdm2f40iACit8Hm5ZoKeUApZo8SKCIQi7aMkNqau0pfNIHT gdNjP3lgNHXlHTSegQtfbp33mmsye+Sxk4oikQ02NM7HoqVRA2whp8LfmKw6ahOTL74l NqHYGlLRU1dNBgQh35+n01epMWRx2PyRmLiq/sc4TPwog3Wwr6kKCoNg9b6t3GBAVC3O VkZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688344666; x=1690936666; 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=uEqbnXVxf/GNYZWDqu5WzEIx3jBHqt95bZSu9ReOEu4=; b=az2/vVaX/paiBdEG4fDdzaVO8UH9krTILWKAko1Zxq2an+wr6PJjoIDYXsNSSvXWz9 oK3yJFG6IuAgEN7/AbP01BEB1XT96m8BU4aMP1WzHyxlH695pMsSd4nE0jWxclo24ERO 3INktBiU1+OiviMJkcAvH3+adRV6zwLo/Gi7BUMYQKGSmpA34+j0bun4dT7bhpsOWuC/ tKagJ1LLDWR4YK0Gwj99olxra1Xw/sYSauMCy4YcVUwidPvO8B2ejWPt+Ru7lGdqxuyQ SPSSDGwASPTt48GvIMSO+8sOM0t1sJbzRxQfboqGDIl7tXOT5MS6aOr9Ipwp3qmdKiGw yd7w== X-Gm-Message-State: ABy/qLanNmr7ipw/1c4Cn0A9IAC4EoEgqPnikCD8ojpdFO+EXyr2LInb +21iNAYssk6nyER2ZrAajBdvNw== X-Google-Smtp-Source: APBJJlH08bD5q58Qm4UG0tiu2t9Qn+5iQ3LV0DEG7A/qE4k1z0q8Db0JVreiyEz8VnNJIyWwlnwhtw== X-Received: by 2002:a2e:a41a:0:b0:2b1:a89a:5f2b with SMTP id p26-20020a2ea41a000000b002b1a89a5f2bmr5475280ljn.2.1688344666693; Sun, 02 Jul 2023 17:37:46 -0700 (PDT) Received: from lothlorien.lan (dzdqv0yyyyyyyyyyybm5y-3.rev.dnainternet.fi. [2001:14ba:a0db:1f00::ab2]) by smtp.gmail.com with ESMTPSA id s24-20020a2e98d8000000b002b6ebc61e85sm136704ljj.54.2023.07.02.17.37.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 17:37:45 -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 00/13] drm/msm: move KMS code from msm_drv.c Date: Mon, 3 Jul 2023 03:37:32 +0300 Message-Id: <20230703003745.34239-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 Currently both msm_drm_init() and msm_drm_uninit() functions are trying to handle both normal and headless Adreno cases. This results in a suboptimal code, since headless case still gets modesetting and atomic interfaces enabled. Two mentioned functions are a spaghetti of `if (priv->kms)' conditional code. Move all KMS-related code (not limiting the init / teardown path) from msm_drv.c to msm_kms.c, making it more self-contained. This also disables ATOMIC and MODESET features for the headless case. Dependencies: [1] [1] https://patchwork.freedesktop.org/series/105392/ Dmitry Baryshkov (13): drm/msm/dsi: switch to devm_drm_bridge_add() drm/msm/hdmi: switch to devm_drm_bridge_add() drm/msm/dp: move pdev from struct dp_display_private to struct msm_dp drm/msm/dp: switch to devm_drm_bridge_add() drm/msm: remove msm_drm_private::bridges field drm/msm: drop pm ops from the headless msm driver drm/msm: rename msm_pm_prepare/complete to note the KMS nature drm/msm: remove shutdown callback from msm_platform_driver drm/msm: rename msm_drv_shutdown() to msm_kms_shutdown() drm/msm: switch to drmm_mode_config_init() drm/msm: only register 'kms' debug file if KMS is used drm/msm: make fb debugfs file available only in KMS case drm/msm: carve out KMS code from msm_drv.c drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 6 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 6 +- drivers/gpu/drm/msm/dp/dp_display.c | 34 +-- drivers/gpu/drm/msm/dp/dp_display.h | 1 + drivers/gpu/drm/msm/dp/dp_drm.c | 21 +- drivers/gpu/drm/msm/dp/dp_drm.h | 2 +- drivers/gpu/drm/msm/dsi/dsi.c | 28 +- drivers/gpu/drm/msm/dsi/dsi.h | 3 +- drivers/gpu/drm/msm/dsi/dsi_manager.c | 30 +- drivers/gpu/drm/msm/hdmi/hdmi.c | 22 +- drivers/gpu/drm/msm/hdmi/hdmi.h | 5 +- drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 30 +- drivers/gpu/drm/msm/hdmi/hdmi_hpd.c | 3 +- drivers/gpu/drm/msm/msm_debugfs.c | 12 +- drivers/gpu/drm/msm/msm_drv.c | 363 ++--------------------- drivers/gpu/drm/msm/msm_drv.h | 9 +- drivers/gpu/drm/msm/msm_kms.c | 345 +++++++++++++++++++++ drivers/gpu/drm/msm/msm_kms.h | 3 + 20 files changed, 452 insertions(+), 478 deletions(-) create mode 100644 drivers/gpu/drm/msm/msm_kms.c Reviewed-by: Rob Clark