re-send to fix s-o-b vs committer problem that I overlooked. Sorry, Stephen Rothwell's email about it was lost in the noise. original pull msg: Hi Dave, A bit larger this time around, due to introduction of "dpu1" support for the display controller in sdm845 and beyond. This has been on list and undergoing refactoring since Feb (going from ~110kloc to ~30kloc), and all my review complaints have been addressed, so I'd be happy to see this upstream so further feature work can procede on top of upstream. Also includes the gpu coredump support, which should be useful for debugging gpu crashes. And various other misc fixes and such. The following changes since commit 500775074f88d9cf5416bed2ca19592812d62c41: Merge branch 'drm-next-4.19' of git://people.freedesktop.org/~agd5f/linux into drm-next (2018-07-20 14:54:31 +1000) are available in the Git repository at: git://people.freedesktop.org/~robclark/linux drm-msm-next-2018-07-30 for you to fetch changes up to a7663a79343658f9362dc0655f1a06723c7014e3: dt-bindings: msm/disp: Add bindings for Snapdragon 845 DPU (2018-07-30 08:50:12 -0400) ---------------------------------------------------------------- Abhinav Kumar (2): drm/msm/dsi: set encoder mode for DRM bridge explicitly drm/msm: higher values of pclk can exceed 32 bits when multiplied by a factor Arnd Bergmann (2): drm/msm/gpu: avoid deprecated do_gettimeofday drm/msm: mark PM functions as __maybe_unused Carsten Behling (1): drm/msm/mdp5: negative x/y in cursor move Chandan Uddaraju (2): drm/msm/dsi: adjust dsi timing for dual dsi mode drm/msm/dsi: Use one connector for dual DSI mode Daniel Mack (2): drm/msm: call drm_atomic_helper_suspend() and drm_atomic_helper_resume() drm/msm/adreno: Add power management functions for system sleep Gustavo A. R. Silva (1): drm/msm: Replace PTR_RET with PTR_ERR_OR_ZERO Jeykumar Sankaran (10): drm: add msm compressed format modifiers drm/msm: enable zpos normalization drm/msm: #define MDP version numbers drm/msm: Use labels for unwinding in the error path drm/msm: #define MAX_<OBJECT> in msm_drv.h drm/msm: Add .commit() callback to msm_kms functions drm/msm: Add pm_suspend/resume callbacks to msm_kms drm/msm: Add SDM845 DPU support dt-bindings: msm/dsi: Add mdp transfer time to msm dsi binding dt-bindings: msm/disp: Add bindings for Snapdragon 845 DPU Jordan Crouse (19): drm/msm/gpu: Increase the pm runtime autosuspend for 5xx include: Move ascii85 functions from i915 to linux/ascii85.h drm: drm_printer: Add printer for devcoredump drm: Add drm_puts() to complement drm_printf() drm: Add a -puts() function for the seq_file printer drm: Add puts callback for the coredump printer drm/msm/gpu: Capture the state of the GPU drm/msm/gpu: Convert the GPU show function to use the GPU state drm/msm/gpu: Rearrange the code that collects the task during a hang drm/msm/gpu: Capture the GPU state on a GPU hang drm/msm/adreno: Convert the show/crash file format drm/msm/adreno: Add ringbuffer data to the GPU state drm/msm/adreno: Add a5xx specific registers for the GPU state drm/msm/gpu: Add the buffer objects from the submit to the crash dump drm/msm/disp/dpu: Remove unused code from drm_encoder.c drm/msm/disp/dpu: Remove unused code from drm_crtc.c drm/msm/disp/dpu: Remove dpu_kms_utils drm/msm/disp/dpu: Remove unused functions from dpu_formats.c drm/msm/disp/dpu: Mark a handful of functions as static Rajesh Yadav (3): drm/msm/dsi: initialize postdiv_lock before use for 10nm pll drm/msm/mdp5: subclass msm_mdss for mdp5 drm/msm: rework vblank event handling in dpu_crtc Rob Clark (1): drm/msm/mdp5: fix missing CTL flush Sean Paul (5): drm/msm: Move wait_for_vblanks into mdp complete_commit() hooks drm/msm: Clean up dangling atomic_wq drm/msm: dpu: Use 'vsync' instead of 'vsync_clk' in cmdmode encoder drm/msm: dpu: Use clock-names instead of assigned-clock-names drm/msm: dsi: Handle dual-channel for 6G as well Sibi Sankar (3): drm/msm/dsi: add dsi host helper functions support drm/msm/dsi: add implementation for helper functions drm/msm/dsi: replace version checks with helper functions vkorjani (1): drm: Add support for pps and compression mode command packet zhong jiang (1): drm/msm/dpu: fix mismatch in function argument. .../devicetree/bindings/display/msm/dpu.txt | 131 + .../devicetree/bindings/display/msm/dsi.txt | 16 + Documentation/gpu/msm-crash-dump.rst | 96 + drivers/gpu/drm/drm_mipi_dsi.c | 2 + drivers/gpu/drm/drm_print.c | 111 + drivers/gpu/drm/i915/i915_gpu_error.c | 34 +- drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/msm/Makefile | 31 +- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 30 +- drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 22 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 242 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 14 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 187 +- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 11 +- drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 479 ++++ drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h | 153 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 637 +++++ drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h | 133 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2138 +++++++++++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 423 ++++ drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c | 2393 +++++++++++++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.h | 103 + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2498 ++++++++++++++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 177 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 430 ++++ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 905 +++++++ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 922 ++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 1173 +++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h | 88 + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c | 155 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h | 53 + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 511 ++++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 804 +++++++ .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog_format.h | 168 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c | 323 +++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.h | 139 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 540 +++++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 218 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 1183 +++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 257 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 349 +++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 128 + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 261 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h | 122 + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 465 ++++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 250 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 136 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 753 ++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 424 ++++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 398 ++++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h | 202 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 368 +++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 348 +++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c | 275 +++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.h | 128 + drivers/gpu/drm/msm/disp/dpu1/dpu_hwio.h | 56 + drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c | 203 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.h | 57 + drivers/gpu/drm/msm/disp/dpu1/dpu_irq.c | 66 + drivers/gpu/drm/msm/disp/dpu1/dpu_irq.h | 59 + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1345 +++++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 290 +++ drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 245 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 1963 +++++++++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 175 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c | 249 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h | 225 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 1079 +++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 199 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 1007 ++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 384 +++ drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.h | 94 + drivers/gpu/drm/msm/disp/dpu1/msm_media_info.h | 1376 +++++++++++ drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 51 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 12 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 2 + drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c | 154 +- drivers/gpu/drm/msm/dsi/dsi.c | 3 + drivers/gpu/drm/msm/dsi/dsi.h | 23 +- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 56 +- drivers/gpu/drm/msm/dsi/dsi_cfg.h | 12 + drivers/gpu/drm/msm/dsi/dsi_host.c | 429 ++-- drivers/gpu/drm/msm/dsi/dsi_manager.c | 125 +- drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 2 + drivers/gpu/drm/msm/msm_atomic.c | 7 +- drivers/gpu/drm/msm/msm_debugfs.c | 93 +- drivers/gpu/drm/msm/msm_drv.c | 230 +- drivers/gpu/drm/msm/msm_drv.h | 97 +- drivers/gpu/drm/msm/msm_gpu.c | 145 +- drivers/gpu/drm/msm/msm_gpu.h | 68 +- drivers/gpu/drm/msm/msm_kms.h | 29 +- include/drm/drm_print.h | 71 + include/linux/ascii85.h | 38 + include/uapi/drm/drm_fourcc.h | 13 + include/video/mipi_display.h | 3 + 96 files changed, 32751 insertions(+), 524 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/msm/dpu.txt create mode 100644 Documentation/gpu/msm-crash-dump.rst create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog_format.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hwio.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_irq.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_irq.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/msm_media_info.h create mode 100644 include/linux/ascii85.h _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel