From patchwork Tue Oct 26 22:38:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 12585863 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46158C433EF for ; Tue, 26 Oct 2021 22:33:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 25C1A60C51 for ; Tue, 26 Oct 2021 22:33:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240055AbhJZWgF (ORCPT ); Tue, 26 Oct 2021 18:36:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240057AbhJZWgE (ORCPT ); Tue, 26 Oct 2021 18:36:04 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79E44C061570 for ; Tue, 26 Oct 2021 15:33:39 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id j205so818665wmj.3 for ; Tue, 26 Oct 2021 15:33:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to:cc; bh=dF4klzHMmNf4aUB9C8acpTt9YIuuodRgS8Xxoip8C0Y=; b=lEUcH5C/bwPom8F+Ur3e1R3cwE8ZD2l6zmtldF44n3b/c5Rz1YWmn+OqhG3VE57/wE mYaLkbIbt0tPq8XjJQfB3vSiTgX0hshtLby9w3eQaLuHiUpbzzxDw01L7WRBCKSJKFLG SUannGIhQUWZWAukNmv0uGF9E81Duqj+ZaiyjwYYwGMX1rYxHaJIkUPIMwtxXyH49g6m tW/t46RRy9ocGqDUtcJVZ/U0u13ddydDagiRguD+gKG3oD7AzC1xcXkrfCy8LSFwHWyB dfjXkwvKBBmF6B4LTXM99a3z+n6aIIiI5dPCBh7p8gT7eQZsl49HXBV992fTiqUBpS8w c9sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=dF4klzHMmNf4aUB9C8acpTt9YIuuodRgS8Xxoip8C0Y=; b=KQkY8BTSCB2NIQyIdK1pSd2e3XQJ2bUU4utXg+wh6mJj9tIYgP5pROniFmqMvH6Yc7 S/hIc1+ZSxHl7Db0gdAXU0uRwGbYOpxTms9JTWPcyHZJQf/RM7JZElojIjJtVmyaxj1C BI2KscoxwhchRNP3E/O1lZKIhHTYSB5gyB4Bm0oeX/vh3q7MIwjz0M9tI93n79PIY5PL aLiOcwQ4kVUwnaeYn+qbILmZUBvp647n0zjjKY310IuXm0iaTyBUXXvGF5Ez2AYBPJad pHdG+Cy0H7zULJ64qVt4VtBHBQyvBtw5ukN8rjO6AdEtAIhDQXlMGC3u7wTjOb8fSTTe 6ozA== X-Gm-Message-State: AOAM53064domNd7mjK7y/YPpXaA1NvvMNavQYqHd6wx630bnA2RyHVZ6 fe0q6oxDKhMlDlqQ1XTruZ4sy8Sbdme6G5l543s= X-Google-Smtp-Source: ABdhPJzFjqD+17wZISlGc8arXHudN7nxTRnq6lNWrZjornAyfoqSlDSBSGpFMwrN3SulH0ULgr+2ErMW10yPUiBjQHs= X-Received: by 2002:a05:600c:4f96:: with SMTP id n22mr1677540wmq.168.1635287617928; Tue, 26 Oct 2021 15:33:37 -0700 (PDT) MIME-Version: 1.0 From: Rob Clark Date: Tue, 26 Oct 2021 15:38:29 -0700 Message-ID: Subject: [pull] drm/msm: drm-msm-next-2021-10-26 To: Dave Airlie , Daniel Vetter Cc: dri-devel , freedreno , linux-arm-msm , Abhinav Kumar , Dmitry Baryshkov , Jordan Crouse Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Hi Dave & Daniel, This is the main pull for v5.16: * eDP support in DP sub-driver (for newer SoCs with native eDP output) * dpu irq handling cleanup * CRC support for making igt happy * Support for NO_CONNECTOR bridges * dsi: 14nm phy support for msm8953 * mdp5: support for msm8x53, sdm450, sdm632 * various smaller fixes and cleanups The following changes since commit c8f01ffc83923a91e8087aaa077de13354a7aa59: drm/msm/dsi: fix off by one in dsi_bus_clk_enable error handling (2021-10-11 17:30:54 -0700) are available in the Git repository at: https://gitlab.freedesktop.org/drm/msm.git drm-msm-next-2021-10-26 for you to fetch changes up to 02d44fde976a8e9330f855fc535180727c779b9b: drm/msm/dp: fix missing #include (2021-10-26 09:31:24 -0700) ---------------------------------------------------------------- Arnd Bergmann (1): drm/msm/dp: fix missing #include Bernard (1): drm/msm: delete conversion from bool value to bool return Bernard Zhao (1): drm/msm: fix warning "using plain integer as NULL pointer" Bjorn Andersson (13): dt-bindings: msm/dp: Change reg definition drm/msm/dp: Use devres for ioremap() drm/msm/dp: Refactor ioremap wrapper drm/msm/dp: Store each subblock in the io region drm/msm/dp: Allow sub-regions to be specified in DT drm/msm/dp: Use the connector passed to dp_debug_get() drm/msm/dp: Simplify the dp_debug debugfs show function drm/msm/dp: Remove global g_dp_display variable drm/msm/dp: Modify prototype of encoder based API drm/msm/dp: Allow specifying connector_type per controller drm/msm/dp: Allow attaching a drm_panel drm/msm/dp: Support up to 3 DP controllers dt-bindings: msm/dp: Add SC8180x compatibles Chi Minghao (1): drm/msm: remove unneeded variable Christophe JAILLET (1): drm: Remove redundant 'flush_workqueue()' calls Colin Ian King (1): drm/msm/dp: Remove redundant initialization of variable bpp Dan Carpenter (5): drm/msm: Fix potential Oops in a6xx_gmu_rpmh_init() drm/msm: potential error pointer dereference in init() drm/msm: unlock on error in get_sched_entity() drm/msm: fix potential NULL dereference in cleanup drm/msm: uninitialized variable in msm_gem_import() David Heidelberg (1): dt-bindings: drm/msm/gpu: convert to YAML Deepak R Varma (1): drm: msm: adreno: use DEFINE_DEBUGFS_ATTRIBUTE with debugfs_create_file_unsafe() Dmitry Baryshkov (7): drm/msm/dpu: squash dpu_core_irq into dpu_hw_interrupts drm/msm/dpu: don't clear IRQ register twice drm/msm/dpu: merge struct dpu_irq into struct dpu_hw_intr drm/msm/dsi: do not enable irq handler before powering up the host drm/msm/dsi: use bulk clk API drm/msm/a6xx: correct cx_debugbus_read arguments drm/msm/hdmi: use bulk regulator API Jessica Zhang (3): drm/msm/dpu: Add CRC support for DPU drm/msm: Fix potential NULL dereference in DPU SSPP drm/msm/dsi: fix wrong type in msm_dsi_host Krishna Manikandan (1): dt-bindings: msm: add DT bindings for sc7280 Marijn Suijten (1): drm/msm/dsi: Use division result from div_u64_rem in 7nm and 14nm PLL Mark Yacoub (1): drm/msm: Change dpu_crtc_get_vblank_counter to use vsync count. Nathan Chancellor (1): drm/msm/dpu: Remove commit and its uses in dpu_crtc_set_crc_source() Rikard Falkeborn (1): drm: msm: hdmi: Constify static structs Rob Clark (6): drm/msm/dsi: Support NO_CONNECTOR bridges drm/msm/dpu: Remove some nonsense drm/msm: Add hrtimer + kthread_work helper drm/msm/devfreq: Add 1ms delay before clamping freq drm/msm/dpu: Remove impossible NULL check drm/msm/dpu: Remove dynamic allocation from atomic context Sireesh Kodali (1): dt-bindings: msm: dsi: Add MSM8953 dsi phy Tim Gardner (1): drm/msm: prevent NULL dereference in msm_gpu_crashstate_capture() Vladimir Lypak (2): drm/msm/dsi: Add phy configuration for MSM8953 drm/msm/mdp5: Add configuration for MDP v1.16 Wang Qing (1): drm: Use IS_ERR() instead of IS_ERR_OR_NULL() Xu Wang (3): drm/msm/mdp4: Remove redundant null check before clk_prepare_enable/clk_disable_unprepare drm/msm: dsi: Remove redundant null check before clk_prepare_enable/clk_disable_unprepare drm/msm/mdp5: Remove redundant null check before clk_prepare_enable/clk_disable_unprepare Yanteng Si (2): drm/msm: Fix missing include files in msm_gem.c drm/msm: Fix missing include files in msm_gem_shrinker.c zhaoxiao (1): drm/msm: Remove initialization of static variables .../bindings/display/msm/dp-controller.yaml | 15 +- .../bindings/display/msm/dpu-sc7280.yaml | 232 ++++++++++++++++ .../bindings/display/msm/dsi-phy-14nm.yaml | 1 + .../devicetree/bindings/display/msm/gpu.txt | 157 ----------- .../devicetree/bindings/display/msm/gpu.yaml | 288 ++++++++++++++++++++ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 1 - drivers/gpu/drm/msm/Kconfig | 2 + drivers/gpu/drm/msm/Makefile | 1 - drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 6 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 10 +- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 256 ------------------ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 147 ++++++++++- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 19 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 39 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 4 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 8 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 8 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 267 ++++++++++++++----- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 92 +------ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 56 +++- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h | 13 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 8 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 70 +++-- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 13 - drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 4 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 18 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 89 +++++++ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 18 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c | 12 +- drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 8 +- drivers/gpu/drm/msm/dp/dp_catalog.c | 64 ++--- drivers/gpu/drm/msm/dp/dp_debug.c | 294 +++++---------------- drivers/gpu/drm/msm/dp/dp_debug.h | 4 +- drivers/gpu/drm/msm/dp/dp_display.c | 143 +++++----- drivers/gpu/drm/msm/dp/dp_display.h | 2 + drivers/gpu/drm/msm/dp/dp_drm.c | 13 +- drivers/gpu/drm/msm/dp/dp_panel.c | 2 +- drivers/gpu/drm/msm/dp/dp_parser.c | 138 ++++++---- drivers/gpu/drm/msm/dp/dp_parser.h | 14 +- drivers/gpu/drm/msm/dsi/dsi.h | 2 + drivers/gpu/drm/msm/dsi/dsi_host.c | 147 +++++------ drivers/gpu/drm/msm/dsi/dsi_manager.c | 66 ++++- drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 25 +- drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 4 +- drivers/gpu/drm/msm/edp/edp_ctrl.c | 5 +- drivers/gpu/drm/msm/hdmi/hdmi.c | 38 +-- drivers/gpu/drm/msm/hdmi/hdmi.h | 6 +- drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 20 +- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 24 +- drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 33 +-- drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 4 +- drivers/gpu/drm/msm/msm_atomic.c | 21 +- drivers/gpu/drm/msm/msm_drv.c | 33 ++- drivers/gpu/drm/msm/msm_drv.h | 31 ++- drivers/gpu/drm/msm/msm_gem.c | 6 +- drivers/gpu/drm/msm/msm_gem_shrinker.c | 2 + drivers/gpu/drm/msm/msm_gpu.c | 2 +- drivers/gpu/drm/msm/msm_gpu.h | 7 + drivers/gpu/drm/msm/msm_gpu_devfreq.c | 38 ++- drivers/gpu/drm/msm/msm_kms.h | 3 +- drivers/gpu/drm/msm/msm_submitqueue.c | 1 + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 +- drivers/gpu/drm/vmwgfx/ttm_memory.c | 1 - 68 files changed, 1748 insertions(+), 1321 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml delete mode 100644 Documentation/devicetree/bindings/display/msm/gpu.txt create mode 100644 Documentation/devicetree/bindings/display/msm/gpu.yaml delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c