Re: [PULL] drm-xe-next
> drivers/gpu/drm/xe/xe_uc_fw.c | 60 +-
> drivers/gpu/drm/xe/xe_uc_fw_types.h| 9 +-
> drivers/gpu/drm/xe/xe_vm.c | 287 ++-
> drivers/gpu/drm/xe/xe_vm.h | 7 +-
> drivers/gpu/drm/xe/xe_vm_types.h | 18 +-
> drivers/gpu/drm/xe/xe_vram_freq.c | 128 +++
> drivers/gpu/drm/xe/xe_vram_freq.h | 13 +
> drivers/gpu/drm/xe/xe_wa.c | 191 +
> drivers/gpu/drm/xe/xe_wa_oob.rules | 12 +-
> drivers/gpu/drm/xe/xe_wait_user_fence.c| 2 +-
> drivers/gpu/drm/xe/xe_wopcm_types.h| 4 +-
> include/uapi/drm/xe_drm.h | 34 +-
> 141 files changed, 6518 insertions(+), 1187 deletions(-)
> create mode 100644 drivers/gpu/drm/xe/abi/gsc_proxy_commands_abi.h
> create mode 100644 drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h
> create mode 100644 drivers/gpu/drm/xe/abi/guc_relay_actions_abi.h
> create mode 100644 drivers/gpu/drm/xe/abi/guc_relay_communication_abi.h
> rename drivers/gpu/drm/xe/{ => display}/xe_display.c (99%)
> rename drivers/gpu/drm/xe/{ => display}/xe_display.h (100%)
> create mode 100644 drivers/gpu/drm/xe/regs/xe_pcode_regs.h
> create mode 100644 drivers/gpu/drm/xe/tests/xe_guc_db_mgr_test.c
> create mode 100644 drivers/gpu/drm/xe/tests/xe_guc_relay_test.c
> create mode 100644 drivers/gpu/drm/xe/tests/xe_kunit_helpers.c
> create mode 100644 drivers/gpu/drm/xe/tests/xe_kunit_helpers.h
> create mode 100644 drivers/gpu/drm/xe/tests/xe_test_mod.c
> create mode 100644 drivers/gpu/drm/xe/xe_gsc_proxy.c
> create mode 100644 drivers/gpu/drm/xe/xe_gsc_proxy.h
> create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_printk.h
> create mode 100644 drivers/gpu/drm/xe/xe_guc_db_mgr.c
> create mode 100644 drivers/gpu/drm/xe/xe_guc_db_mgr.h
> create mode 100644 drivers/gpu/drm/xe/xe_guc_hxg_helpers.h
> create mode 100644 drivers/gpu/drm/xe/xe_guc_relay.c
> create mode 100644 drivers/gpu/drm/xe/xe_guc_relay.h
> create mode 100644 drivers/gpu/drm/xe/xe_guc_relay_types.h
> create mode 100644 drivers/gpu/drm/xe/xe_memirq.c
> create mode 100644 drivers/gpu/drm/xe/xe_memirq.h
> create mode 100644 drivers/gpu/drm/xe/xe_memirq_types.h
> create mode 100644 drivers/gpu/drm/xe/xe_vram_freq.c
> create mode 100644 drivers/gpu/drm/xe/xe_vram_freq.h
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Re: [PULL] drm-misc-next
pu/drm/panel/Makefile |1 + > drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c |2 + > drivers/gpu/drm/panel/panel-edp.c | 19 +- > drivers/gpu/drm/panel/panel-himax-hx83112a.c | 372 > drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 265 ++- > drivers/gpu/drm/panel/panel-simple.c | 20 + > drivers/gpu/drm/renesas/Kconfig|1 + > drivers/gpu/drm/renesas/Makefile |1 + > drivers/gpu/drm/renesas/rz-du/Kconfig | 12 + > drivers/gpu/drm/renesas/rz-du/Makefile |8 + > drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c | 422 + > drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.h | 89 + > drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 175 ++ > drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h | 78 + > drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c | 72 + > drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.h | 32 + > drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c | 371 > drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.h | 43 + > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c | 349 > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h | 82 + > drivers/gpu/drm/xe/xe_drm_client.c |2 +- > drivers/gpu/host1x/cdma.c |3 +- > include/drm/drm_bridge.h |2 +- > include/drm/drm_gem.h | 13 + > 70 files changed, 3748 insertions(+), 1279 deletions(-) > create mode 100644 > Documentation/devicetree/bindings/display/panel/himax,hx83112a.yaml > create mode 100644 > Documentation/devicetree/bindings/display/renesas,rzg2l-du.yaml > create mode 100644 > drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-skips.txt > create mode 100644 > drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-skips.txt > create mode 100644 drivers/gpu/drm/panel/panel-himax-hx83112a.c > create mode 100644 drivers/gpu/drm/renesas/rz-du/Kconfig > create mode 100644 drivers/gpu/drm/renesas/rz-du/Makefile > create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c > create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.h > create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c > create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h > create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c > create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.h > create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c > create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.h > create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c > create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Frankenstrasse 146, 90461 Nuernberg, Germany > GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman > HRB 36809 (AG Nuernberg) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-next
e mode 100644 drivers/gpu/drm/imagination/pvr_device_info.h > create mode 100644 drivers/gpu/drm/imagination/pvr_drv.c > create mode 100644 drivers/gpu/drm/imagination/pvr_drv.h > create mode 100644 drivers/gpu/drm/imagination/pvr_free_list.c > create mode 100644 drivers/gpu/drm/imagination/pvr_free_list.h > create mode 100644 drivers/gpu/drm/imagination/pvr_fw.c > create mode 100644 drivers/gpu/drm/imagination/pvr_fw.h > create mode 100644 drivers/gpu/drm/imagination/pvr_fw_info.h > create mode 100644 drivers/gpu/drm/imagination/pvr_fw_meta.c > create mode 100644 drivers/gpu/drm/imagination/pvr_fw_meta.h > create mode 100644 drivers/gpu/drm/imagination/pvr_fw_mips.c > create mode 100644 drivers/gpu/drm/imagination/pvr_fw_mips.h > create mode 100644 drivers/gpu/drm/imagination/pvr_fw_startstop.c > create mode 100644 drivers/gpu/drm/imagination/pvr_fw_startstop.h > create mode 100644 drivers/gpu/drm/imagination/pvr_fw_trace.c > create mode 100644 drivers/gpu/drm/imagination/pvr_fw_trace.h > create mode 100644 drivers/gpu/drm/imagination/pvr_gem.c > create mode 100644 drivers/gpu/drm/imagination/pvr_gem.h > create mode 100644 drivers/gpu/drm/imagination/pvr_hwrt.c > create mode 100644 drivers/gpu/drm/imagination/pvr_hwrt.h > create mode 100644 drivers/gpu/drm/imagination/pvr_job.c > create mode 100644 drivers/gpu/drm/imagination/pvr_job.h > create mode 100644 drivers/gpu/drm/imagination/pvr_mmu.c > create mode 100644 drivers/gpu/drm/imagination/pvr_mmu.h > create mode 100644 drivers/gpu/drm/imagination/pvr_params.c > create mode 100644 drivers/gpu/drm/imagination/pvr_params.h > create mode 100644 drivers/gpu/drm/imagination/pvr_power.c > create mode 100644 drivers/gpu/drm/imagination/pvr_power.h > create mode 100644 drivers/gpu/drm/imagination/pvr_queue.c > create mode 100644 drivers/gpu/drm/imagination/pvr_queue.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_cr_defs.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_cr_defs_client.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_defs.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_check.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_client.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_client_check.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_common.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_dev_info.h > create mode 100644 > drivers/gpu/drm/imagination/pvr_rogue_fwif_resetframework.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_sf.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_shared.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_shared_check.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_fwif_stream.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_heap_config.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_meta.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_mips.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_mips_check.h > create mode 100644 drivers/gpu/drm/imagination/pvr_rogue_mmu_defs.h > create mode 100644 drivers/gpu/drm/imagination/pvr_stream.c > create mode 100644 drivers/gpu/drm/imagination/pvr_stream.h > create mode 100644 drivers/gpu/drm/imagination/pvr_stream_defs.c > create mode 100644 drivers/gpu/drm/imagination/pvr_stream_defs.h > create mode 100644 drivers/gpu/drm/imagination/pvr_sync.c > create mode 100644 drivers/gpu/drm/imagination/pvr_sync.h > create mode 100644 drivers/gpu/drm/imagination/pvr_vm.c > create mode 100644 drivers/gpu/drm/imagination/pvr_vm.h > create mode 100644 drivers/gpu/drm/imagination/pvr_vm_mips.c > create mode 100644 drivers/gpu/drm/imagination/pvr_vm_mips.h > create mode 100644 include/uapi/drm/pvr_drm.h -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-intel-next
gpu/drm/i915/display/intel_pps.c | 2 +- > drivers/gpu/drm/i915/display/intel_psr.c | 369 +--- > drivers/gpu/drm/i915/display/intel_psr.h | 7 + > drivers/gpu/drm/i915/display/intel_psr_regs.h | 2 + > drivers/gpu/drm/i915/display/intel_qp_tables.c | 3 - > drivers/gpu/drm/i915/display/intel_sdvo.c | 23 +- > drivers/gpu/drm/i915/display/intel_sprite.c| 7 +- > drivers/gpu/drm/i915/display/intel_tc.c| 11 +- > drivers/gpu/drm/i915/display/intel_vdsc.c | 29 +- > drivers/gpu/drm/i915/display/skl_universal_plane.c | 28 +- > drivers/gpu/drm/i915/display/skl_watermark.c | 5 +- > drivers/gpu/drm/i915/display/vlv_dsi.c | 21 +- > .../gpu/drm/i915/gem/i915_gem_object_frontbuffer.h | 1 + > drivers/gpu/drm/i915/gt/intel_engine_pm.h | 1 + > drivers/gpu/drm/i915/gt/intel_gt.h | 14 + > drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.c | 2 +- > drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 +- > drivers/gpu/drm/i915/gvt/fb_decoder.c | 6 +- > drivers/gpu/drm/i915/gvt/handlers.c| 3 +- > drivers/gpu/drm/i915/i915_debugfs.c| 4 +- > drivers/gpu/drm/i915/i915_debugfs_params.c | 9 +- > drivers/gpu/drm/i915/i915_driver.c | 8 +- > drivers/gpu/drm/i915/i915_drv.h| 20 +- > drivers/gpu/drm/i915/i915_gem.c| 2 - > drivers/gpu/drm/i915/i915_gpu_error.c | 5 +- > drivers/gpu/drm/i915/i915_gpu_error.h | 2 + > drivers/gpu/drm/i915/i915_params.c | 89 --- > drivers/gpu/drm/i915/i915_params.h | 22 - > drivers/gpu/drm/i915/i915_reg.h| 2 - > drivers/gpu/drm/i915/i915_utils.h | 2 +- > drivers/gpu/drm/i915/intel_runtime_pm.h| 2 - > drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 + > drivers/gpu/drm/i915/soc/intel_gmch.c | 27 +- > drivers/gpu/drm/i915/vlv_sideband.c| 29 +- > drivers/gpu/drm/i915/vlv_sideband.h| 9 +- > drivers/gpu/drm/nouveau/dispnv50/disp.c| 9 +- > drivers/gpu/drm/tests/drm_dp_mst_helper_test.c | 166 +- > include/drm/display/drm_dp.h | 25 + > include/drm/display/drm_dp_helper.h| 32 + > include/drm/display/drm_dp_mst_helper.h| 16 +- > include/drm/drm_color_mgmt.h | 19 +- > 118 files changed, 4425 insertions(+), 1969 deletions(-) > create mode 100644 > drivers/gpu/drm/i915/display/intel_display_debugfs_params.c > create mode 100644 > drivers/gpu/drm/i915/display/intel_display_debugfs_params.h > create mode 100644 drivers/gpu/drm/i915/display/intel_display_params.c > create mode 100644 drivers/gpu/drm/i915/display/intel_display_params.h > create mode 100644 drivers/gpu/drm/i915/display/intel_dpt_common.c > create mode 100644 drivers/gpu/drm/i915/display/intel_dpt_common.h > create mode 100644 drivers/gpu/drm/i915/display/intel_dsb_buffer.c > create mode 100644 drivers/gpu/drm/i915/display/intel_dsb_buffer.h > > -- > Jani Nikula, Intel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-next
eduler_trace.h|2 +- > drivers/gpu/drm/scheduler/sched_entity.c |4 +- > drivers/gpu/drm/scheduler/sched_main.c | 480 +++-- > drivers/gpu/drm/solomon/ssd130x.c | 38 +- > drivers/gpu/drm/tegra/hdmi.c |1 + > drivers/gpu/drm/tegra/sor.c|1 + > drivers/gpu/drm/tests/Makefile |4 +- > drivers/gpu/drm/tests/drm_buddy_test.c | 465 - > drivers/gpu/drm/tests/drm_format_helper_test.c | 72 +- > drivers/gpu/drm/tests/drm_mm_test.c| 1904 > > drivers/gpu/drm/tidss/tidss_kms.c |4 - > drivers/gpu/drm/tiny/cirrus.c |3 +- > drivers/gpu/drm/tiny/ili9225.c | 10 +- > drivers/gpu/drm/tiny/ofdrm.c | 16 +- > drivers/gpu/drm/tiny/repaper.c | 10 +- > drivers/gpu/drm/tiny/simpledrm.c | 43 +- > drivers/gpu/drm/tiny/st7586.c | 19 +- > drivers/gpu/drm/v3d/Makefile |3 +- > drivers/gpu/drm/v3d/v3d_debugfs.c | 170 +- > drivers/gpu/drm/v3d/v3d_drv.c | 46 +- > drivers/gpu/drm/v3d/v3d_drv.h | 31 + > drivers/gpu/drm/v3d/v3d_gem.c | 15 +- > drivers/gpu/drm/v3d/v3d_irq.c | 93 +- > drivers/gpu/drm/v3d/v3d_regs.h | 90 +- > drivers/gpu/drm/v3d/v3d_sched.c| 81 +- > drivers/gpu/drm/v3d/v3d_sysfs.c| 69 + > drivers/gpu/drm/virtio/virtgpu_drv.h |5 + > drivers/gpu/drm/virtio/virtgpu_ioctl.c | 41 +- > drivers/video/fbdev/simplefb.c | 128 +- > include/drm/drm_edid.h | 148 -- > include/drm/drm_eld.h | 164 ++ > include/drm/drm_flip_work.h| 20 +- > include/drm/drm_format_helper.h| 81 +- > include/drm/drm_gem.h | 32 +- > include/drm/drm_gem_atomic_helper.h| 10 + > include/drm/drm_gpuvm.h| 521 +- > include/drm/drm_mipi_dbi.h |4 +- > include/drm/gpu_scheduler.h| 50 +- > include/linux/iosys-map.h | 44 +- > include/uapi/drm/drm.h | 20 + > include/uapi/drm/drm_mode.h| 10 + > include/uapi/drm/ivpu_accel.h |2 +- > include/uapi/drm/qaic_accel.h |5 +- > include/uapi/drm/v3d_drm.h |5 + > include/uapi/drm/virtgpu_drm.h |2 + > sound/core/pcm_drm_eld.c |1 + > sound/soc/codecs/hdac_hdmi.c |1 + > sound/soc/codecs/hdmi-codec.c |1 + > sound/x86/intel_hdmi_audio.c |1 + > 144 files changed, 5782 insertions(+), 4387 deletions(-) > create mode 100644 drivers/accel/qaic/qaic_timesync.c > create mode 100644 drivers/accel/qaic/qaic_timesync.h > create mode 100644 drivers/gpu/drm/drm_eld.c > create mode 100644 drivers/gpu/drm/v3d/v3d_sysfs.c > create mode 100644 include/drm/drm_eld.h -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-fixes
On Thu, Nov 16, 2023 at 02:48:52PM +0100, Maarten Lankhorst wrote: > Hi Dave, Daniel, > > Small pull request, mostly nouveau fixes. > > Cheers, > ~Maarten > > Mostly drm-misc-fixes-2023-11-16: > Assorted fixes for v6.7-rc2: > - Nouveau GSP fixes. > - Fix nouveau driver load without display. > - Use rwlock for nouveau's event lock to break a lockdep splat. > - Add orientation quirk for Lenovo Legion Go. > - Fix build failure in IVPU. > The following changes since commit b85ea95d086471afb4ad062012a4d73cd328fa86: > > Linux 6.7-rc1 (2023-11-12 16:19:07 -0800) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2023-11-16 Pulled into drm-fixes, thanks! -Sima > > for you to fetch changes up to ae1aadb1eb8d3cbc52e42bee71d67bd4a71f9f07: > > nouveau: don't fail driver load if no display hw present. (2023-11-15 > 18:23:31 +0100) > > > Assorted fixes for v6.7-rc2: > - Nouveau GSP fixes. > - Fix nouveau driver load without display. > - Use rwlock for nouveau's event lock to break a lockdep splat. > - Add orientation quirk for Lenovo Legion Go. > - Fix build failure in IVPU. > > > Arnd Bergmann (1): > accel/ivpu: avoid build failure with CONFIG_PM=n > > Brenton Simpson (1): > drm: panel-orientation-quirks: Add quirk for Lenovo Legion Go > > Dan Carpenter (2): > nouveau/gsp/r535: uninitialized variable in r535_gsp_acpi_mux_id() > nouveau/gsp/r535: Fix a NULL vs error pointer bug > > Dave Airlie (2): > nouveau: use an rwlock for the event lock. > nouveau: don't fail driver load if no display hw present. > > drivers/accel/ivpu/ivpu_pm.c | 3 --- > drivers/gpu/drm/drm_panel_orientation_quirks.c| 6 ++ > drivers/gpu/drm/nouveau/include/nvkm/core/event.h | 4 ++-- > drivers/gpu/drm/nouveau/nouveau_display.c | 5 + > drivers/gpu/drm/nouveau/nvkm/core/event.c | 12 ++-- > drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c| 6 +++--- > 6 files changed, 22 insertions(+), 14 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-fixes
On Wed, Nov 08, 2023 at 02:18:28PM +0100, Maarten Lankhorst wrote: > Hi Dave, Daniel, > > drm-misc-next-fixes is empty, have a pull request for drm-misc-fixes. > > Cheers, > ~Maarten > > drm-misc-fixes-2023-11-08: > drm-misc-fixes for v6.7-rc1: > > - drm-misc-fixes from 2023-11-02 + a single qxl memory leak fix. > The following changes since commit 8f5ad367e8b884772945c6c9fb622ac94b7d3e32: > > accel/ivpu: Extend address range for MMU mmap (2023-10-19 08:01:20 +0200) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2023-11-08 Merged to drm-next, thanks. -Sima > > for you to fetch changes up to 0e8b9f258baed25f1c5672613699247c76b007b5: > > drm/qxl: prevent memory leak (2023-11-06 09:37:03 +0100) > > > drm-misc-fixes for v6.7-rc1: > > - drm-misc-fixes from 2023-11-02 + a single qxl memory leak fix. > > > Christian König (2): > drm/amdgpu: ignore duplicate BOs again > drm/amdkfd: reserve a fence slot while locking the BO > > Erik Kurzinger (1): > drm/syncobj: fix DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE > > Karol Wachowski (1): > accel/ivpu/37xx: Fix missing VPUIP interrupts > > Luben Tuikov (1): > drm/amdgpu: Remove redundant call to priority_is_valid() > > Lukasz Majczak (1): > drm/dp_mst: Fix NULL deref in get_mst_branch_device_by_guid_helper() > > Maxime Ripard (1): > drm/vc4: tests: Fix UAF in the mock helpers > > Sui Jingfeng (1): > drm/logicvc: Kconfig: select REGMAP and REGMAP_MMIO > > Zongmin Zhou (1): > drm/qxl: prevent memory leak > > drivers/accel/ivpu/ivpu_hw_37xx.c| 11 +-- > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 ++- > drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 15 --- > drivers/gpu/drm/display/drm_dp_mst_topology.c| 6 +++--- > drivers/gpu/drm/drm_syncobj.c| 3 ++- > drivers/gpu/drm/logicvc/Kconfig | 2 ++ > drivers/gpu/drm/qxl/qxl_display.c| 3 +++ > drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c| 2 +- > drivers/gpu/drm/vc4/tests/vc4_mock_output.c | 2 +- > 10 files changed, 28 insertions(+), 21 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-intel-next-fixes
On Wed, Nov 08, 2023 at 04:04:14PM +0200, Jani Nikula wrote: > > Hi Dave & Daniel - > > I see Dave already sent the pull request for v6.7-rc1 fixes, but here's > some more. > > drm-intel-next-fixes-2023-11-08: > drm/i915 fixes for v6.7-rc1: > - Fix null dereference when perf interface is not available > - Fix a -Wstringop-overflow warning > - Fix a -Wformat-truncation warning in intel_tc_port_init > - Flush WC GGTT only on required platforms > - Fix MTL HBR3 rate support on C10 phy and eDP > - Fix MTL notify_guc for multi-GT > - Bump GLK CDCLK frequency when driving multiple pipes > - Fix potential spectre vulnerability > > BR, > Jani. > > The following changes since commit 5258dfd4a6adb5f45f046b0dd2e73c680f880d9d: > > usb: typec: altmodes/displayport: fixup drm internal api change vs new > user. (2023-10-27 07:55:41 +1000) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-intel > tags/drm-intel-next-fixes-2023-11-08 Pulled into drm-next, thanks. -Sima > > for you to fetch changes up to 9506fba463fcbdf8c8b7af3ec9ee34360df843fe: > > drm/i915/tc: Fix -Wformat-truncation in intel_tc_port_init (2023-11-06 > 14:42:58 +0200) > > > drm/i915 fixes for v6.7-rc1: > - Fix null dereference when perf interface is not available > - Fix a -Wstringop-overflow warning > - Fix a -Wformat-truncation warning in intel_tc_port_init > - Flush WC GGTT only on required platforms > - Fix MTL HBR3 rate support on C10 phy and eDP > - Fix MTL notify_guc for multi-GT > - Bump GLK CDCLK frequency when driving multiple pipes > - Fix potential spectre vulnerability > > > Arnd Bergmann (1): > drm/i915/mtl: avoid stringop-overflow warning > > Chaitanya Kumar Borah (1): > drm/i915/mtl: Support HBR3 rate with C10 phy and eDP in MTL > > Harshit Mogalapalli (1): > i915/perf: Fix NULL deref bugs with drm_dbg() calls > > Kunwu Chan (1): > drm/i915: Fix potential spectre vulnerability > > Nirmoy Das (3): > drm/i915: Flush WC GGTT only on required platforms > drm/i915/mtl: Apply notify_guc to all GTs > drm/i915/tc: Fix -Wformat-truncation in intel_tc_port_init > > Ville Syrjälä (1): > drm/i915: Bump GLK CDCLK frequency when driving multiple pipes > > drivers/gpu/drm/i915/display/intel_cdclk.c | 12 ++ > drivers/gpu/drm/i915/display/intel_dp.c | 2 +- > drivers/gpu/drm/i915/display/intel_tc.c | 11 ++--- > drivers/gpu/drm/i915/gem/i915_gem_context.c | 1 + > drivers/gpu/drm/i915/gt/intel_ggtt.c| 35 > - > drivers/gpu/drm/i915/gt/intel_rc6.c | 16 ----- > drivers/gpu/drm/i915/i915_debugfs_params.c | 9 +--- > drivers/gpu/drm/i915/i915_perf.c| 15 +++-- > 8 files changed, 65 insertions(+), 36 deletions(-) > > -- > Jani Nikula, Intel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-next
sofef00.c |1 - > drivers/gpu/drm/panel/panel-simple.c |4 - > drivers/gpu/drm/panel/panel-sitronix-st7701.c |2 +- > drivers/gpu/drm/panel/panel-sitronix-st7703.c |2 +- > drivers/gpu/drm/panel/panel-sony-td4353-jdi.c |1 - > drivers/gpu/drm/panel/panel-truly-nt35597.c|2 +- > drivers/gpu/drm/panel/panel-visionox-rm69299.c |2 +- > drivers/gpu/drm/panfrost/panfrost_drv.c|3 +- > drivers/gpu/drm/pl111/pl111_versatile.c|1 + > drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c |2 +- > drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c |2 + > drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c |1 + > drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c|1 - > drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c |1 - > drivers/gpu/drm/rockchip/analogix_dp-rockchip.c|3 +- > drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c|2 + > drivers/gpu/drm/rockchip/inno_hdmi.c |3 +- > drivers/gpu/drm/rockchip/rockchip_drm_drv.c|1 + > drivers/gpu/drm/rockchip/rockchip_drm_vop.c|1 - > drivers/gpu/drm/rockchip/rockchip_drm_vop2.c |1 - > drivers/gpu/drm/solomon/ssd130x.c |2 +- > drivers/gpu/drm/sprd/sprd_dpu.c|4 +- > drivers/gpu/drm/sprd/sprd_drm.c|3 +- > drivers/gpu/drm/sprd/sprd_dsi.c|6 +- > drivers/gpu/drm/sti/sti_drv.c |2 + > drivers/gpu/drm/stm/drv.c |3 +- > drivers/gpu/drm/stm/ltdc.c |1 - > drivers/gpu/drm/sun4i/sun4i_frontend.c |2 +- > drivers/gpu/drm/sun4i/sun4i_frontend.h |1 + > drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c |2 +- > drivers/gpu/drm/sun4i/sun4i_tcon.c |6 +- > drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c |2 +- > drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c |3 +- > drivers/gpu/drm/sun4i/sun8i_mixer.c|2 + > drivers/gpu/drm/sun4i/sun8i_tcon_top.c |2 +- > drivers/gpu/drm/tegra/dc.c |3 +- > drivers/gpu/drm/tegra/dpaux.c |2 +- > drivers/gpu/drm/tegra/gr2d.c |3 +- > drivers/gpu/drm/tegra/gr3d.c |2 +- > drivers/gpu/drm/tegra/hdmi.c |3 +- > drivers/gpu/drm/tegra/hub.c|2 +- > drivers/gpu/drm/tegra/nvdec.c |2 - > drivers/gpu/drm/tegra/sor.c|2 +- > drivers/gpu/drm/tegra/vic.c|2 - > drivers/gpu/drm/tidss/tidss_dispc.c|2 - > drivers/gpu/drm/tidss/tidss_drv.c |2 +- > drivers/gpu/drm/vc4/vc4_crtc.c |3 +- > drivers/gpu/drm/vc4/vc4_dpi.c |4 +- > drivers/gpu/drm/vc4/vc4_drv.c |2 +- > drivers/gpu/drm/vc4/vc4_dsi.c |3 +- > drivers/gpu/drm/vc4/vc4_hdmi.c |2 +- > drivers/gpu/drm/vc4/vc4_txp.c |4 +- > drivers/gpu/drm/vc4/vc4_vec.c |4 +- > drivers/gpu/drm/xen/xen_drm_front.c|1 - > drivers/gpu/host1x/bus.c | 29 +- > drivers/gpu/host1x/context.c |2 +- > drivers/gpu/host1x/dev.c |3 +- > drivers/gpu/ipu-v3/ipu-common.c|2 +- > drivers/of/device.c|1 + > include/drm/drm_debugfs.h | 25 + > include/drm/drm_drv.h |6 + > include/drm/drm_file.h |8 +- > include/drm/drm_gem.h | 79 + > include/drm/drm_gpuva_mgr.h| 706 > include/drm/drm_syncobj.h |6 +- > include/uapi/drm/drm.h | 23 + > 172 files changed, 3014 insertions(+), 215 deletions(-) > create mode 100644 drivers/gpu/drm/drm_gpuva_mgr.c > create mode 100644 include/drm/drm_gpuva_mgr.h -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-next
| 78 +- > drivers/video/fbdev/hyperv_fb.c|1 + > drivers/video/fbdev/mb862xx/mb862xxfbdrv.c |9 +- > drivers/video/fbdev/metronomefb.c | 76 +- > drivers/video/fbdev/nvidia/nv_backlight.c |2 +- > drivers/video/fbdev/nvidia/nvidia.c|8 +- > drivers/video/fbdev/omap2/omapfb/Kconfig |2 +- > drivers/video/fbdev/pxa168fb.c |2 +- > drivers/video/fbdev/riva/fbdev.c | 10 +- > drivers/video/fbdev/sh7760fb.c | 50 +- > drivers/video/fbdev/sm501fb.c |2 +- > drivers/video/fbdev/sm712fb.c |9 +- > drivers/video/fbdev/smscufx.c |4 +- > drivers/video/fbdev/ssd1307fb.c| 69 +- > drivers/video/fbdev/tdfxfb.c |4 +- > drivers/video/fbdev/xen-fbfront.c | 61 +- > include/drm/bridge/dw_hdmi.h |2 + > include/drm/drm_drv.h | 26 +- > include/drm/drm_exec.h | 123 +++ > include/drm/drm_gem_dma_helper.h | 14 +- > include/drm/drm_gem_shmem_helper.h | 19 +- > include/drm/drm_gem_vram_helper.h |9 +- > include/drm/drm_prime.h|7 - > include/drm/drm_sysfs.h|4 +- > include/linux/efi.h|3 +- > include/linux/fb.h |6 +- > include/linux/platform_data/bd6107.h |2 +- > include/linux/platform_data/gpio_backlight.h |2 +- > include/linux/platform_data/lv5207lp.h |2 +- > include/linux/sysfb.h |3 +- > include/uapi/drm/drm_mode.h|4 +- > 370 files changed, 11462 insertions(+), 3302 deletions(-) > create mode 100644 > Documentation/devicetree/bindings/display/panel/visionox,r66451.yaml > create mode 100644 drivers/accel/ivpu/ivpu_debugfs.c > create mode 100644 drivers/accel/ivpu/ivpu_debugfs.h > create mode 100644 drivers/accel/ivpu/ivpu_fw_log.c > create mode 100644 drivers/accel/ivpu/ivpu_fw_log.h > create mode 100644 drivers/gpu/drm/drm_exec.c > create mode 100644 drivers/gpu/drm/loongson/Kconfig > create mode 100644 drivers/gpu/drm/loongson/Makefile > create mode 100644 drivers/gpu/drm/loongson/loongson_device.c > create mode 100644 drivers/gpu/drm/loongson/loongson_module.c > create mode 100644 drivers/gpu/drm/loongson/loongson_module.h > create mode 100644 drivers/gpu/drm/loongson/lsdc_benchmark.c > create mode 100644 drivers/gpu/drm/loongson/lsdc_benchmark.h > create mode 100644 drivers/gpu/drm/loongson/lsdc_crtc.c > create mode 100644 drivers/gpu/drm/loongson/lsdc_debugfs.c > create mode 100644 drivers/gpu/drm/loongson/lsdc_drv.c > create mode 100644 drivers/gpu/drm/loongson/lsdc_drv.h > create mode 100644 drivers/gpu/drm/loongson/lsdc_gem.c > create mode 100644 drivers/gpu/drm/loongson/lsdc_gem.h > create mode 100644 drivers/gpu/drm/loongson/lsdc_gfxpll.c > create mode 100644 drivers/gpu/drm/loongson/lsdc_gfxpll.h > create mode 100644 drivers/gpu/drm/loongson/lsdc_i2c.c > create mode 100644 drivers/gpu/drm/loongson/lsdc_i2c.h > create mode 100644 drivers/gpu/drm/loongson/lsdc_irq.c > create mode 100644 drivers/gpu/drm/loongson/lsdc_irq.h > create mode 100644 drivers/gpu/drm/loongson/lsdc_output.h > create mode 100644 drivers/gpu/drm/loongson/lsdc_output_7a1000.c > create mode 100644 drivers/gpu/drm/loongson/lsdc_output_7a2000.c > create mode 100644 drivers/gpu/drm/loongson/lsdc_pixpll.c > create mode 100644 drivers/gpu/drm/loongson/lsdc_pixpll.h > create mode 100644 drivers/gpu/drm/loongson/lsdc_plane.c > create mode 100644 drivers/gpu/drm/loongson/lsdc_probe.c > create mode 100644 drivers/gpu/drm/loongson/lsdc_probe.h > create mode 100644 drivers/gpu/drm/loongson/lsdc_regs.h > create mode 100644 drivers/gpu/drm/loongson/lsdc_ttm.c > create mode 100644 drivers/gpu/drm/loongson/lsdc_ttm.h > delete mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramga102.c > create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp102.c > create mode 100644 drivers/gpu/drm/panel/panel-visionox-r66451.c > create mode 100644 drivers/gpu/drm/tests/drm_exec_test.c > create mode 100644 drivers/video/fbdev/core/fb_backlight.c > create mode 100644 drivers/video/fbdev/core/fb_chrdev.c > create mode 100644 drivers/video/fbdev/core/fb_info.c > create mode 100644 drivers/video/fbdev/core/fb_internal.h > create mode 100644 drivers/video/fbdev/core/fb_procfs.c > create mode 100644 include/drm/drm_exec.h > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Frankenstrasse 146, 90461 Nuernberg, Germany > GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman > HRB 36809 (AG Nuernberg) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-fixes
On Thu, Apr 13, 2023 at 08:42:33PM +0200, Thomas Zimmermann wrote: > Hi Dave and Daniel, > > this is the PR for drm-misc-fixes for this week. > > Best regards > Thomas > > drm-misc-fixes-2023-04-13: > Short summary of fixes pull: > > * armada: Fix double free > * fb: Clear FB_ACTIVATE_KD_TEXT in ioctl > * nouveau: Add missing callbacks > * scheduler: Fix use-after-free error > The following changes since commit 09a9639e56c01c7a00d6c0ca63f4c7c41abe075d: > > Linux 6.3-rc6 (2023-04-09 11:15:57 -0700) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2023-04-13 Pulled, thanks > > for you to fetch changes up to 5603effb8295ada8419408d038a34ca89d658229: > > Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes > (2023-04-12 12:01:32 +0200) > > > Short summary of fixes pull: > > * armada: Fix double free > * fb: Clear FB_ACTIVATE_KD_TEXT in ioctl > * nouveau: Add missing callbacks > * scheduler: Fix use-after-free error > > > Asahi Lina (1): > drm/scheduler: Fix UAF race in drm_sched_entity_push_job() > > Christophe JAILLET (1): > drm/armada: Fix a potential double free in an error handling path > > Daniel Vetter (1): > fbmem: Reject FB_ACTIVATE_KD_TEXT from userspace > > Karol Herbst (1): > drm/nouveau/fb: add missing sysmen flush callbacks > > Maarten Lankhorst (1): > Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes > > drivers/gpu/drm/armada/armada_drv.c| 1 - > drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf108.c | 1 + > drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c | 1 + > drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c | 1 + > drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm107.c | 1 + > drivers/gpu/drm/scheduler/sched_entity.c | 11 +-- > drivers/video/fbdev/core/fbmem.c | 2 ++ > 7 files changed, 15 insertions(+), 3 deletions(-) > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-intel-next-fixes
On Thu, Apr 13, 2023 at 03:12:19PM +0300, Joonas Lahtinen wrote: > Hi Dave & Daniel, > > Just one Cc:stable fix for indirect sampler state this week on > drm-intel-next-fixes. > > Regards, Joonas > > *** > > drm-intel-next-fixes-2023-04-13: > > Short summary of fixes pull (less than what git shortlog provides): > > Just one Cc:stable fix for sampler indirect state in bindless heap. > > The following changes since commit 55bf14961db9da61220e6f04bc9919c94b1a6585: > > Merge tag 'mediatek-drm-next-6.4' of > https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into > drm-next (2023-04-11 12:28:10 +0200) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-intel > tags/drm-intel-next-fixes-2023-04-13 Pulled, thanks. > > for you to fetch changes up to 81900e3a37750d8c6ad705045310e002f6dd0356: > > drm/i915: disable sampler indirect state in bindless heap (2023-04-12 > 11:36:09 +0300) > > > Short summary of fixes pull (less than what git shortlog provides): > > Just one Cc:stable fix for sampler indirect state in bindless heap. > > > Lionel Landwerlin (1): > drm/i915: disable sampler indirect state in bindless heap > > drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1 + > drivers/gpu/drm/i915/gt/intel_workarounds.c | 19 +++ > 2 files changed, 20 insertions(+) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-intel-fixes
On Thu, Apr 13, 2023 at 10:13:57AM +0300, Jani Nikula wrote: > > Hi Dave & Daniel - > > One DSI fix, stable material. > > drm-intel-fixes-2023-04-13: > drm/i915 fixes for v6.3-rc7: > - Fix dual link DSI for TGL+ > > BR, > Jani. > > The following changes since commit 09a9639e56c01c7a00d6c0ca63f4c7c41abe075d: > > Linux 6.3-rc6 (2023-04-09 11:15:57 -0700) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2023-04-13 Pulled, thanks > > for you to fetch changes up to 6b8446859c971a5783a2cdc90adf32e64de3bd23: > > drm/i915/dsi: fix DSS CTL register offsets for TGL+ (2023-04-11 11:41:57 > +0300) > > > drm/i915 fixes for v6.3-rc7: > - Fix dual link DSI for TGL+ > > > Jani Nikula (1): > drm/i915/dsi: fix DSS CTL register offsets for TGL+ > > drivers/gpu/drm/i915/display/icl_dsi.c | 20 > 1 file changed, 16 insertions(+), 4 deletions(-) > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-next
On Wed, Apr 12, 2023 at 03:32:30PM +0200, Maarten Lankhorst wrote: > > Good afternoon Daniel, Dave, > > One last pull request for drm-misc-next. > > Small one, so easy to merge. As a result also more likely to eat your > computer alive. ;) > > Cheers, > > ~Maarten > > drm-misc-next-2023-04-12: > > drm-misc-next for v6.4-rc1: > > Cross-subsystem Changes: > - Convert MIPI DSIM bridge to yaml. > > Core Changes: > - Fix UAF race in drm scheduler. > > Driver Changes: > - Add primary plane positioning support to VKMS. > - Convert omapdrm fbdev emulation to in-kernel client. > - Assorted small fixes to vkms, vc4, nouveau, vmwgfx. > The following changes since commit e44f18c6ff8beef7b2b10592287f0a9766376d9b: > > drm/ttm: Make the call to ttm_tt_populate() interruptible when faulting > (2023-04-06 10:01:42 +0200) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2023-04-12 There's non-breakable space in this line, which broke dim and it took me a while to figure out wtf is going on. Please copypaste more carefully :-) > for you to fetch changes up to fd35174e13f98f9232c4aa66689816731d34ca28: > > drm/vmwgfx: remove unused vmw_overlay function (2023-04-11 13:48:55 -0400) Pulled, thanks > > > drm-misc-next for v6.4-rc1: > > Cross-subsystem Changes: > - Convert MIPI DSIM bridge to yaml. > > Core Changes: > - Fix UAF race in drm scheduler. > > Driver Changes: > - Add primary plane positioning support to VKMS. > - Convert omapdrm fbdev emulation to in-kernel client. > - Assorted small fixes to vkms, vc4, nouveau, vmwgfx. > > > Asahi Lina (1): > drm/scheduler: Fix UAF race in drm_sched_entity_push_job() > > Ben Dooks (1): > drm/nouveau/mc/ga100: make ga100_mc_device static > > Jagan Teki (1): > dt-bindings: bridge: Convert Samsung MIPI DSIM bridge to yaml > > Javier Martinez Canillas (2): > drm/vkms: Drop vkms_connector_destroy() wrapper > drm/vkms: Remove include > > Martin Krastev (2): > drm/vmwgfx: Drop mksstat_init_record fn as currently unused > drm/vmwgfx: Fix Legacy Display Unit atomic drm support > > Maíra Canal (2): > drm/vkms: remove the need for the primary plane to be visible > drm/vkms: allow the primary plane to be positioned > > Thomas Zimmermann (5): > drm/omapdrm: Include > drm/omapdrm: Remove fb from struct omap_fbdev > drm/omapdrm: Remove bo from struct omap_fbdev > drm/omapdrm: Remove fbdev from struct omap_drm_private > drm/omapdrm: Implement fbdev emulation as in-kernel client > > Tom Rix (2): > drm/vc4: remove unused render_wait variable > drm/vmwgfx: remove unused vmw_overlay function > > Zack Rusin (1): > drm/vmwgfx: Print errors when running on broken/unsupported configs > > ruanjinjie (1): > drm/nouveau/disp: make gv100_disp_core_mthd_base static > > .../bindings/display/bridge/samsung,mipi-dsim.yaml | 255 > + > .../bindings/display/exynos/exynos_dsim.txt | 92 > MAINTAINERS | 1 + > drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c | 2 +- > drivers/gpu/drm/nouveau/nvkm/subdev/mc/ga100.c | 2 +- > drivers/gpu/drm/omapdrm/omap_debugfs.c | 6 +- > drivers/gpu/drm/omapdrm/omap_drv.c | 13 +- > drivers/gpu/drm/omapdrm/omap_drv.h | 3 - > drivers/gpu/drm/omapdrm/omap_fbdev.c | 163 - > drivers/gpu/drm/omapdrm/omap_fbdev.h | 9 +- > drivers/gpu/drm/scheduler/sched_entity.c | 11 +- > drivers/gpu/drm/vc4/vc4_irq.c | 2 - > drivers/gpu/drm/vkms/vkms_output.c | 15 +- > drivers/gpu/drm/vkms/vkms_plane.c | 10 +- > drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 29 +++ > drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 2 + > drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 62 + > drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 5 - > drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 45 +++- > drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 35 +-- > drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 6 - > 21 files changed, 465 insertions(+), 303 deletions(-) > create mode 100644 > Documentation/devicetree/bindings/display/bridge/samsung,mipi-dsim.yaml > delete mode 100644 > Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-intel-next
splay_power_well.c|7 +- > drivers/gpu/drm/i915/display/intel_display_types.h | 21 +- > drivers/gpu/drm/i915/display/intel_dp.c| 48 +- > drivers/gpu/drm/i915/display/intel_dp_aux.c| 33 +- > drivers/gpu/drm/i915/display/intel_dp_aux_regs.h | 84 ++ > drivers/gpu/drm/i915/display/intel_dp_mst.c| 50 +- > drivers/gpu/drm/i915/display/intel_dpt.c | 27 + > drivers/gpu/drm/i915/display/intel_dpt.h |2 + > drivers/gpu/drm/i915/display/intel_dsb.c |1 + > drivers/gpu/drm/i915/display/intel_dsb_regs.h | 67 ++ > drivers/gpu/drm/i915/display/intel_dsi_vbt.c |1 + > drivers/gpu/drm/i915/display/intel_fb.c| 11 +- > drivers/gpu/drm/i915/display/intel_fb.h|1 + > drivers/gpu/drm/i915/display/intel_fdi.c |1 + > drivers/gpu/drm/i915/display/intel_fdi_regs.h | 151 +++ > drivers/gpu/drm/i915/display/intel_lvds.c |1 + > drivers/gpu/drm/i915/display/intel_modeset_setup.c |1 - > drivers/gpu/drm/i915/display/intel_pch_display.c |1 + > drivers/gpu/drm/i915/display/intel_pps.c |1 + > drivers/gpu/drm/i915/display/intel_pps_regs.h | 78 ++ > drivers/gpu/drm/i915/display/intel_psr.c | 91 +- > drivers/gpu/drm/i915/display/intel_psr_regs.h | 260 > drivers/gpu/drm/i915/display/intel_qp_tables.c | 187 ++- > drivers/gpu/drm/i915/display/intel_qp_tables.h |4 +- > drivers/gpu/drm/i915/display/intel_tc.c| 1253 > +--- > drivers/gpu/drm/i915/display/intel_tc.h|4 +- > drivers/gpu/drm/i915/display/intel_tv.c|3 +- > drivers/gpu/drm/i915/display/intel_tv_regs.h | 490 > drivers/gpu/drm/i915/display/intel_vdsc.c | 132 ++- > drivers/gpu/drm/i915/display/intel_vdsc_regs.h | 28 + > drivers/gpu/drm/i915/display/intel_wm.c|2 +- > drivers/gpu/drm/i915/display/skl_universal_plane.c |6 + > drivers/gpu/drm/i915/display/skl_watermark.c | 11 +- > drivers/gpu/drm/i915/display/skl_watermark_regs.h | 160 +++ > drivers/gpu/drm/i915/gem/i915_gem_object.h |2 +- > drivers/gpu/drm/i915/gem/i915_gem_object_types.h |3 + > drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 15 +- > drivers/gpu/drm/i915/gvt/edid.c|1 + > drivers/gpu/drm/i915/gvt/handlers.c|5 + > drivers/gpu/drm/i915/i915_driver.c |8 +- > drivers/gpu/drm/i915/i915_drv.h|2 + > drivers/gpu/drm/i915/i915_gem.c|8 +- > drivers/gpu/drm/i915/i915_hwmon.c | 26 + > drivers/gpu/drm/i915/i915_irq.c|2 + > drivers/gpu/drm/i915/i915_params.c |6 + > drivers/gpu/drm/i915/i915_params.h |2 + > drivers/gpu/drm/i915/i915_pci.c|3 - > drivers/gpu/drm/i915/i915_reg.h| 1243 +-- > drivers/gpu/drm/i915/intel_clock_gating.c | 888 ++ > drivers/gpu/drm/i915/intel_clock_gating.h | 14 + > drivers/gpu/drm/i915/intel_device_info.h |1 - > drivers/gpu/drm/i915/intel_gvt_mmio_table.c|4 + > drivers/gpu/drm/i915/intel_pm.c| 885 -- > drivers/gpu/drm/i915/intel_pm.h| 18 - > drivers/gpu/drm/i915/intel_wakeref.h |2 +- > .../gpu/drm/i915/pxp/intel_pxp_cmd_interface_cmn.h |3 + > drivers/gpu/drm/i915/pxp/intel_pxp_session.c |2 +- > drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 77 +- > drivers/gpu/drm/i915/vlv_suspend.c |4 +- > include/drm/display/drm_dp_helper.h| 13 + > 76 files changed, 3965 insertions(+), 2888 deletions(-) > delete mode 100644 drivers/gpu/drm/i915/Kconfig.unstable > create mode 100644 drivers/gpu/drm/i915/display/intel_dp_aux_regs.h > create mode 100644 drivers/gpu/drm/i915/display/intel_dsb_regs.h > create mode 100644 drivers/gpu/drm/i915/display/intel_fdi_regs.h > create mode 100644 drivers/gpu/drm/i915/display/intel_pps_regs.h > create mode 100644 drivers/gpu/drm/i915/display/intel_psr_regs.h > create mode 100644 drivers/gpu/drm/i915/display/intel_tv_regs.h > create mode 100644 drivers/gpu/drm/i915/display/skl_watermark_regs.h > create mode 100644 drivers/gpu/drm/i915/intel_clock_gating.c > create mode 100644 drivers/gpu/drm/i915/intel_clock_gating.h > delete mode 100644 drivers/gpu/drm/i915/intel_pm.c > delete mode 100644 drivers/gpu/drm/i915/intel_pm.h -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-intel-gt-next
On Thu, Apr 06, 2023 at 03:34:04PM +0300, Jani Nikula wrote: > On Thu, 06 Apr 2023, Maarten Lankhorst > wrote: > > Hi Dave, Daniel, > > Pull request to avoid backmerges. ;) > > Cheers, > > ~Maarten > > Not using dim for this? Is the subject line copy-pasted from another > pull request? :) dim did at least manage to eat it all correctly I think :-) Pulled, thanks > > BR, > Jani. > > > > > drm-misc-next-2023-04-06: > > drm-misc-next for v6.4-rc1: > > > > UAPI Changes: > > > > Cross-subsystem Changes: > > - Document port and rotation dt bindings better. > > - For panel timing DT bindings, document that vsync and hsync are > >first, rather than last in image. > > - Fix video/aperture typos. > > > > Core Changes: > > - Reject prime DMA-Buf attachment if get_sg_table is missing. > >(For self-importing dma-buf only.) > > - Add prime import/export to vram-helper. > > - Fix oops in drm/vblank when init is not called. > > - Fixup xres/yres_virtual and other fixes in fb helper. > > - Improve SCDC debugs. > > - Skip setting deadline on modesets. > > - Assorted TTM fixes. > > > > Driver Changes: > > - Add lima usage stats. > > - Assorted fixes to bridge/lt8192b, tc358767, ivpu, > >bridge/ti-sn65dsi83, ps8640. > > - Use pci aperture helpers in drm/ast lynxfb, radeonfb. > > - Revert some lima patches, as they required a commit that has been > >reverted upstream. > > - Add AUO NE135FBM-N41 v8.1 eDP panel. > > - Add QAIC accel driver. > > The following changes since commit 7d690f936e9bc9fbd6394fb3d4ad181af03ee393: > > > >drm/panfrost: Add basic support for speed binning (2023-03-31 11:44:11 > > +0200) > > > > are available in the Git repository at: > > > >git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2023-04-06 > > > > for you to fetch changes up to e44f18c6ff8beef7b2b10592287f0a9766376d9b: > > > >drm/ttm: Make the call to ttm_tt_populate() interruptible when faulting > > (2023-04-06 10:01:42 +0200) > > > > > > drm-misc-next for v6.4-rc1: > > > > UAPI Changes: > > > > Cross-subsystem Changes: > > - Document port and rotation dt bindings better. > > - For panel timing DT bindings, document that vsync and hsync are > >first, rather than last in image. > > - Fix video/aperture typos. > > > > Core Changes: > > - Reject prime DMA-Buf attachment if get_sg_table is missing. > >(For self-importing dma-buf only.) > > - Add prime import/export to vram-helper. > > - Fix oops in drm/vblank when init is not called. > > - Fixup xres/yres_virtual and other fixes in fb helper. > > - Improve SCDC debugs. > > - Skip setting deadline on modesets. > > - Assorted TTM fixes. > > > > Driver Changes: > > - Add lima usage stats. > > - Assorted fixes to bridge/lt8192b, tc358767, ivpu, > >bridge/ti-sn65dsi83, ps8640. > > - Use pci aperture helpers in drm/ast lynxfb, radeonfb. > > - Revert some lima patches, as they required a commit that has been > >reverted upstream. > > - Add AUO NE135FBM-N41 v8.1 eDP panel. > > - Add QAIC accel driver. > > > > > > Alexander Stein (2): > >drm/bridge: ti-sn65dsi83: use dev_err_probe if host attach failed > >drm/bridge: ti-sn65dsi86: Allow GPIO operations to sleep > > > > AngeloGioacchino Del Regno (1): > >drm/panel-edp: Add AUO NE135FBM-N41 v8.1 panel entry > > > > Daniel Vetter (7): > >drm/ast: Use drm_aperture_remove_conflicting_pci_framebuffers > >staging/lynxfb: Use pci aperture helper > >fbdev/radeon: use pci aperture helpers > >drm/fb-helper: set x/yres_virtual in drm_fb_helper_check_var > >drm/fb-helper: drop redundant pixclock check from > > drm_fb_helper_set_par() > >drm/fb-helper: fix input validation gaps in check_var > >drm/atomic-helper: Don't set deadline for modesets > > > > Erico Nunes (3): > >drm/lima: add usage counting method to ctx_mgr > >drm/lima: allocate unique id per drm_file > >drm/lima: add show_fdinfo for drm usage stats > > > > Francesco Dolcini (1): > >drm/bridge: lt8912b: Fix DSI Video Mode > > > > Harshit Mogalapalli (1): > >drm/lima/lima_drv: Add missing unwind goto in lima_pdev_probe() > > >
Re: [PULL] drm-intel-gt-next
gpu/drm/i915/gem/i915_gem_object.c | 2 +- > drivers/gpu/drm/i915/gem/i915_gem_ttm.c| 2 +- > drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 3 + > drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c | 5 +- > drivers/gpu/drm/i915/gem/i915_gem_wait.c | 2 +- > drivers/gpu/drm/i915/gt/intel_context.h| 15 +- > drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 +- > drivers/gpu/drm/i915/gt/intel_engine_pm.c | 9 + > drivers/gpu/drm/i915/gt/intel_engine_types.h | 10 + > .../gpu/drm/i915/gt/intel_execlists_submission.c | 12 +- > drivers/gpu/drm/i915/gt/intel_ggtt.c | 43 +- > drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c | 1 + > drivers/gpu/drm/i915/gt/intel_gt.c | 4 +- > drivers/gpu/drm/i915/gt/intel_gt_debugfs.c | 4 +- > drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 2 +- > drivers/gpu/drm/i915/gt/intel_gt_regs.h| 9 + > drivers/gpu/drm/i915/gt/intel_gtt.h| 2 + > drivers/gpu/drm/i915/gt/intel_rc6.c| 27 + > drivers/gpu/drm/i915/gt/intel_rc6.h| 2 + > drivers/gpu/drm/i915/gt/intel_rc6_types.h | 2 + > drivers/gpu/drm/i915/gt/intel_region_lmem.c| 25 +- > drivers/gpu/drm/i915/gt/intel_reset.c | 119 - > drivers/gpu/drm/i915/gt/intel_rps.c| 40 +- > drivers/gpu/drm/i915/gt/intel_rps.h| 4 +- > drivers/gpu/drm/i915/gt/intel_sseu.c | 3 +- > drivers/gpu/drm/i915/gt/intel_workarounds.c| 19 + > drivers/gpu/drm/i915/gt/selftest_timeline.c| 14 +- > drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h| 17 + > drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.h | 2 + > drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 + > drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 141 - > drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c| 6 +- > drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 5 +- > drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 4 +- > drivers/gpu/drm/i915/gt/uc/intel_huc.c | 7 + > drivers/gpu/drm/i915/gt/uc/intel_huc.h | 7 +- > drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 2 + > drivers/gpu/drm/i915/i915_debugfs.c| 36 +- > drivers/gpu/drm/i915/i915_driver.c | 4 +- > drivers/gpu/drm/i915/i915_drm_client.c | 2 +- > drivers/gpu/drm/i915/i915_drv.h| 2 + > drivers/gpu/drm/i915/i915_file_private.h | 2 +- > drivers/gpu/drm/i915/i915_gem.c| 10 +- > drivers/gpu/drm/i915/i915_getparam.c | 2 +- > drivers/gpu/drm/i915/i915_pci.c| 1 + > drivers/gpu/drm/i915/i915_perf.c | 570 > ++++- > drivers/gpu/drm/i915/i915_perf.h | 4 +- > drivers/gpu/drm/i915/i915_perf_oa_regs.h | 78 +++ > drivers/gpu/drm/i915/i915_perf_types.h | 75 ++- > drivers/gpu/drm/i915/i915_pmu.c| 10 +- > drivers/gpu/drm/i915/i915_reg.h| 14 +- > drivers/gpu/drm/i915/i915_scatterlist.c| 2 +- > drivers/gpu/drm/i915/i915_vma.c| 3 +- > drivers/gpu/drm/i915/intel_device_info.h | 1 + > drivers/gpu/drm/i915/intel_region_ttm.c| 1 + > drivers/gpu/drm/i915/intel_uncore.c| 47 +- > drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 356 - > include/uapi/drm/i915_drm.h| 25 +- > 63 files changed, 1241 insertions(+), 637 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-fixes
On Wed, Apr 05, 2023 at 08:28:55PM +0200, Thomas Zimmermann wrote: > Hi Dave and Daniel, > > here's this week's PR for drm-misc-fixes. As requested, it comes > a day earlier than usual due to Easter holidays. > > Best regards > Thomas > > drm-misc-fixes-2023-04-05: > Short summary of fixes pull: > > * ivpu: DMA fence and suspend fixes > * nouveau: Color-depth fixes > * panfrost: Fix mmap error handling > The following changes since commit 25bbe844ef5c4fb4d7d8dcaa0080f922b7cd3a16: > > drm: test: Fix 32-bit issue in drm_buddy_test (2023-03-29 17:14:15 +0200) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2023-04-05 > > for you to fetch changes up to 0ec8671837a61d841462179686c5819d951d3b10: > > accel/ivpu: Fix S3 system suspend when not idle (2023-04-05 09:07:26 +0200) Pulled, thanks. > > > Short summary of fixes pull: > > * ivpu: DMA fence and suspend fixes > * nouveau: Color-depth fixes > * panfrost: Fix mmap error handling > > > Boris Brezillon (1): > drm/panfrost: Fix the panfrost_mmu_map_fault_addr() error path > > Jacek Lawrynowicz (1): > accel/ivpu: Fix S3 system suspend when not idle > > Karol Herbst (1): > drm/nouveau/disp: Support more modes by checking with lower bpc > > Karol Wachowski (1): > accel/ivpu: Add dma fence to command buffers only > > drivers/accel/ivpu/ivpu_job.c | 18 +++--- > drivers/accel/ivpu/ivpu_pm.c| 26 +++--- > drivers/gpu/drm/nouveau/dispnv50/disp.c | 32 > drivers/gpu/drm/nouveau/nouveau_dp.c| 8 +--- > drivers/gpu/drm/panfrost/panfrost_mmu.c | 1 + > 5 files changed, 56 insertions(+), 29 deletions(-) > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-intel-fixes
On Wed, Apr 05, 2023 at 12:04:04PM +0300, Jani Nikula wrote: > > Hi Dave & Daniel - > > drm-intel-fixes-2023-04-05: > drm/i915 fixes for v6.3-rc6: > - Fix DP MST DSC M/N calculation to use compressed bpp > - Fix racy use-after-free in perf ioctl > - Fix context runtime accounting > - Fix handling of GT reset during HuC loading > - Fix use of unsigned vm_fault_t for error values > > BR, > Jani. > > The following changes since commit 7e364e56293bb98cae1b55fd835f5991c4e96e7d: > > Linux 6.3-rc5 (2023-04-02 14:29:29 -0700) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2023-04-05 > > for you to fetch changes up to dc3421560a67361442f33ec962fc6dd48895a0df: > > drm/i915: Fix context runtime accounting (2023-04-03 11:37:00 +0300) Pulled, thanks > > > drm/i915 fixes for v6.3-rc6: > - Fix DP MST DSC M/N calculation to use compressed bpp > - Fix racy use-after-free in perf ioctl > - Fix context runtime accounting > - Fix handling of GT reset during HuC loading > - Fix use of unsigned vm_fault_t for error values > > > Daniele Ceraolo Spurio (1): > drm/i915/huc: Cancel HuC delayed load timer on reset. > > Matthew Auld (1): > drm/i915/ttm: fix sparse warning > > Min Li (1): > drm/i915: fix race condition UAF in i915_perf_add_config_ioctl > > Stanislav Lisovskiy (1): > drm/i915: Use compressed bpp when calculating m/n value for DP MST DSC > > Tvrtko Ursulin (1): > drm/i915: Fix context runtime accounting > > drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 5 +++-- > drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 12 ++-- > drivers/gpu/drm/i915/gt/uc/intel_huc.c | 7 +++ > drivers/gpu/drm/i915/gt/uc/intel_huc.h | 7 +-- > drivers/gpu/drm/i915/i915_perf.c | 6 +++--- > 6 files changed, 25 insertions(+), 14 deletions(-) > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-next
lay/imx/nxp,imx8mq-dcss.yaml | 4 +- > .../bindings/display/mediatek/mediatek,hdmi.yaml | 2 +- > .../bindings/display/msm/dsi-controller-main.yaml | 8 +- > .../bindings/display/msm/dsi-phy-10nm.yaml | 2 +- > .../devicetree/bindings/display/msm/gmu.yaml | 4 +- > .../devicetree/bindings/display/msm/gpu.yaml | 4 +- > .../devicetree/bindings/display/msm/mdp4.yaml | 4 +- > .../bindings/display/panel/boe,tv101wum-nl6.yaml | 1 + > .../display/panel/innolux,p120zdg-bf1.yaml | 43 --- > .../bindings/display/panel/novatek,nt36672a.yaml | 6 +- > .../bindings/display/panel/panel-simple-dsi.yaml | 24 +- > .../bindings/display/panel/panel-simple.yaml | 2 + > .../bindings/display/panel/ronbo,rb070d30.yaml | 2 +- > .../display/panel/samsung,s6e88a0-ams452ef01.yaml | 8 ++ > .../bindings/display/panel/seiko,43wvf1g.yaml | 2 +- > .../bindings/display/panel/visionox,rm69299.yaml | 25 +-- > .../devicetree/bindings/display/renesas,du.yaml| 4 +- > .../display/tegra/nvidia,tegra114-mipi.yaml| 2 +- > .../display/tegra/nvidia,tegra124-sor.yaml | 12 +-- > .../bindings/display/tegra/nvidia,tegra186-dc.yaml | 4 +- > .../display/tegra/nvidia,tegra186-dsi-padctl.yaml | 2 +- > .../bindings/display/tegra/nvidia,tegra20-dsi.yaml | 12 +-- > .../display/tegra/nvidia,tegra20-hdmi.yaml | 6 +- > .../bindings/display/ti/ti,am65x-dss.yaml | 6 +- > .../bindings/display/ti/ti,j721e-dss.yaml | 4 +- > .../devicetree/bindings/display/ti/ti,k2g-dss.yaml | 4 +- > .../bindings/display/xylon,logicvc-display.yaml| 22 +++--- > .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 87 > +- > drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c| 2 +- > drivers/gpu/drm/bridge/ite-it6505.c| 34 ++--- > drivers/gpu/drm/bridge/parade-ps8622.c | 2 +- > drivers/gpu/drm/bridge/parade-ps8640.c | 65 ++-- > drivers/gpu/drm/drm_mipi_dsi.c | 2 +- > drivers/gpu/drm/msm/adreno/adreno_gpu.c| 2 +- > drivers/gpu/drm/panel/panel-edp.c | 1 + > .../gpu/drm/panel/panel-magnachip-d53e6ea8966.c| 2 +- > drivers/gpu/drm/panfrost/panfrost_devfreq.c| 30 > drivers/gpu/drm/panfrost/panfrost_device.h | 2 +- > drivers/gpu/drm/panfrost/panfrost_drv.c| 37 + > drivers/gpu/drm/panfrost/panfrost_gpu.c| 8 ++ > drivers/gpu/drm/scheduler/sched_main.c | 2 +- > drivers/gpu/drm/sun4i/sun4i_backend.c | 2 +- > drivers/gpu/drm/sun4i/sun8i_mixer.c| 2 +- > drivers/gpu/drm/tiny/ofdrm.c | 8 +- > drivers/gpu/drm/tiny/simpledrm.c | 2 +- > drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- > 54 files changed, 356 insertions(+), 179 deletions(-) > delete mode 100644 > Documentation/devicetree/bindings/display/panel/innolux,p120zdg-bf1.yaml -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-fixes
On Thu, Mar 30, 2023 at 04:10:06PM +0200, Thomas Zimmermann wrote: > Hi Dave and Daniel, > > here's the weekly PR for drm-misc-fixes. > > Best regards > Thomas > > drm-misc-fixes-2023-03-30: > Short summary of fixes pull: > > * various ivpu fixes > * fix nouveau backlight registration > * fix buddy allocator in 32-bit systems > The following changes since commit 1a70ca89d59c7c8af006d29b965a95ede0abb0da: > > drm/bridge: lt8912b: return EPROBE_DEFER if bridge is not found (2023-03-22 > 18:01:57 +0100) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2023-03-30 Pulled, thanks > > for you to fetch changes up to 25bbe844ef5c4fb4d7d8dcaa0080f922b7cd3a16: > > drm: test: Fix 32-bit issue in drm_buddy_test (2023-03-29 17:14:15 +0200) > > > Short summary of fixes pull: > > * various ivpu fixes > * fix nouveau backlight registration > * fix buddy allocator in 32-bit systems > > > Andrzej Kacprowski (1): > accel/ivpu: Fix IPC buffer header status field value > > David Gow (2): > drm: buddy_allocator: Fix buddy allocator init on 32-bit systems > drm: test: Fix 32-bit issue in drm_buddy_test > > Hans de Goede (1): > drm/nouveau/kms: Fix backlight registration > > Stanislaw Gruszka (7): > accel/ivpu: Do not access HW registers after unbind > accel/ivpu: Cancel recovery work > accel/ivpu: Do not use SSID 1 > accel/ivpu: Fix power down sequence > accel/ivpu: Disable buttress on device removal > accel/ivpu: Remove support for 1 tile SKUs > accel/ivpu: Fix VPU clock calculation > > drivers/accel/ivpu/ivpu_drv.c | 18 - > drivers/accel/ivpu/ivpu_drv.h | 7 +- > drivers/accel/ivpu/ivpu_hw_mtl.c| 113 > +--- > drivers/accel/ivpu/ivpu_ipc.h | 2 +- > drivers/accel/ivpu/ivpu_job.c | 11 ++- > drivers/accel/ivpu/ivpu_pm.c| 17 - > drivers/accel/ivpu/ivpu_pm.h| 1 + > drivers/gpu/drm/drm_buddy.c | 4 +- > drivers/gpu/drm/nouveau/nouveau_backlight.c | 7 +- > drivers/gpu/drm/tests/drm_buddy_test.c | 3 +- > 10 files changed, 90 insertions(+), 93 deletions(-) > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-intel-fixes
On Thu, Mar 30, 2023 at 02:30:29PM +0300, Jani Nikula wrote: > > Hi Dave & Daniel - > > drm-intel-fixes-2023-03-30: > drm/i915 fixes for v6.3-rc5: > - Fix PMU support by reusing functions with sysfs > - Fix a number of issues related to color, PSR and arm/noarm > - Fix state check related to ICL PHY ownership check in TC-cold state > - Flush lmem contents after construction > - Fix hibernate oops related to DPT BO > - Fix perf stream error path wakeref balance > > BR, > Jani. > > The following changes since commit 197b6b60ae7bc51dd0814953c562833143b292aa: > > Linux 6.3-rc4 (2023-03-26 14:40:20 -0700) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2023-03-30 Pulled, thanks. > > for you to fetch changes up to 5c95b2d5d44fa250ce8aeee27bdb39b381d03857: > > drm/i915/perf: Drop wakeref on GuC RC error (2023-03-27 13:22:24 +0300) > > > drm/i915 fixes for v6.3-rc5: > - Fix PMU support by reusing functions with sysfs > - Fix a number of issues related to color, PSR and arm/noarm > - Fix state check related to ICL PHY ownership check in TC-cold state > - Flush lmem contents after construction > - Fix hibernate oops related to DPT BO > - Fix perf stream error path wakeref balance > > > Ashutosh Dixit (1): > drm/i915/pmu: Use functions common with sysfs to read actual freq > > Chris Wilson (2): > drm/i915/gem: Flush lmem contents after construction > drm/i915/perf: Drop wakeref on GuC RC error > > Imre Deak (1): > drm/i915/tc: Fix the ICL PHY ownership check in TC-cold state > > Ville Syrjälä (6): > drm/i915: Split icl_color_commit_noarm() from skl_color_commit_noarm() > drm/i915: Move CSC load back into .color_commit_arm() when PSR is > enabled on skl/glk > drm/i915: Add a .color_post_update() hook > drm/i915: Workaround ICL CSC_MODE sticky arming > drm/i915: Disable DC states for all commits > drm/i915/dpt: Treat the DPT BO as a framebuffer > > drivers/gpu/drm/i915/display/intel_color.c | 101 > ++- > drivers/gpu/drm/i915/display/intel_color.h | 1 + > drivers/gpu/drm/i915/display/intel_display.c | 31 ++- > drivers/gpu/drm/i915/display/intel_dpt.c | 2 + > drivers/gpu/drm/i915/display/intel_tc.c | 4 +- > drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 3 +- > drivers/gpu/drm/i915/gem/i915_gem_object.h | 2 +- > drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 3 + > drivers/gpu/drm/i915/gt/intel_rps.c | 38 + > drivers/gpu/drm/i915/gt/intel_rps.h | 4 +- > drivers/gpu/drm/i915/i915_perf.c | 14 ++-- > drivers/gpu/drm/i915/i915_perf_types.h | 6 ++ > drivers/gpu/drm/i915/i915_pmu.c | 10 +-- > 13 files changed, 177 insertions(+), 42 deletions(-) > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH] dim: Don't escape forward slash for grep
On Thu, Mar 30, 2023 at 11:49:50AM -0400, Rodrigo Vivi wrote: > On Thu, Mar 30, 2023 at 06:42:53PM +0300, Jani Nikula wrote: > > On Thu, 30 Mar 2023, Rodrigo Vivi wrote: > > > On Wed, Mar 29, 2023 at 10:53:53PM +0300, Ville Syrjälä wrote: > > >> On Wed, Feb 08, 2023 at 08:21:51AM -0500, Rodrigo Vivi wrote: > > >> > On Wed, Feb 08, 2023 at 03:32:43AM +0200, Ville Syrjala wrote: > > >> > > From: Ville Syrjälä > > >> > > > > >> > > GNU grep 3.8 started to complain about backslashes where > > >> > > they're not needed: > > >> > > grep: warning: stray \ before / > > >> > > Get rid of them. > > >> > > > > >> > > Signed-off-by: Ville Syrjälä > > >> > > --- > > >> > > dim | 6 +++--- > > >> > > 1 file changed, 3 insertions(+), 3 deletions(-) > > >> > > > > >> > > diff --git a/dim b/dim > > >> > > index b87b54259f8b..296feb9dd314 100755 > > >> > > --- a/dim > > >> > > +++ b/dim > > >> > > @@ -503,7 +503,7 @@ function dim_retip > > >> > > if repo_to_remote drm-tip &> /dev/null ; then > > >> > > new_upstream=$(repo_to_remote drm-tip)/drm-tip > > >> > > else > > >> > > -new_upstream=$(git branch -r | grep '\/drm-tip$') > > >> > > +new_upstream=$(git branch -r | grep '/drm-tip$') > > >> > > > >> > this I knew it would work... because of ' ' > > >> > > > >> > > fi > > >> > > upstream=$(git_find_tip "$branch") > > >> > > > > >> > > @@ -1124,12 +1124,12 @@ function check_diff_prefix > > >> > > local rv patch msg patch_recoded > > >> > > patch="$1" > > >> > > > > >> > > -rv=$(grep -q -E "^diff --git a\/.+ b\/.+$" $patch) > > >> > > +rv=$(grep -q -E "^diff --git a/.+ b/.+$" $patch) > > >> > > > >> > but here with " " > > >> > I had my doubts... but confirmed that it does work with previous > > >> > grep 3.7. > > >> > > > >> > I hope it doesn't go badly with older grep versions... > > >> > > > >> > with this hope > > >> > > > >> > Reviewed-by: Rodrigo Vivi > > >> > > >> I can't push this btw. -EPERM or something. > > > > > > per rules we need Jani's or Daniel's ack, then I can help on > > > pushing it... > > > > Acked-by: Jani Nikula > > thanks, pushed. Hm I thought that we've switched to "people with push rights can push"? Probably should. > > Daniel, is it time we switched the whole thing to merge request process > > btw? > > +1! Yeah can do. I think atm it's a bit max awkward since some is here and some is on gitlab ... Documentation patch I guess? -Daniel > > > > > BR, > > Jani. > > > > > > > > > > > >> > > >> > > > >> > > > >> > > if [ -z "$rv" ]; then > > >> > > msg=$(mktemp --tmpdir dim-msg.XX) > > >> > > patch_recoded=$(mktemp --tmpdir dim-patch.XX) > > >> > > git mailinfo "$msg" "$patch_recoded" < $patch >/dev/null > > >> > > -rv=$(grep -q -E "^diff --git a\/.+ b\/.+$" > > >> > > $patch_recoded) > > >> > > +rv=$(grep -q -E "^diff --git a/.+ b/.+$" $patch_recoded) > > >> > > rm "$msg" "$patch_recoded" > > >> > > fi > > >> > > > > >> > > -- > > >> > > 2.39.1 > > >> > > > > >> > > >> -- > > >> Ville Syrjälä > > >> Intel > > > > -- > > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH] dim: shut up git add harder
On Wed, 29 Mar 2023 at 16:21, Rodrigo Vivi wrote: > > On Wed, Mar 29, 2023 at 03:42:43PM +0200, Daniel Vetter wrote: > > On Tue, 28 Mar 2023 at 20:11, Rodrigo Vivi wrote: > > > > > > On Tue, Mar 28, 2023 at 07:36:44PM +0200, Daniel Vetter wrote: > > > > Apparently my git (v2.40.0) does more warnings and we're not silencing > > > > all the possible ones in the commit_rerere_cache function > > > > > > > > Signed-off-by: Daniel Vetter > > > > --- > > > > dim | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/dim b/dim > > > > index b87b54259f8b..c630d7295568 100755 > > > > --- a/dim > > > > +++ b/dim > > > > @@ -667,7 +667,7 @@ function commit_rerere_cache > > > > git rm $file &> /dev/null || true > > > > fi > > > > done > > > > - find rr-cache/ -mtime -1 -type f -not -name "thisimage*" -print0 > > > > | xargs -0 git add > /dev/null || true > > > > + find rr-cache/ -mtime -1 -type f -not -name "thisimage*" -print0 > > > > | xargs -0 git add &> /dev/null || true > > > > > > nothing we should be concerned with since they are marked as errors? > > > > > > also no possible true error that we would be now masking off? > > > > We already have the || true to eat any errors, and all other lines > > with git add || true do eat both stdou and stderr (at least in this > > function). So really seems like just an oversight. > > oh, indeed. > So, let's move with this then: > > Reviewed-by: Rodrigo Vivi Thanks, pushed. > > > > -Daniel > > > > > > > > > git rm rr-cache/rr-cache &> /dev/null || true > > > > > > > > commit_message=$(mktemp) > > > > -- > > > > 2.40.0 > > > > > > > > > > > > -- > > Daniel Vetter > > Software Engineer, Intel Corporation > > http://blog.ffwll.ch -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH] dim: shut up git add harder
On Tue, 28 Mar 2023 at 20:11, Rodrigo Vivi wrote: > > On Tue, Mar 28, 2023 at 07:36:44PM +0200, Daniel Vetter wrote: > > Apparently my git (v2.40.0) does more warnings and we're not silencing > > all the possible ones in the commit_rerere_cache function > > > > Signed-off-by: Daniel Vetter > > --- > > dim | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/dim b/dim > > index b87b54259f8b..c630d7295568 100755 > > --- a/dim > > +++ b/dim > > @@ -667,7 +667,7 @@ function commit_rerere_cache > > git rm $file &> /dev/null || true > > fi > > done > > - find rr-cache/ -mtime -1 -type f -not -name "thisimage*" -print0 | > > xargs -0 git add > /dev/null || true > > + find rr-cache/ -mtime -1 -type f -not -name "thisimage*" -print0 | > > xargs -0 git add &> /dev/null || true > > nothing we should be concerned with since they are marked as errors? > > also no possible true error that we would be now masking off? We already have the || true to eat any errors, and all other lines with git add || true do eat both stdou and stderr (at least in this function). So really seems like just an oversight. -Daniel > > > git rm rr-cache/rr-cache &> /dev/null || true > > > > commit_message=$(mktemp) > > -- > > 2.40.0 > > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
[PATCH] dim: shut up git add harder
Apparently my git (v2.40.0) does more warnings and we're not silencing all the possible ones in the commit_rerere_cache function Signed-off-by: Daniel Vetter --- dim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dim b/dim index b87b54259f8b..c630d7295568 100755 --- a/dim +++ b/dim @@ -667,7 +667,7 @@ function commit_rerere_cache git rm $file &> /dev/null || true fi done - find rr-cache/ -mtime -1 -type f -not -name "thisimage*" -print0 | xargs -0 git add > /dev/null || true + find rr-cache/ -mtime -1 -type f -not -name "thisimage*" -print0 | xargs -0 git add &> /dev/null || true git rm rr-cache/rr-cache &> /dev/null || true commit_message=$(mktemp) -- 2.40.0
Re: [PULL] drm-intel-next
ers/gpu/drm/i915/display/intel_opregion.h | 5 + > drivers/gpu/drm/i915/display/intel_psr.c | 299 > drivers/gpu/drm/i915/display/intel_psr.h | 3 + > drivers/gpu/drm/i915/display/intel_sprite.c| 183 - > drivers/gpu/drm/i915/display/intel_sprite_uapi.c | 127 > drivers/gpu/drm/i915/display/intel_sprite_uapi.h | 15 + > drivers/gpu/drm/i915/display/intel_tc.c| 322 ++-- > drivers/gpu/drm/i915/display/intel_tc.h| 5 +- > drivers/gpu/drm/i915/display/intel_vblank.c| 92 +++ > drivers/gpu/drm/i915/display/intel_vblank.h| 2 + > drivers/gpu/drm/i915/display/skl_universal_plane.c | 1 - > drivers/gpu/drm/i915/display/skl_watermark.c | 156 +++- > drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- > drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 2 + > .../drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c | 109 +++ > .../drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h | 61 ++ > drivers/gpu/drm/i915/i915_driver.c | 6 +- > drivers/gpu/drm/i915/i915_reg.h| 87 ++- > drivers/gpu/drm/i915/intel_gvt_mmio_table.c| 6 +- > drivers/misc/mei/hdcp/mei_hdcp.c | 105 ++- > drivers/misc/mei/hdcp/mei_hdcp.h | 354 - > include/drm/display/drm_dp.h | 3 + > include/drm/i915_hdcp_interface.h | 539 + > include/drm/i915_mei_hdcp_interface.h | 184 - > 58 files changed, 3322 insertions(+), 1467 deletions(-) > create mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_gsc.c > create mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_gsc.h > create mode 100644 drivers/gpu/drm/i915/display/intel_sprite_uapi.c > create mode 100644 drivers/gpu/drm/i915/display/intel_sprite_uapi.h > create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c > create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h > create mode 100644 include/drm/i915_hdcp_interface.h > delete mode 100644 include/drm/i915_mei_hdcp_interface.h -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-next
void > drm/bridge: imx8qxp-pixel-combiner: Convert to platform remove callback > returning void > drm/bridge: imx8qxp-pixel-link: Convert to platform remove callback > returning void > drm/bridge: imx8qxp-pxl2dpi: Convert to platform remove callback > returning void > drm/bridge: lvds-codec: Convert to platform remove callback returning > void > drm/bridge: nwl-dsi: Convert to platform remove callback returning void > drm/bridge: simple-bridg: Convert to platform remove callback returning > void > drm/bridge: dw-hdmi-ahb-audio: Convert to platform remove callback > returning void > drm/bridge: dw-hdmi-cec: Convert to platform remove callback returning > void > drm/bridge: dw-hdmi-gp-audio: Convert to platform remove callback > returning void > drm/bridge: dw-hdmi-i2s-audio: Convert to platform remove callback > returning void > drm/bridge: thc63lvd1024: Convert to platform remove callback returning > void > drm/bridge: ti-tfp410: Convert to platform remove callback returning > void > > Yang Li (2): > drm/arm/malidp: Use devm_platform_get_and_ioremap_resource() > drm/arm/hdlcd: Use devm_platform_ioremap_resource() > > Ye Xingchen (2): > drm/bridge: display-connector: Use dev_err_probe() > drm: bridge: simple-bridge: Use dev_err_probe() > > drivers/gpu/drm/arm/hdlcd_drv.c| 4 +- > drivers/gpu/drm/arm/malidp_drv.c | 3 +- > drivers/gpu/drm/bridge/adv7511/adv7533.c | 25 +- > drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c | 6 +- > drivers/gpu/drm/bridge/display-connector.c | 15 +- > drivers/gpu/drm/bridge/fsl-ldb.c | 6 +- > drivers/gpu/drm/bridge/imx/imx8qm-ldb-drv.c| 6 +- > drivers/gpu/drm/bridge/imx/imx8qxp-ldb-drv.c | 6 +- > .../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c| 6 +- > drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c| 6 +- > drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 6 +- > drivers/gpu/drm/bridge/lvds-codec.c| 6 +- > drivers/gpu/drm/bridge/nwl-dsi.c | 5 +- > drivers/gpu/drm/bridge/sii9234.c | 5 - > drivers/gpu/drm/bridge/simple-bridge.c | 14 +- > .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c| 6 +- > drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 6 +- > drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c | 6 +- > .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c| 6 +- > drivers/gpu/drm/bridge/thc63lvd1024.c | 6 +- > drivers/gpu/drm/bridge/ti-tfp410.c | 6 +- > drivers/gpu/drm/drm_connector.c| 2 +- > drivers/gpu/drm/drm_drv.c | 26 +- > drivers/gpu/drm/drm_fb_helper.c| 63 ++-- > drivers/gpu/drm/drm_fbdev_dma.c| 9 +- > drivers/gpu/drm/drm_fbdev_generic.c| 279 ++--- > drivers/gpu/drm/drm_prime.c| 4 +- > drivers/gpu/drm/gma500/Makefile| 1 + > drivers/gpu/drm/gma500/fbdev.c | 344 > + > drivers/gpu/drm/gma500/framebuffer.c | 341 +--- > drivers/gpu/drm/gma500/psb_drv.c | 5 +- > drivers/gpu/drm/gma500/psb_drv.h | 19 +- > drivers/gpu/drm/gma500/psb_irq.c | 11 - > drivers/gpu/drm/lima/lima_gem.c| 12 +- > drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c| 1 + > drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 11 +- > drivers/gpu/drm/tests/drm_format_helper_test.c | 141 ++--- > drivers/gpu/drm/tiny/bochs.c | 1 - > drivers/gpu/drm/ttm/ttm_bo.c | 3 +- > drivers/gpu/drm/vgem/vgem_drv.h| 11 - > drivers/gpu/drm/vmwgfx/vmwgfx_kms.c| 1 - > include/drm/drm_drv.h | 2 - > include/drm/drm_fb_helper.h| 14 +- > include/drm/drm_mode_config.h | 7 - > 44 files changed, 664 insertions(+), 799 deletions(-) > create mode 100644 drivers/gpu/drm/gma500/fbdev.c -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-intel-fixes
On Thu, Mar 23, 2023 at 12:46:27PM +0200, Jani Nikula wrote: > > Hi Dave & Daniel - > > Otherwise a fairly regular fixes pull, except for two things: > > First, I have not gotten CI results on this. I don't know what gives. > > Second, I missed adding the hwmon revert to the tag. I accidentally > picked up the commit for the previous pull, and it shouldn't have been > there. > > > BR, > Jani. > > > > drm-intel-fixes-2023-03-23: > drm/i915 fixes for v6.3-rc4: > - Fix an MTL workaround > - Fix fbdev obj locking before vma pin > - Fix state inheritance tracking in initial commit > - Fix missing GuC error capture codes > - Fix missing debug object activation > - Fix uc init late order relative to probe error injection > - Fix perf limit reasons formatting > - Fix vblank timestamp update on seamless M/N changes > > BR, > Jani. > > The following changes since commit e8d018dd0257f744ca50a729e3d042cf2ec9da65: > > Linux 6.3-rc3 (2023-03-19 13:27:55 -0700) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2023-03-23 Pulled, thanks. -Daniel > > for you to fetch changes up to 22aa20e4c5dcbe6fdc480eb4fb27039b1f43217f: > > Revert "drm/i915/hwmon: Enable PL1 power limit" (2023-03-20 12:31:01 +0200) > > > drm/i915 fixes for v6.3-rc4: > - Fix an MTL workaround > - Fix fbdev obj locking before vma pin > - Fix state inheritance tracking in initial commit > - Fix missing GuC error capture codes > - Fix missing debug object activation > - Fix uc init late order relative to probe error injection > - Fix perf limit reasons formatting > - Fix vblank timestamp update on seamless M/N changes > > > Andrzej Hajda (1): > drm/i915/gt: perform uc late init after probe error injection > > Ashutosh Dixit (1): > Revert "drm/i915/hwmon: Enable PL1 power limit" > > Badal Nilawar (1): > drm/i915/mtl: Disable MC6 for MTL A step > > John Harrison (1): > drm/i915/guc: Fix missing ecodes > > Nirmoy Das (1): > drm/i915/active: Fix missing debug object activation > > Radhakrishna Sripada (1): > drm/i915/mtl: Fix Wa_16015201720 implementation > > Tejas Upadhyay (1): > drm/i915/fbdev: lock the fbdev obj before vma pin > > Ville Syrjälä (2): > drm/i915: Preserve crtc_state->inherited during state clearing > drm/i915: Update vblank timestamping stuff on seamless M/N change > > Vinay Belgaumkar (1): > drm/i915: Fix format for perf_limit_reasons > > drivers/gpu/drm/i915/display/intel_crtc.c | 8 > drivers/gpu/drm/i915/display/intel_display.c | 1 + > drivers/gpu/drm/i915/display/intel_dmc.c | 26 - > drivers/gpu/drm/i915/display/intel_fbdev.c | 24 +-- > drivers/gpu/drm/i915/gt/intel_gt.c | 4 ++-- > drivers/gpu/drm/i915/gt/intel_gt_pm.c | 27 > -- > drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 2 +- > drivers/gpu/drm/i915/gt/intel_rc6.c| 8 > drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 22 + > drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c | 13 + > drivers/gpu/drm/i915/i915_active.c | 3 +-- > drivers/gpu/drm/i915/i915_hwmon.c | 5 - > drivers/gpu/drm/i915/i915_reg.h| 17 +--- > 13 files changed, 88 insertions(+), 72 deletions(-) > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-fixes
On Thu, Mar 23, 2023 at 09:24:01AM +0100, Thomas Zimmermann wrote: > Hi Dave and Daniel, > > here's the weekly PR for drm-misc-fixes. > > Best regards > Thomas > > drm-misc-fixes-2023-03-23: > Short summary of fixes pull: > > * fixes for bind and probing error handling > * panel-orientation fixes for Lenovo Book X90F > The following changes since commit 4028cbf867f70a3c599c9b0c9509334c56ed97d7: > > drm/meson: dw-hdmi: Fix devm_regulator_*get_enable*() conversion again > (2023-03-15 10:06:46 +0100) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2023-03-23 Pulled, thanks. -Daniel > > for you to fetch changes up to 1a70ca89d59c7c8af006d29b965a95ede0abb0da: > > drm/bridge: lt8912b: return EPROBE_DEFER if bridge is not found (2023-03-22 > 18:01:57 +0100) > > > Short summary of fixes pull: > > * fixes for bind and probing error handling > * panel-orientation fixes for Lenovo Book X90F > > > Hans de Goede (1): > drm: panel-orientation-quirks: Add quirk for Lenovo Yoga Book X90F > > Johan Hovold (1): > drm/meson: fix missing component unbind on bind errors > > Matheus Castello (1): > drm/bridge: lt8912b: return EPROBE_DEFER if bridge is not found > > drivers/gpu/drm/bridge/lontium-lt8912b.c | 4 ++-- > drivers/gpu/drm/drm_panel_orientation_quirks.c | 13 ++--- > drivers/gpu/drm/meson/meson_drv.c | 13 - > 3 files changed, 20 insertions(+), 10 deletions(-) > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-next
lete mode 100644 drivers/gpu/drm/mga/mga_drv.c > delete mode 100644 drivers/gpu/drm/mga/mga_drv.h > delete mode 100644 drivers/gpu/drm/mga/mga_ioc32.c > delete mode 100644 drivers/gpu/drm/mga/mga_irq.c > delete mode 100644 drivers/gpu/drm/mga/mga_state.c > delete mode 100644 drivers/gpu/drm/mga/mga_warp.c > delete mode 100644 drivers/gpu/drm/r128/Makefile > delete mode 100644 drivers/gpu/drm/r128/ati_pcigart.c > delete mode 100644 drivers/gpu/drm/r128/ati_pcigart.h > delete mode 100644 drivers/gpu/drm/r128/r128_cce.c > delete mode 100644 drivers/gpu/drm/r128/r128_drv.c > delete mode 100644 drivers/gpu/drm/r128/r128_drv.h > delete mode 100644 drivers/gpu/drm/r128/r128_ioc32.c > delete mode 100644 drivers/gpu/drm/r128/r128_irq.c > delete mode 100644 drivers/gpu/drm/r128/r128_state.c > delete mode 100644 drivers/gpu/drm/savage/Makefile > delete mode 100644 drivers/gpu/drm/savage/savage_bci.c > delete mode 100644 drivers/gpu/drm/savage/savage_drv.c > delete mode 100644 drivers/gpu/drm/savage/savage_drv.h > delete mode 100644 drivers/gpu/drm/savage/savage_state.c > delete mode 100644 drivers/gpu/drm/sis/Makefile > delete mode 100644 drivers/gpu/drm/sis/sis_drv.c > delete mode 100644 drivers/gpu/drm/sis/sis_drv.h > delete mode 100644 drivers/gpu/drm/sis/sis_mm.c > delete mode 100644 drivers/gpu/drm/tdfx/Makefile > delete mode 100644 drivers/gpu/drm/tdfx/tdfx_drv.c > delete mode 100644 drivers/gpu/drm/tdfx/tdfx_drv.h > delete mode 100644 drivers/gpu/drm/via/Makefile > delete mode 100644 drivers/gpu/drm/via/via_3d_reg.h > delete mode 100644 drivers/gpu/drm/via/via_dri1.c > delete mode 100644 include/uapi/drm/i810_drm.h > delete mode 100644 include/uapi/drm/mga_drm.h > delete mode 100644 include/uapi/drm/r128_drm.h > delete mode 100644 include/uapi/drm/savage_drm.h > delete mode 100644 include/uapi/drm/sis_drm.h > delete mode 100644 include/uapi/drm/via_drm.h > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-intel-gt-next
| 14 + > drivers/gpu/drm/i915/intel_runtime_pm.h| 2 +- > drivers/gpu/drm/i915/intel_uncore.c| 59 > drivers/gpu/drm/i915/intel_uncore.h| 13 + > drivers/gpu/drm/i915/pxp/intel_pxp.c | 128 ++-- > drivers/gpu/drm/i915/pxp/intel_pxp.h | 9 +- > drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c | 8 +- > .../gpu/drm/i915/pxp/intel_pxp_cmd_interface_cmn.h | 1 + > drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c | 36 ++- > drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.h | 4 +- > drivers/gpu/drm/i915/pxp/intel_pxp_huc.c | 11 +- > drivers/gpu/drm/i915/pxp/intel_pxp_irq.c | 18 +- > drivers/gpu/drm/i915/pxp/intel_pxp_pm.c| 6 +- > drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 10 +- > drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 35 ++- > drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 8 + > drivers/gpu/drm/i915/selftests/i915_gem.c | 2 + > drivers/gpu/drm/i915/selftests/i915_gem_evict.c| 4 +- > drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 + > drivers/gpu/drm/i915/selftests/i915_request.c | 20 +- > drivers/gpu/drm/i915/selftests/igt_spinner.c | 8 +- > drivers/gpu/drm/i915/selftests/scatterlist.c | 4 + > 129 files changed, 2778 insertions(+), 993 deletions(-) > create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_print.h > create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c > create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.h > create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c > create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.h -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-intel-fixes
On Thu, Jan 05, 2023 at 03:02:20PM -0500, Rodrigo Vivi wrote: > Hi Dave and Daniel, > > Only GVT related fixes for this round. > > I have another fix queued for i915_vma_unbind_async from Nirmoy that will > target stable 5.18, but I figured it out late so I didn't run CI on that yet. > So I'm holding this for now. Maybe and extra PR tomorrow or it will > wait for the next week. > > Here goes drm-intel-fixes-2023-01-05: > > Only gvt-fixes: > - debugfs fixes (Zhenyu) > - fix up for vgpu status (Zhi) > - double free fix in split_2MB_gtt_entry (Zheng) > > Thanks, > Rodrigo. > > The following changes since commit 88603b6dc419445847923fcb7fe5080067a30f98: > > Linux 6.2-rc2 (2023-01-01 13:53:16 -0800) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2023-01-05 Pulled, thanks a lot. -Daniel > > for you to fetch changes up to 87809d3196c2a7a015ab80ca1cb8c19b659bc5f6: > > Merge tag 'gvt-fixes-2023-01-05' of https://github.com/intel/gvt-linux into > drm-intel-fixes (2023-01-05 08:03:38 -0500) > > > Only gvt-fixes: > - debugfs fixes (Zhenyu) > - fix up for vgpu status (Zhi) > - double free fix in split_2MB_gtt_entry (Zheng) > > > Dan Carpenter (1): > drm/i915: unpin on error in intel_vgpu_shadow_mm_pin() > > Rodrigo Vivi (1): > Merge tag 'gvt-fixes-2023-01-05' of https://github.com/intel/gvt-linux > into drm-intel-fixes > > Zheng Wang (1): > drm/i915/gvt: fix double free bug in split_2MB_gtt_entry > > Zhenyu Wang (2): > drm/i915/gvt: fix gvt debugfs destroy > drm/i915/gvt: fix vgpu debugfs clean in remove > > Zhi Wang (1): > drm/i915/gvt: use atomic operations to change the vGPU status > > drivers/gpu/drm/i915/gvt/debugfs.c | 36 > +++- > drivers/gpu/drm/i915/gvt/dmabuf.c| 3 ++- > drivers/gpu/drm/i915/gvt/gtt.c | 21 +++-- > drivers/gpu/drm/i915/gvt/gvt.h | 15 ++- > drivers/gpu/drm/i915/gvt/interrupt.c | 2 +- > drivers/gpu/drm/i915/gvt/kvmgt.c | 35 +------ > drivers/gpu/drm/i915/gvt/scheduler.c | 4 +++- > drivers/gpu/drm/i915/gvt/vgpu.c | 12 +--- > 8 files changed, 80 insertions(+), 48 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-fixes
On Thu, Jan 05, 2023 at 08:49:09AM +0100, Maxime Ripard wrote: > Hi Dave, Daniel, > > Here's this week drm-misc-fixes PR > > Maxime > > drm-misc-fixes-2023-01-05: > Several fixes to fix the error path of dma_buf_export, add a missing > structure declaration resulting in a compiler warning, fix the GEM > handle refcounting in panfrost, fix a corrupted image with AFBC on > meson, a memleak in virtio, improper plane width for imx, and a lockup > in drm_sched_entity_kill() > The following changes since commit 88603b6dc419445847923fcb7fe5080067a30f98: > > Linux 6.2-rc2 (2023-01-01 13:53:16 -0800) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2023-01-05 > > for you to fetch changes up to 6949cfa42e10f2fdd2699ed4e34d9d4f392b: Pülled, danke vielmals. -Daniel > > drm/scheduler: Fix lockup in drm_sched_entity_kill() (2023-01-03 14:49:59 > +0300) > > > Several fixes to fix the error path of dma_buf_export, add a missing > structure declaration resulting in a compiler warning, fix the GEM > handle refcounting in panfrost, fix a corrupted image with AFBC on > meson, a memleak in virtio, improper plane width for imx, and a lockup > in drm_sched_entity_kill() > > > Carlo Caione (1): > drm/meson: Reduce the FIFO lines held when AFBC is not used > > Christian König (1): > dma-buf: fix dma_buf_export init order v2 > > Dmitry Osipenko (1): > drm/scheduler: Fix lockup in drm_sched_entity_kill() > > Ma Jun (1): > drm/plane-helper: Add the missing declaration of drm_atomic_state > > Maxime Ripard (1): > Merge drm/drm-fixes into drm-misc-fixes > > Philipp Zabel (1): > drm/imx: ipuv3-plane: Fix overlay plane width > > Steven Price (1): > drm/panfrost: Fix GEM handle creation ref-counting > > Xiu Jianfeng (1): > drm/virtio: Fix memory leak in virtio_gpu_object_create() > > drivers/dma-buf/dma-buf-sysfs-stats.c| 7 +-- > drivers/dma-buf/dma-buf-sysfs-stats.h| 4 +- > drivers/dma-buf/dma-buf.c| 82 > +++- > drivers/gpu/drm/imx/ipuv3-plane.c| 14 +++--- > drivers/gpu/drm/meson/meson_viu.c| 5 +- > drivers/gpu/drm/panfrost/panfrost_drv.c | 27 +++ > drivers/gpu/drm/panfrost/panfrost_gem.c | 16 +-- > drivers/gpu/drm/panfrost/panfrost_gem.h | 5 +- > drivers/gpu/drm/scheduler/sched_entity.c | 2 +- > drivers/gpu/drm/scheduler/sched_main.c | 4 +- > drivers/gpu/drm/virtio/virtgpu_object.c | 6 ++- > include/drm/drm_plane_helper.h | 1 + > 12 files changed, 80 insertions(+), 93 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-next
23 +-
> drivers/gpu/drm/vc4/vc4_hdmi_regs.h|4 +
> drivers/gpu/drm/vc4/vc4_hvs.c | 97 +-
> drivers/gpu/drm/vc4/vc4_kms.c | 138 +--
> drivers/gpu/drm/vc4/vc4_txp.c | 62 +-
> drivers/gpu/drm/vc4/vc4_v3d.c | 14 +-
> drivers/gpu/drm/vc4/vc4_vec.c | 361 +--
> drivers/gpu/drm/virtio/virtgpu_drv.h |3 +
> drivers/gpu/drm/virtio/virtgpu_trace.h | 26 +-
> drivers/gpu/drm/virtio/virtgpu_vq.c| 13 +-
> drivers/gpu/drm/vkms/vkms_drv.c| 27 +-
> drivers/gpu/drm/vkms/vkms_drv.h|4 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c |2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_drv.c|1 -
> drivers/gpu/drm/vmwgfx/vmwgfx_drv.h|4 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c|2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c|1 -
> drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c |1 -
> drivers/gpu/drm/vmwgfx/vmwgfx_system_manager.c |1 -
> drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c |1 -
> drivers/gpu/ipu-v3/ipu-common.c|1 +
> drivers/i2c/i2c-core-base.c| 14 +
> drivers/video/fbdev/core/fb_defio.c| 16 -
> include/drm/drm_atomic.h | 32 +-
> include/drm/drm_atomic_state_helper.h |4 +
> include/drm/drm_audio_component.h |3 +
> include/drm/drm_bridge.h | 36 +-
> include/drm/drm_connector.h| 82 +-
> include/drm/drm_debugfs.h | 41 +
> include/drm/drm_device.h | 15 +
> include/drm/drm_fb_helper.h|2 +
> include/drm/drm_gem.h |1 +
> include/drm/drm_gem_atomic_helper.h|2 -
> include/drm/drm_gem_ttm_helper.h |3 +-
> include/drm/drm_gem_vram_helper.h |4 +-
> include/drm/drm_kunit_helpers.h| 91 ++
> include/drm/drm_mipi_dbi.h | 43 +-
> include/drm/drm_mode_config.h | 12 +-
> include/drm/drm_modes.h| 17 +
> include/drm/drm_panel.h| 10 +
> include/drm/drm_plane.h|4 +-
> include/drm/drm_probe_helper.h |1 +
> include/drm/drm_simple_kms_helper.h|4 +-
> include/drm/ttm/{ttm_bo_api.h => ttm_bo.h} | 371 ---
> include/drm/ttm/ttm_bo_driver.h| 303 --
> include/drm/ttm/ttm_device.h |7 +-
> include/drm/ttm/ttm_execbuf_util.h |4 +-
> include/linux/dma-buf.h |4 +-
> include/linux/fb.h |3 +-
> include/linux/i2c.h|1 +
> include/uapi/linux/media-bus-format.h |5 +-
> 267 files changed, 7001 insertions(+), 2561 deletions(-)
> create mode 100644
> Documentation/devicetree/bindings/display/panel/focaltech,gpt3.yaml
> create mode 100644 drivers/gpu/drm/imx/ipuv3/Kconfig
> create mode 100644 drivers/gpu/drm/imx/ipuv3/Makefile
> rename drivers/gpu/drm/imx/{ => ipuv3}/dw_hdmi-imx.c (100%)
> rename drivers/gpu/drm/imx/{ => ipuv3}/imx-drm-core.c (100%)
> rename drivers/gpu/drm/imx/{ => ipuv3}/imx-drm.h (100%)
> rename drivers/gpu/drm/imx/{ => ipuv3}/imx-ldb.c (100%)
> rename drivers/gpu/drm/imx/{ => ipuv3}/imx-tve.c (100%)
> rename drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-crtc.c (100%)
> rename drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-plane.c (98%)
> rename drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-plane.h (100%)
> rename drivers/gpu/drm/imx/{ => ipuv3}/parallel-display.c (100%)
> create mode 100644 drivers/gpu/drm/panel/panel-orisetech-ota5601a.c
> create mode 100644 drivers/gpu/drm/tests/drm_connector_test.c
> delete mode 100644 drivers/gpu/drm/tests/drm_kunit_helpers.h
> create mode 100644 drivers/gpu/drm/tests/drm_managed_test.c
> create mode 100644 drivers/gpu/drm/tests/drm_modes_test.c
> create mode 100644 drivers/gpu/drm/tests/drm_probe_helper_test.c
> create mode 100644 drivers/gpu/drm/vc4/tests/.kunitconfig
> create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock.c
> create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock.h
> create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c
> create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock_output.c
> create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
> create mode 100644 drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
> create mode 100644 include/drm/drm_kunit_helpers.h
> rename include/drm/ttm/{ttm_bo_api.h => ttm_bo.h} (66%)
> delete mode 100644 include/drm/ttm/ttm_bo_driver.h
>
> --
> Thomas Zimmermann
> Graphics Driver Developer
> SUSE Software Solutions Germany GmbH
> Maxfeldstr. 5, 90409 Nürnberg, Germany
> (HRB 36809, AG Nürnberg)
> Geschäftsführer: Felix Imendörffer
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Re: [PATCH] dim: Consider fix-of-fix for -fixes cherry picking.
On Fri, Dec 30, 2022 at 12:03:02PM +, Vivi, Rodrigo wrote:
> On Fri, 2022-12-30 at 06:55 -0500, Rodrigo Vivi wrote:
> > In case a fix was not propagated yet to upstream, the
> > original commit sha won't be found hence the fix of this
> > fix will be missed during the cherry-pick.
> >
> > Since dim cherry-picks reliably adds the -x "(cherry picked
> > from" message, let's also grep in the log to see if that
> > was the case, before we give up and forget.
> >
> > Also, if that's the case, let's then fix the 'Fixes:' tag.
> >
> > v2: Actually replaces the 'Fixes:' tag, otherwise dim doesn't
> > allow us to push giving the following message:
> > "Fixes: SHA1 in not pointing at an ancestor:"
> > "dim: ERROR: issues in commits detected, aborting"
> >
> > v3: - Also consider fix of fixes in drm-intel-fixes besides
> > the drm-intel-next-fixes.
> > - Use intel_remote branches instead of local.
> > - And run the check unconditionally as suggested by Daniel.
> >
> > Signed-off-by: Rodrigo Vivi
> > ---
> > dim | 15 ++-
> > 1 file changed, 14 insertions(+), 1 deletion(-)
> >
> > diff --git a/dim b/dim
> > index b699108..b87b542 100755
> > --- a/dim
> > +++ b/dim
> > @@ -1481,10 +1481,15 @@ function cherry_pick_branch
> > if [[ "$(git merge-base $branch $fixes)" =
> > "$fixes" ]]; then
> > needed=1
> > fi
> > +
> > + fix_of_fix=$(git log --grep="cherry picked
> > from commit $fixes" --after=6months --format=format:%h
> > $intel_remote/drm-intel-next-fixes -1)
> > + if [[ -z "$fix_of_fix" ]]; then
> > + fix_of_fix=$(git log --grep="cherry
> > picked from commit $fixes" --after=6months --format=format:%h
> > $intel_remote/drm-intel-fixes -1)
> > + fi
> > done
> >
> > # Note: Cc: stable will overrule Fixes:
> > - if [[ -n "$have_fixes" && -z "$needed" ]]; then
> > + if [[ -n "$have_fixes" && -z "$needed" && -z
> > "$fix_of_fix" ]]; then
> > echo "Fixes a commit not in $branch. OK."
> > continue
> > fi
> > @@ -1495,6 +1500,14 @@ function cherry_pick_branch
> > echo "FAILED: $(dim_cite $commit)"
> > (dim_cite $commit) >> $fail_log
> > git cherry-pick --abort
> > + else
> > + if [[ "$fix_of_fix" ]]; then
> > + short_fixes_hash=$(git log -1 --
> > format=format:%h $fixes 2>/dev/null || true)
> > + git log -1 --pretty=%B | \
> > + sed -e :a -e
> > '/^\n*$/{$d;N;ba' -e '}' | \
> > + sed
> > "s/$short_fixes_hash/$fix_of_fix/g" | \
>
> Daniel, I did not ignored your comment. But I tried to replace the
> whole line but sed with single quote doesn't expand the variable nor
> dim_cite command and with double quote it fails because the fixes line
> has parentheses in it. Then bash doesn't accept nested substitution
> and things started to get really ugly there to replace the whole line
> that in the end it has absolutely no chance of changing.
>
> Replacing just the hash is safe and the cleanest option imho.
Occasionally shell scripting is a disappointment :-/
Acked-by: Daniel Vetter
>
> > + git commit --amend -F-
> > + fi
> > fi
> > done
> >
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Re: [PULL] drm-misc-next-fixes
On Tue, Jan 03, 2023 at 03:49:26PM +0100, Maxime Ripard wrote: > Hi Daniel, Dave, > > Here's the drm-misc-next-fixes leftovers. > > Maxime > > drm-misc-next-fixes-2023-01-03: > The drm-misc-next-fixes leftovers. It addresses a bug in drm/scheduler > ending up causing a lockup, and reduces the stack usage of some drm/mm > kunit tests. > The following changes since commit b02897e56b4e1fa6445be695ce5d605bb098435c: > > Revert "drm/fb-helper: Perform damage handling in deferred-I/O helper" > (2022-11-23 09:11:32 +0100) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc > tags/drm-misc-next-fixes-2023-01-03 Thanks, pulled. -Daniel > > for you to fetch changes up to 03dec92c4f788c54a7c01b40a018f601eb8a6c52: > > drm/scheduler: Fix lockup in drm_sched_entity_kill() (2023-01-02 17:45:18 > +0300) > > > The drm-misc-next-fixes leftovers. It addresses a bug in drm/scheduler > ending up causing a lockup, and reduces the stack usage of some drm/mm > kunit tests. > > > Arnd Bergmann (1): > drm/tests: reduce drm_mm_test stack usage > > Dmitry Osipenko (1): > drm/scheduler: Fix lockup in drm_sched_entity_kill() > > drivers/gpu/drm/scheduler/sched_entity.c | 2 +- > drivers/gpu/drm/scheduler/sched_main.c | 4 ++-- > drivers/gpu/drm/tests/Makefile | 2 ++ > drivers/gpu/drm/tests/drm_mm_test.c | 6 +++--- > 4 files changed, 8 insertions(+), 6 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-intel-fixes
On Fri, Dec 30, 2022 at 04:59:38AM -0500, Rodrigo Vivi wrote:
> Hi Dave and Daniel,
>
> Here goes the initial fixes for 6.2.
>
> The most critical ones seems to be the evict fix from Matt and
> the MIPI DSI from Jani. Both targeting stable trees.
>
> I'm sorry for sending this on a Friday and not on a Thursday as
> usual. Where did this week go? Worst case this wait one week
> and I get it rebased and resent earlier next week.
>
> Where did 2022 go? Happy New Year!
Cheers to you too!
> Cheers,
> Rodrigo.
>
>
> drm-intel-fixes-2022-12-30:
> - fix TLB invalidation for DG2 and newer platforms. (Andrzej)
> - Remove __maybe_unused from mtl_info (Lucas)
> - improve the catch-all evict to handle lock contention (Matt Auld)
> - Fix two issues with over-size (GuC/HuC) firmware files (John)
> - Fix DSI resume issues on ICL+ (Jani)
>
> Thanks,
> Rodrigo.
>
> The following changes since commit 1b929c02afd37871d5afb9d498426f83432e71c2:
>
> Linux 6.2-rc1 (2022-12-25 13:41:39 -0800)
>
> are available in the Git repository at:
>
> git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2022-12-30
Pulled, I'll try to get it out for Linus to include it in -rc2 still.
> for you to fetch changes up to 6217e9f05a74df48c77ee68993d587cdfdb1feb7:
>
> drm/i915/dsi: fix MIPI_BKLT_EN_1 native GPIO index (2022-12-30 04:28:46
> -0500)
>
>
> - fix TLB invalidation for DG2 and newer platforms. (Andrzej)
> - Remove __maybe_unused from mtl_info (Lucas)
> - improve the catch-all evict to handle lock contention (Matt Auld)
Just a quick comment, this one has
Fixes: 7e00897be8bf ("drm/i915: Add object locking to i915_gem_evict_for_node
and i915_gem_evict_something, v2.")
but I don't think that's entirely accurate. I might mix up some details
(and today is not the day to dig these out) and it's been two years
already when I discussed this Maarten, but this issue is older. It got
introduced with the conversion to per-object locking, and then somewhat
artfully papered over with the async object pinning infrastructure (which
had the design issue of being flat out in violation of upstream locking
hierarchy).
In practice it makes no difference, because there's no way you can
backport any of this to a point before the locking rework from Maarten (or
alternatively, revert until the glorious struct_mutex days). A bit more
review on a core locking change like this would have been good though imo.
Cheers, Daniel
> - Fix two issues with over-size (GuC/HuC) firmware files (John)
> - Fix DSI resume issues on ICL+ (Jani)
>
>
> Andrzej Hajda (1):
> drm/i915: fix TLB invalidation for Gen12.50 video and compute engines
>
> Jani Nikula (2):
> drm/i915/dsi: add support for ICL+ native MIPI GPIO sequence
> drm/i915/dsi: fix MIPI_BKLT_EN_1 native GPIO index
>
> John Harrison (1):
> drm/i915/uc: Fix two issues with over-size firmware files
>
> Lucas De Marchi (1):
> drm/i915: Remove __maybe_unused from mtl_info
>
> Matthew Auld (1):
> drm/i915: improve the catch-all evict to handle lock contention
>
> drivers/gpu/drm/i915/display/intel_dsi_vbt.c| 94
> -
> drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 59 +---
> drivers/gpu/drm/i915/gem/i915_gem_mman.c| 2 +-
> drivers/gpu/drm/i915/gt/intel_gt.c | 8 ++-
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c| 42 +++
> drivers/gpu/drm/i915/i915_gem_evict.c | 37 +++---
> drivers/gpu/drm/i915/i915_gem_evict.h | 4 +-
> drivers/gpu/drm/i915/i915_irq.c | 3 +
> drivers/gpu/drm/i915/i915_pci.c | 1 -
> drivers/gpu/drm/i915/i915_reg.h | 1 +
> drivers/gpu/drm/i915/i915_vma.c | 2 +-
> drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 4 +-
> 12 files changed, 212 insertions(+), 45 deletions(-)
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Re: [PULL] drm-misc-fixes
On Wed, 30 Nov 2022 at 14:43, Maxime Ripard wrote: > > Hi Maarten > > On Wed, Nov 30, 2022 at 02:16:05PM +0100, Maarten Lankhorst wrote: > > A single fix to vmwgfx mks-guest-stats ioctl. > > I lost my internet connection when pushing the tag, so I put together this > > mail > > manually. I hope you remember where drm-misc is hosted. :) > > For reference, you can generate the mail content after the fact by using > something like: > > git request-pull drm/fixes drm-misc drm-misc-fixes-2022-11-30 Maarten, can you pls do that? Otherwise we can't feed the thing into dim for processing, and have to do that also manually :-) -Daniel > > Maxime -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [MAINTAINER TOOLS] docs: updated rules for topic/core-for-CI commit management
On Tue, Nov 22, 2022 at 03:17:14PM +0200, Jani Nikula wrote: > Introduce stricter rules for topic/core-for-CI management. Way too many > commits have been added over the years, with insufficient rationale > recorded in the commit message, and insufficient follow-up with removing > the commits from the topic branch. > > New rules: > > 1. Require maintainer ack for rebase. Have better gating on when rebases >happen and on which baselines. > > 2. Require maintainer/committer ack for adding/removing commits. No >single individual should decide. > > 3. Require gitlab issues for new commits added. Improve tracking for >removing the commits. > > Also use the stronger "must" for commit message requiring the > justification for the commit being in topic/core-for-CI. > > Cc: Joonas Lahtinen > Cc: Rodrigo Vivi > Cc: Tvrtko Ursulin > Cc: David Airlie > Cc: Daniel Vetter > Cc: intel-...@lists.freedesktop.org > Cc: dri-de...@lists.freedesktop.org > Cc: dim-tools@lists.freedesktop.org > Signed-off-by: Jani Nikula Reviewed-by: Daniel Vetter > --- > drm-tip.rst | 27 --- > 1 file changed, 20 insertions(+), 7 deletions(-) > > diff --git a/drm-tip.rst b/drm-tip.rst > index deae95cdd2fe..24036e2ef576 100644 > --- a/drm-tip.rst > +++ b/drm-tip.rst > @@ -203,11 +203,13 @@ justified exception. The primary goal is to fix issues > originating from Linus' > tree. Issues that would need drm-next or other DRM subsystem tree as baseline > should be fixed in the offending DRM subsystem tree. > > -Only rebase the branch if you really know what you're doing. When in doubt, > ask > -the maintainers. You'll need to be able to handle any conflicts in non-drm > code > -while rebasing. > +Only rebase the branch if you really know what you're doing. You'll need to > be > +able to handle any conflicts in non-drm code while rebasing. > > -Simply drop fixes that are already available in the new baseline. > +Always ask for maintainer ack before rebasing. IRC ack is sufficient. > + > +Simply drop fixes that are already available in the new baseline. Close the > +associated gitlab issue when removing commits. > > Force pushing a rebased topic/core-for-CI requires passing the ``--force`` > parameter to git:: > @@ -225,11 +227,22 @@ judgement call. > Only add or remove commits if you really know what you're doing. When in > doubt, > ask the maintainers. > > -Apply new commits on top with regular push. The commit message needs to > explain > -why the patch has been applied to topic/core-for-CI. If it's a cherry-pick > from > +Always ask for maintainer/committer ack before adding/removing commits. IRC > ack > +is sufficient. Record the ``Acked-by:`` in commits being added. > + > +Apply new commits on top with regular push. The commit message must explain > why > +the patch has been applied to topic/core-for-CI. If it's a cherry-pick from > another subsystem, please reference the commit with ``git cherry-pick -x`` > option. If it's a patch from another subsystem, please reference the patch on > the mailing list with ``Link:`` tag. > > +New commits always need an associated gitlab issue for tracking purposes. The > +goal is to have as few commits in topic/core-for-CI as possible, and we need > to > +be able to track the progress in making that happen. Reference the issue with > +``References:`` tag. Add the ``core-for-CI`` label to the issue. (Note: Do > not > +use ``Closes:`` because the logic here is backwards; the issue is having the > +commit in the branch in the first place.) > + > Instead of applying reverts, just remove the commit. This implies ``git > rebase > --i`` on the current baseline; see directions above. > +-i`` on the current baseline; see directions above. Close the associated > gitlab > +issue when removing commits. > -- > 2.34.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH] dim: Consider fix-of-fix for -fixes cherry picking.
On Mon, Aug 08, 2022 at 03:00:02PM -0400, Rodrigo Vivi wrote:
> In case a fix was not propagated yet to upstream, the
> original commit sha won't be found hence the fix of this
> fix will be missed during the cherry-pick.
>
> Since dim cherry-picks reliably adds the -x "(cherry picked
> from" message, let's also grep in the log to see if that
> was the case, before we give up and forget.
>
> Also, if that's the case, let's then fix the 'Fixes:' tag.
>
> v2: Actually replaces the 'Fixes:' tag, otherwise dim doesn't
> allow us to push giving the following message:
> "Fixes: SHA1 in not pointing at an ancestor:"
> "dim: ERROR: issues in commits detected, aborting"
>
> Signed-off-by: Rodrigo Vivi
> ---
> dim | 16 ++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/dim b/dim
> index 4b43bf8..33caaf6 100755
> --- a/dim
> +++ b/dim
> @@ -1485,8 +1485,13 @@ function cherry_pick_branch
>
> # Note: Cc: stable will overrule Fixes:
> if [[ -n "$have_fixes" && -z "$needed" ]]; then
> - echo "Fixes a commit not in $branch. OK."
> - continue
> +
> + fixes=$(git log -1 --format=format:%h $fixes
> 2>/dev/null || true)
> + fix_of_fix=$(git log --grep="cherry picked from commit
> $fixes" --after=6months --format=format:%h drm-intel-next-fixes -1)
> + if [[ -z "$fix_of_fix" ]]; then
> + echo "Fixes a commit not in $branch. OK."
> + continue
> + fi
This hunk has my Reviewed-by: Daniel Vetter
> fi
>
> echo "Try to cherry-pick."
> @@ -1495,6 +1500,13 @@ function cherry_pick_branch
> echo "FAILED: $(dim_cite $commit)"
> (dim_cite $commit) >> $fail_log
> git cherry-pick --abort
> + else
> + if [[ "$fix_of_fix" ]]; then
> + git log -1 --pretty=%B | \
> + sed -e :a -e '/^\n*$/{$d;N;ba' -e '}' |
> \
> + sed "s/$fixes/$fix_of_fix/g" | \
Maybe I'm not reading the shell magic here correctly, but I think this
only replaces the sha, not the commit subject we append in ("") after them
usually. So you'll still have some wrong citations in here I think.
Also I'm wondering whether instead it wouldn't be better to patch up dim
to look at the other history when the commit contains a "cherry picked
from $sha1" line unconditionally? Since we have other cases than dim
cherry-pick where cherry-picking happens ...
Cheers, Daniel
> + git commit --amend -F-
> + fi
> fi
> done
>
> --
> 2.37.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Re: [PATCH] doc: Mention dim cherry-pick command in getting started page
On Thu, Jul 07, 2022 at 11:11:40PM +0200, Javier Martinez Canillas wrote: > On 7/7/22 23:08, Rodrigo Vivi wrote: > > On Thu, Jul 07, 2022 at 10:07:12PM +0200, Javier Martinez Canillas wrote: > > [snip] > > >> I see the content of that page as a dim workflow summary and that's why I > >> think that cherry-pick should be part of it (just like you have checkout, > >> apply, push, etc). After all, applying from the list and cherry-picking > >> are the two operations that most developers are going to do with dim. > >> > >> But if the agreement is that this shouldn't be in that page, I can move it > >> somewhere else. > > > > I actually don't have strong preferences on the place... With Daniel and > > Jani > > on vacation I will merge this right now and we can always move things later. > > > > Sounds good to me. Thanks! > > > Better to have this info there than nowhere. Thanks for the patch! > > > > Sure, I'll be happy to post a follow-up patch if they prefer to have it > in another page. Yeah it might be good to move this into the drm-misc committer guidelines, maybe right after the "where should I push my patch" section in case you screwed up :-) Since for drm-intel it's a maintainer thing to do any and all cherry-picks, to avoid these mistakes (but then drm-intel maintainers are paid and not just volunteers). -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-next
On Thu, Jun 23, 2022 at 11:56:56AM +0300, Jani Nikula wrote: > On Thu, 23 Jun 2022, Thomas Zimmermann wrote: > > Hi > > > > Am 23.06.22 um 10:26 schrieb Jani Nikula: > >> On Thu, 23 Jun 2022, Thomas Zimmermann wrote: > >>> I forgot to mention that we backmerged v5.19-rc2. That's why the list of > >>> changed files is so long. > >> > >> I thought we should only backmerge Linus' tree via backmerging drm-next, > >> which avoids this problem altogether. > > > > I did backmerge via drm-next. > > Then I'm confused how it all shows up the the diffstat. If you backmerge > drm-next to drm-misc-next, and then generate your drm-misc-next pull > request against drm-next (dim pull-request drm-misc-next drm/drm-next), > I don't think it should show up. git is shit (tm) The git commit list will look reasonable, but the diff will make a complete mess out of non-linear history. I think it's this case here too. I think the way to fix it is to do a manual test merge and then to a diff against the first parent (assuming you did the test merge forward, not backwards). Without the test merge git tries to do some kind of multi-way diffstat. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-next
pu/drm/bridge/tc358767.c | 169 ++- > drivers/gpu/drm/bridge/ti-dlpc3433.c | 417 +++ > drivers/gpu/drm/bridge/ti-sn65dsi83.c |2 +- > drivers/gpu/drm/display/drm_dp_aux_bus.c | 211 ++-- > drivers/gpu/drm/drm_bridge.c | 23 + > drivers/gpu/drm/drm_client_modeset.c | 28 +- > drivers/gpu/drm/drm_debugfs.c | 21 + > drivers/gpu/drm/drm_displayid.c| 16 +- > drivers/gpu/drm/drm_edid.c | 1272 > > drivers/gpu/drm/drm_encoder.c |2 +- > drivers/gpu/drm/drm_gem_atomic_helper.c|6 +- > drivers/gpu/drm/drm_gem_framebuffer_helper.c | 104 +- > drivers/gpu/drm/drm_gem_vram_helper.c | 54 +- > drivers/gpu/drm/drm_mipi_dbi.c |7 + > drivers/gpu/drm/drm_modes.c|4 + > drivers/gpu/drm/drm_probe_helper.c | 178 ++- > drivers/gpu/drm/drm_syncobj.c | 57 +- > drivers/gpu/drm/gma500/cdv_intel_crt.c | 47 +- > drivers/gpu/drm/gma500/cdv_intel_hdmi.c| 98 +- > drivers/gpu/drm/gma500/cdv_intel_lvds.c| 80 +- > drivers/gpu/drm/gma500/intel_i2c.c | 36 +- > drivers/gpu/drm/gma500/oaktrail_lvds.c | 50 +- > drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 36 +- > drivers/gpu/drm/gma500/psb_drv.h |2 +- > drivers/gpu/drm/gma500/psb_intel_drv.h | 24 +- > drivers/gpu/drm/gma500/psb_intel_lvds.c| 86 +- > drivers/gpu/drm/hyperv/hyperv_drm_drv.c| 74 +- > .../gpu/drm/i915/display/intel_display_debugfs.c | 28 + > drivers/gpu/drm/meson/meson_encoder_cvbs.c |1 + > drivers/gpu/drm/meson/meson_encoder_hdmi.c | 27 +- > drivers/gpu/drm/mgag200/Makefile | 14 +- > drivers/gpu/drm/mgag200/mgag200_drv.c | 386 +++--- > drivers/gpu/drm/mgag200/mgag200_drv.h | 148 ++- > drivers/gpu/drm/mgag200/mgag200_g200.c | 200 +++ > drivers/gpu/drm/mgag200/mgag200_g200eh.c | 50 + > drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 51 + > drivers/gpu/drm/mgag200/mgag200_g200er.c | 46 + > drivers/gpu/drm/mgag200/mgag200_g200ev.c | 50 + > drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 60 + > drivers/gpu/drm/mgag200/mgag200_g200se.c | 130 ++ > drivers/gpu/drm/mgag200/mgag200_g200wb.c | 50 + > drivers/gpu/drm/mgag200/mgag200_i2c.c | 59 +- > drivers/gpu/drm/mgag200/mgag200_mm.c | 116 -- > drivers/gpu/drm/mgag200/mgag200_mode.c | 453 --- > drivers/gpu/drm/mgag200/mgag200_pll.c | 12 +- > drivers/gpu/drm/mgag200/mgag200_reg.h |2 + > drivers/gpu/drm/nouveau/nouveau_fbcon.c|2 + > drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 14 +- > drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c |2 +- > drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c |4 +- > drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c|2 +- > drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c |2 +- > drivers/gpu/drm/panel/Kconfig |2 + > .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c |2 +- > drivers/gpu/drm/panfrost/panfrost_device.c |9 +- > drivers/gpu/drm/panfrost/panfrost_drv.c|1 + > drivers/gpu/drm/panfrost/panfrost_features.h | 13 + > drivers/gpu/drm/panfrost/panfrost_gpu.c| 18 +- > drivers/gpu/drm/panfrost/panfrost_issues.h | 19 +- > drivers/gpu/drm/panfrost/panfrost_regs.h |1 + > drivers/gpu/drm/r128/r128_drv.h|4 +- > drivers/gpu/drm/rockchip/Kconfig |4 +- > drivers/gpu/drm/rockchip/rockchip_drm_vop2.c |5 +- > drivers/gpu/drm/scheduler/sched_entity.c |6 +- > drivers/gpu/drm/solomon/ssd130x-spi.c |2 + > drivers/gpu/drm/tiny/st7735r.c |1 + > drivers/gpu/drm/ttm/ttm_bo.c |9 +- > drivers/gpu/drm/udl/udl_connector.c|2 +- > drivers/gpu/drm/vkms/vkms_composer.c |2 +- > drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 10 +- > drivers/video/fbdev/Kconfig|2 +- > drivers/video/fbdev/core/fbmem.c | 22 +- > include/drm/display/drm_dp_aux_bus.h | 34 +- > include/drm/display/drm_dp_helper.h| 16 +- > include/drm/drm_bridge.h |1 + > include/drm/drm_displayid.h|6 +- > include/drm/drm_edid.h | 27 +- > include/drm/drm_gem_framebuffer_helper.h | 10 +- > include/drm/drm_probe_helper.h |2 + > include/drm/gpu_scheduler.h|4 +- > include/linux/dma-fence-unwrap.h | 82 +- > include/linux/fb.h |1 - > 111 files changed, 4032 insertions(+), 2286 deletions(-) > create mode 100644 > Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml > create mode 100644 drivers/dma-buf/dma-fence-unwrap.c > create mode 100644 drivers/gpu/drm/bridge/ti-dlpc3433.c > create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200.c > create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200eh.c > create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200eh3.c > create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200er.c > create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200ev.c > create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200ew3.c > create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200se.c > create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200wb.c > delete mode 100644 drivers/gpu/drm/mgag200/mgag200_mm.c > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH] drm-misc: Another check in the bugfix flow
On Tue, May 24, 2022 at 06:16:11PM +0200, Marek Vasut wrote: > On 5/24/22 17:17, Daniel Vetter wrote: > > Even in feature freeze it can happen that the broken patch is only in > > drm-misc-next, and then applying to drm-misc-next-fixes will > > rightfully stumble over dim's Fixes: validation since the sha1 wont be > > an ancestor. > > > > Fix that by adding another check. > > > > v2: Less confusing wording (Marek) > > > > Cc: Marek Vasut > > Signed-off-by: Daniel Vetter > > Reviewed-by: Marek Vasut Thanks for your review, patch pushed. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
[PATCH] drm-misc: Another check in the bugfix flow
Even in feature freeze it can happen that the broken patch is only in
drm-misc-next, and then applying to drm-misc-next-fixes will
rightfully stumble over dim's Fixes: validation since the sha1 wont be
an ancestor.
Fix that by adding another check.
v2: Less confusing wording (Marek)
Cc: Marek Vasut
Signed-off-by: Daniel Vetter
---
drm-misc-commit-flow.dot | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drm-misc-commit-flow.dot b/drm-misc-commit-flow.dot
index 04afab6f4074..f1062d2ff8a8 100644
--- a/drm-misc-commit-flow.dot
+++ b/drm-misc-commit-flow.dot
@@ -1,6 +1,7 @@
digraph {
next_0[shape=box, style=rounded, color=blue, label="drm-misc-next"];
next_1[shape=box, style=rounded, color=blue, label="drm-misc-next"];
+ next_2[shape=box, style=rounded, color=blue, label="drm-misc-next"];
fixes_0[shape=box, style=rounded, color=blue, label="drm-misc-fixes"];
next_fixes_0[shape=box, style=rounded, color=blue,
label="drm-misc-next-fixes"];
@@ -10,6 +11,8 @@ digraph {
label="Is the bug in the current rc?"];
is_late[shape=diamond, color=red,
label="Is drm in feature freeze?\n(occurs after -rc6)"];
+ is_next[shape=diamond, color=red,
+ label="Is the bug both in drm-next\nand in drm-misc-next?"];
is_fix -> next_0[label="no"];
is_fix -> in_origin[label="yes"];
@@ -18,5 +21,8 @@ digraph {
in_origin -> is_late[label="no"];
is_late -> next_1[label="no"]
- is_late -> next_fixes_0[label="yes"]
+ is_late -> is_next[label="yes"]
+
+ is_next -> next_2[label="no"]
+ is_next -> next_fixes_0[label="yes"]
}
--
2.36.0
[PATCH] drm-misc: Another check in the bugfix flow
Even in feature freeze it can happen that the broken patch is only in
drm-misc-next, and then applying to drm-misc-next-fixes will
rightfully stumble over dim's Fixes: validation since the sha1 wont be
an ancestor.
Fix that by adding another check.
Cc: Marek Vasut
Signed-off-by: Daniel Vetter
---
drm-misc-commit-flow.dot | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drm-misc-commit-flow.dot b/drm-misc-commit-flow.dot
index 04afab6f4074..c2740b76b5b9 100644
--- a/drm-misc-commit-flow.dot
+++ b/drm-misc-commit-flow.dot
@@ -1,6 +1,7 @@
digraph {
next_0[shape=box, style=rounded, color=blue, label="drm-misc-next"];
next_1[shape=box, style=rounded, color=blue, label="drm-misc-next"];
+ next_2[shape=box, style=rounded, color=blue, label="drm-misc-next"];
fixes_0[shape=box, style=rounded, color=blue, label="drm-misc-fixes"];
next_fixes_0[shape=box, style=rounded, color=blue,
label="drm-misc-next-fixes"];
@@ -10,6 +11,8 @@ digraph {
label="Is the bug in the current rc?"];
is_late[shape=diamond, color=red,
label="Is drm in feature freeze?\n(occurs after -rc6)"];
+ is_next[shape=diamond, color=red,
+ label="Is the bug in drm-next\nand not only in drm-misc-next?"];
is_fix -> next_0[label="no"];
is_fix -> in_origin[label="yes"];
@@ -18,5 +21,8 @@ digraph {
in_origin -> is_late[label="no"];
is_late -> next_1[label="no"]
- is_late -> next_fixes_0[label="yes"]
+ is_late -> is_next[label="yes"]
+
+ is_next -> next_2[label="no"]
+ is_next -> next_fixes_0[label="yes"]
}
--
2.36.0
Re: [PATCH v2] dim: Check that patches have git-format-patch default prefixes
On Sat, Jan 15, 2022 at 12:33:29PM +0100, Javier Martinez Canillas wrote:
> By default the git-format-patch command generates patches with prefixes
> for the source and destination (-p1), and is also what git-am uses as a
> default. The command strips the first leading path component when patch
> is applied (unless a different -p argument is used).
>
> But the patch generating behaviour can be changed with git-format-patch
> --no-prefix argument (or setting 'diff.noprefix = true' in .gitconfig).
>
> Patches with no source and destination prefixes can confuse the git-am
> 3-way merge logic, since stripping the first path component will lead
> to wrong paths for newly added files.
>
> To avoid this, check that patches to apply are using git-format-patch's
> defaults prefixes to make sure that git-am defaults are safe to use too.
>
> Since there are developers that generate patches without using git, make
> this an error but allow to still continue when using the dim -f option.
>
> Signed-off-by: Javier Martinez Canillas
> ---
>
> Changes in v2:
> - Use warn_or_fail instead of always making this an error (Daniel).
Pushed, thanks for respinning.
-Daniel
>
> dim | 17 +
> 1 file changed, 17 insertions(+)
>
> diff --git a/dim b/dim
> index fb0dce98fb5c..1193fe056bce 100755
> --- a/dim
> +++ b/dim
> @@ -1113,6 +1113,18 @@ function check_merge_baseline
> fi
> }
>
> +# ensure the patch has prefixes (-p1), since otherwise it can confuse the
> git am
> +# 3-way merge logic. check the default source (a/) and destination (b/)
> prefixes.
> +function check_diff_prefix
> +{
> + local rv
> + patch="$1"
> +
> + rv=$(grep -q -E "^diff --git a\/.+ b\/.+$" $patch)
> +
> + return $rv
> +}
> +
> # ensure we're on branch $1, and apply patches. the rest of the arguments are
> # passed to git am.
> dim_alias_ab=apply-branch
> @@ -1139,6 +1151,11 @@ function dim_apply_branch
> git mailsplit -b -o$dir $file > /dev/null
>
> for patch in "$dir"/*; do
> +
> + if ! check_diff_prefix "$patch"; then
> + warn_or_fail "Patch does not contain prefixes in its
> diff and can confuse git-am when applying"
> + fi
> +
> if ! apply_patch $patch "$@"; then
> rv=1
> fi
> --
> 2.33.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Re: [PATCH 1/2] dim: Caution more against topic branches
On Thu, Nov 25, 2021 at 12:21:45PM +0100, Maarten Lankhorst wrote: > On 25-11-2021 12:19, Daniel Vetter wrote: > > They're very often just beaurocratic paperwork pushing because > > maintainers refuse to give acks for merging patches through a single > > tree. I guess the snarky intro wasn't clear enough, so elaborate. > > > > Given that we don't even talk about topic branches anywhere else in > > the docs hopefully this makes things a bit clearer. > > > > Cc: Jani Nikula > > Cc: Joonas Lahtinen > > Cc: Tvrtko Ursulin > > Cc: Rodrigo Vivi > > Cc: Lyude Paul > > Cc: Thomas Zimmermann > > Cc: Maarten Lankhorst > > Cc: Maxime Ripard > > Signed-off-by: Daniel Vetter > > --- > > dim.rst | 10 +++--- > > 1 file changed, 7 insertions(+), 3 deletions(-) > > > > diff --git a/dim.rst b/dim.rst > > index 60c688d6c027..41d9f0e808b2 100644 > > --- a/dim.rst > > +++ b/dim.rst > > @@ -475,9 +475,13 @@ EXAMPLES > > > > Cross-subsystem topic branches > > -- > > -So you want to send a pull request to another subsystem? Maintainers will > > likely > > -get cranky if you ask them to pull a swath of unrelated drm patches, so > > we'll > > -use a topic branch based upon Linus' tree with only the relevant patches. > > +So you want to send a pull request to another subsystem? Frist, you don't > > want, > > Frist! > > > Otherwise looks good. For both: > > Reviewed-by: Maarten Lankhorst Typo fixed and finally pushed, thanks a lot for taking a look. -Daniel > > > +it's much simpler to get Acks for merging through a single tree and then > > maybe > > +later on backmerge. But if it cannot be avoided, read on. > > + > > +Maintainers will likely get cranky if you ask them to pull a swath of > > unrelated > > +drm patches, so we'll use a topic branch based upon Linus' tree with only > > the > > +relevant patches. > > > > First select a suitable *baseline* for your topic branch. For topic > > branches shared within the gpu/drm subsystem, base it on the latest > > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
[PULL] drm-next (merge window fixes really)
Hi Linus, drm-next-2022-01-14: drm fixes for 5.17-rc1: drivers fixes: - i915 fixes for ttm backend + one pm wakelock fix - amdgpu fixes, fairly big pile of small things all over. Note this doesn't yet containe the fixed version of the otg sync patch that blew up - small driver fixes: meson, sun4i, vga16fb probe fix drm core fixes: - cma-buf heap locking - ttm compilation - self refresh helper state check - wrong error message in atomic helpers - mipi-dbi buffer mapping Note there's some conflicts: - One of the pulls was based on previous release, so I had to redo your merge (since I really didn't want to roll forward to a random point in the merge window). I tried to pick your exact solution to prevent further merge conflict lolz. - amgpu has some conflicts, you should be fine by just going with the version in this pull. Alex tested that what I have in our shared rerere/integration tree, if you want to fetch that: git://anongit.freedesktop.org/drm/drm-tip drm-tip I also wasted some time chasing a arm32 bad udelay compile issue until I realized it's not a regression in this set but been there already, hence why this pull is a bit late. Alex is looking into that one. Next week's drm pull is back to Dave. Cheers, Daniel The following changes since commit cb6846fbb83b574c85c2a80211b402a6347b60b1: Merge tag 'amd-drm-next-5.17-2021-12-30' of ssh://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-12-31 10:59:17 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-next-2022-01-14 for you to fetch changes up to 4efdddbce7c1329f00c458e85dcaf105aebdc0ed: Merge tag 'amd-drm-next-5.17-2022-01-12' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2022-01-14 15:42:28 +0100) drm fixes for 5.17-rc1: drivers fixes: - i915 fixes for ttm backend + one pm wakelock fix - amdgpu fixes, fairly big pile of small things all over. Note this doesn't yet containe the fixed version of the otg sync patch that blew up - small driver fixes: meson, sun4i, vga16fb probe fix drm core fixes: - cma-buf heap locking - ttm compilation - self refresh helper state check - wrong error message in atomic helpers - mipi-dbi buffer mapping Alexander Stein (2): dt-bindings: display: meson-vpu: Add missing amlogic,canvas property dt-bindings: display: meson-dw-hdmi: add missing sound-name-prefix property Charlene Liu (1): drm/amd/display: Add check for forced_clocks debug option Claudio Suarez (1): drm: fix error found in some cases after the patch d1af5cd86997 Daniel Vetter (5): Merge tag 'drm-intel-next-fixes-2022-01-13' of git://anongit.freedesktop.org/drm/drm-intel into drm-next Merge tag 'drm-misc-next-fixes-2022-01-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-next Merge tag 'drm-misc-fixes-2022-01-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next Merge tag 'drm-misc-next-fixes-2022-01-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next Merge tag 'amd-drm-next-5.17-2022-01-12' of https://gitlab.freedesktop.org/agd5f/linux into drm-next Evan Quan (1): drm/amd/pm: keep the BACO feature enabled for suspend Felix Kuehling (3): drm/amdkfd: Use prange->list head for insert_list drm/amdkfd: Use prange->update_list head for remove_list drm/amdkfd: Fix DQM asserts on Hawaii Greg Kroah-Hartman (2): drm/amdgpu: use default_groups in kobj_type drm/amdkfd: use default_groups in kobj_type Guchun Chen (1): drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt Harry Wentland (1): drm/amdgpu: Use correct VIEWPORT_DIMENSION for DCN2 James Yao (1): drm/amdgpu: add dummy event6 for vega10 Javier Martinez Canillas (1): video: vga16fb: Only probe for EGA and VGA 16 color graphic cards Jiasheng Jiang (1): drm/amdkfd: Check for null pointer after calling kmemdup Jiawei Gu (1): drm/amdgpu: Clear garbage data in err_data before usage Johannes Berg (1): drm/ttm: fix compilation on ARCH=um José Expósito (1): drm/amd/display: invalid parameter check in dmub_hpd_callback Juston Li (1): drm/i915/pxp: Hold RPM wakelock during PXP unbind Kent Russell (1): drm/amdkfd: Fix ASIC name typos Leslie Shi (1): drm/amdgpu: Unmap MMIO mappings when device is not unplugged Liu Ying (1): drm/atomic: Check new_crtc_state->active to determine if CRTC needs disable in self refresh mode Lukas Bulwahn (1): drm/amdkfd: make SPDX License expression more sound Mario Limonciello (4): drm/amdgpu: explicitly check for s0ix when evicting resources drm/amdgpu: don't set s3 and s0ix at the same time drm/amd/display: explicitly set is_dsc_supported to false before use drm/amd/display: re
Re: [PATCH] apply-pull: Never rebase git pull, never rebase
On Wed, Jan 12, 2022 at 12:05:20PM -0500, Rodrigo Vivi wrote: > On Wed, Jan 12, 2022 at 11:50:11AM -0500, Rodrigo Vivi wrote: > > git pull of git version 2.31.1 apparently prefers rebase > > over merge. > > duh! it was a Intel's dt script that changed my defaults on my back... > (facepalm) > > I will remove from my config... but anyway I believe this might > be a good protection from any config or git pull decision... > > So, please ignore the line above and consider this new commit message: > > on a v2: > > We should never run the pull with the rebase strategy. Ever. > > That messes up with our commits. Specially with the top > one where dim expects a merge commit and it amends from and > link info. > > So, let's forbid the rebase strategy overriding any user > config. > > Cc: Jani Nikula > Cc: Daniel Vetter > Cc: Zhi Wang > Signed-off-by: Rodrigo Vivi Reviewed-by: Daniel Vetter It's tricky to be completely user-config proof, but I think anytime something blows up it's good to fix it. Best we can do really. -Daniel > > > > > Then it messes up with our commits. Specially with the top > > one where dim expects a merge commit and it amends from and > > link info. > > > > No, git pull --rebase=merges didn't help and with a risk of > > changing behavior for others and also messing with commit ids. > > > > So, let's inform git pull that we really don't want a rebase > > here. > > > > Cc: Jani Nikula > > Cc: Daniel Vetter > > Cc: Zhi Wang > > Signed-off-by: Rodrigo Vivi > > --- > > dim | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/dim b/dim > > index bbe9308..fb0dce9 100755 > > --- a/dim > > +++ b/dim > > @@ -1188,7 +1188,7 @@ function dim_apply_pull > > > > checkpatch_commit_push_range 0 "HEAD..FETCH_HEAD" > > > > - if ! $DRY git pull --no-ff $pull_branch ; then > > + if ! $DRY git pull --no-rebase --no-ff $pull_branch ; then > > if ! check_conflicts "$pull_branch" ; then > > echoerr "Please resolve and then commit normally using > > git" > > > > -- > > 2.31.1 > > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-next-fixes
On Fri, Jan 14, 2022 at 03:24:59PM +0100, Thomas Zimmermann wrote: > Hi Dave and Daniel, > > here are two more fixes for this week. I cherry-picked both from > drm-misc-next. > > Best regards > Thomas > > drm-misc-next-fixes-2022-01-14: > * atomic helpers: Fix error messages > * mipi-dbi: Fix buffer mapping > The following changes since commit 5da8b49de472c1da8658466d4f63ef8d9251a819: > > dt-bindings: display: bridge: lvds-codec: Fix duplicate key (2021-12-22 > 14:02:04 -0400) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc > tags/drm-misc-next-fixes-2022-01-14 Thanks, pulled to drm-next. -Daniel > > for you to fetch changes up to 5d474cc501b90b82c182b5d00439eb6790a82e21: > > drm/mipi-dbi: Fix source-buffer address in mipi_dbi_buf_copy (2022-01-14 > 14:43:02 +0100) > > > * atomic helpers: Fix error messages > * mipi-dbi: Fix buffer mapping > > > Claudio Suarez (1): > drm: fix error found in some cases after the patch d1af5cd86997 > > Liu Ying (1): > drm/atomic: Check new_crtc_state->active to determine if CRTC needs > disable in self refresh mode > > Thomas Zimmermann (1): > drm/mipi-dbi: Fix source-buffer address in mipi_dbi_buf_copy > > drivers/gpu/drm/drm_atomic_helper.c | 14 +++--- > drivers/gpu/drm/drm_mipi_dbi.c | 2 +- > 2 files changed, 8 insertions(+), 8 deletions(-) > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-next-fixes
On Thu, Jan 13, 2022 at 09:29:51AM +0100, Thomas Zimmermann wrote: > Hi Dave and Daniel, > > here's this week's PR for drm-misc-next-fixes. > > Best regards > Thomas > > drm-misc-next-fixes-2022-01-13: > * Fix use of CRTC state's active vs enable in atomic helper > The following changes since commit 5da8b49de472c1da8658466d4f63ef8d9251a819: > > dt-bindings: display: bridge: lvds-codec: Fix duplicate key (2021-12-22 > 14:02:04 -0400) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc > tags/drm-misc-next-fixes-2022-01-13 > > for you to fetch changes up to 69e630016ef4e4a1745310c446f204dc6243e907: Thanks, pulled to drm-next. -Daniel > > drm/atomic: Check new_crtc_state->active to determine if CRTC needs disable > in self refresh mode (2022-01-11 10:37:15 -0500) > > > * Fix use of CRTC state's active vs enable in atomic helper > > > Liu Ying (1): > drm/atomic: Check new_crtc_state->active to determine if CRTC needs > disable in self refresh mode > > drivers/gpu/drm/drm_atomic_helper.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-intel-next-fixes
On Thu, Jan 13, 2022 at 09:33:03AM +, Tvrtko Ursulin wrote: > > Hi Dave and Daniel, > > A few fixes for the merge window. > > One dealing with runtime PM handling on the PXP unbind path and a few > regarding the newly added TTM backend support. > > Regards, > > Tvrtko > > --- > > drm-intel-next-fixes-2022-01-13: > - Hold runtime PM wakelock during PXP unbind (Juston Li) > - Three fixes for the TTM backend fault handling (Matthew Auld) > - Make sure to unmap when purging in the TTM backend (Matthew Auld) > The following changes since commit c65fe9cbbfd61dbc12868f9ed4940c80fcb249e8: > > drm/i915/fbc: Remember to update FBC state even when not reallocating CFB > (2021-12-27 11:46:48 +0200) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-intel > tags/drm-intel-next-fixes-2022-01-13 Pulled, thanks. -Daniel > > for you to fetch changes up to 6ef295e34297433c78ea02dfcf1c649a769050bb: > > drm/i915/ttm: ensure we unmap when purging (2022-01-10 14:00:47 +) > > > - Hold runtime PM wakelock during PXP unbind (Juston Li) > - Three fixes for the TTM backend fault handling (Matthew Auld) > - Make sure to unmap when purging in the TTM backend (Matthew Auld) > > > Juston Li (1): > drm/i915/pxp: Hold RPM wakelock during PXP unbind > > Matthew Auld (4): > drm/i915: don't call free_mmap_offset when purging > drm/i915/ttm: only fault WILLNEED objects > drm/i915/ttm: add unmap_virtual callback > drm/i915/ttm: ensure we unmap when purging > > drivers/gpu/drm/i915/gem/i915_gem_mman.c | 3 +++ > drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 1 + > drivers/gpu/drm/i915/gem/i915_gem_pages.c | 1 - > drivers/gpu/drm/i915/gem/i915_gem_ttm.c| 27 > +- > drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 18 --- > drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 5 +++- > 6 files changed, 38 insertions(+), 17 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH] dim: Check that patches have git-format-patch default prefixes
On Mon, Nov 29, 2021 at 11:51:58AM +0100, Javier Martinez Canillas wrote:
> By default the git-format-patch command generates patches with prefixes
> for the source and destination (-p1) and is also what git-am uses as a
> default. The command strips the first leading path component when patch
> is applied (unless a different -p argument is used).
>
> But the patch generating behaviour can be changed with git-format-patch
> --no-prefix argument (or setting 'diff.noprefix = true' in .gitconfig).
>
> Patches with no source and destination prefixes will confuse the git-am
> 3-way merge logic, since stripping the first path component will lead
> to wrong paths for newly added files.
>
> To avoid this, check that patches to apply are using git-format-patch's
> defaults prefixes to make sure that git-am defaults are safe to use too.
>
> Signed-off-by: Javier Martinez Canillas
> ---
>
> dim | 19 +++
> 1 file changed, 19 insertions(+)
>
> diff --git a/dim b/dim
> index bbe9308ac695..1a07cc177fb5 100755
> --- a/dim
> +++ b/dim
> @@ -1113,6 +1113,18 @@ function check_merge_baseline
> fi
> }
>
> +# ensure the patch has prefixes (-p1), since otherwise it can confuse the
> git am
> +# 3-way merge logic. check the default source (a/) and destination (b/)
> prefixes.
> +function check_diff_prefix
> +{
> + local rv
> + patch="$1"
> +
> + rv=$(grep -q -E "^diff --git a\/.+ b\/.+$" $patch)
> +
> + return $rv
> +}
> +
> # ensure we're on branch $1, and apply patches. the rest of the arguments are
> # passed to git am.
> dim_alias_ab=apply-branch
> @@ -1139,6 +1151,13 @@ function dim_apply_branch
> git mailsplit -b -o$dir $file > /dev/null
>
> for patch in "$dir"/*; do
> +
> + if ! check_diff_prefix "$patch"; then
> + echoerr "ERROR: The patch does not contain prefixes in
> its diff."
> + echoerr "ERROR: This format can confuse git am when
> applying it."
> + exit 1
I think there are still people around who love pain too much and generate
patches without git, which I think would trip your check. Can you make
this a warn_or_fail instead. Also I think ERROR: in your echoerr is a bit
overkill.
Otherwise makes sense.
-Daniel
> + fi
> +
> if ! apply_patch $patch "$@"; then
> rv=1
> fi
> --
> 2.33.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
[PATCH 2/2] dim: Update drm-misc maintainer list
Way out of date. Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Tvrtko Ursulin Cc: Rodrigo Vivi Cc: Lyude Paul Cc: Thomas Zimmermann Cc: Maarten Lankhorst Cc: Maxime Ripard Signed-off-by: Daniel Vetter --- dim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dim b/dim index bbe9308ac695..563b0f471dc4 100755 --- a/dim +++ b/dim @@ -89,7 +89,7 @@ dim_pull_request_recipients=( -c "Joonas Lahtinen " -c "Tvrtko Ursulin " -c "Rodrigo Vivi " - -c "Sean Paul " + -c "Thomas Zimmermann " -c "Maarten Lankhorst " -c "Maxime Ripard " -c "dri-de...@lists.freedesktop.org" -- 2.33.0
[PATCH 1/2] dim: Caution more against topic branches
They're very often just beaurocratic paperwork pushing because maintainers refuse to give acks for merging patches through a single tree. I guess the snarky intro wasn't clear enough, so elaborate. Given that we don't even talk about topic branches anywhere else in the docs hopefully this makes things a bit clearer. Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Tvrtko Ursulin Cc: Rodrigo Vivi Cc: Lyude Paul Cc: Thomas Zimmermann Cc: Maarten Lankhorst Cc: Maxime Ripard Signed-off-by: Daniel Vetter --- dim.rst | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dim.rst b/dim.rst index 60c688d6c027..41d9f0e808b2 100644 --- a/dim.rst +++ b/dim.rst @@ -475,9 +475,13 @@ EXAMPLES Cross-subsystem topic branches -- -So you want to send a pull request to another subsystem? Maintainers will likely -get cranky if you ask them to pull a swath of unrelated drm patches, so we'll -use a topic branch based upon Linus' tree with only the relevant patches. +So you want to send a pull request to another subsystem? Frist, you don't want, +it's much simpler to get Acks for merging through a single tree and then maybe +later on backmerge. But if it cannot be avoided, read on. + +Maintainers will likely get cranky if you ask them to pull a swath of unrelated +drm patches, so we'll use a topic branch based upon Linus' tree with only the +relevant patches. First select a suitable *baseline* for your topic branch. For topic branches shared within the gpu/drm subsystem, base it on the latest -- 2.33.0
Re: [PATCH 1/2] dim: Error checking for git commit in rebuild-tip
On Mon, Nov 22, 2021 at 3:38 PM Jani Nikula wrote: > > On Tue, 16 Nov 2021, Daniel Vetter wrote: > > There's nothing we can do, but also I was baffled about what's going on. > > The reason was that a topic branch was deleted on the server, but not > > removed from nightly.conf. Which means git merge fails, but not in a way > > we expect, so we keep falling over until this git commit (which should > > always succeed) also falls over and the scrip just stops. > > > > Make the failure a notch more verbose for next time around. > > Reviewed-by: Jani Nikula > > on both Thanks, both pushed. -Daniel > > > > > Signed-off-by: Daniel Vetter > > --- > > dim | 5 - > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/dim b/dim > > index 9da768fe5f5b..d382d41bbb5c 100755 > > --- a/dim > > +++ b/dim > > @@ -798,7 +798,10 @@ function dim_rebuild_tip > > > > # because we filter out fast-forward merges there will > > # always be something to commit > > - git commit --no-edit --quiet --no-verify > > + if ! git commit --no-edit --quiet --no-verify ; then > > + echoerr "Commit failed, missing topic branch?" > > + return 1 > > + fi > > echo "Done." > > fi > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
[PATCH 2/2] bash-completion: fix shellcheck SC2268
if [[ "x$1" = "xcd" ]]; then
^---^ SC2268: Avoid x-prefix in comparisons as it no longer
serves a purpose.
Signed-off-by: Daniel Vetter
---
bash_completion | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bash_completion b/bash_completion
index 8dcf61ae42d1..e88aa4f98f2d 100644
--- a/bash_completion
+++ b/bash_completion
@@ -2,7 +2,7 @@
dim ()
{
- if [[ "x$1" = "xcd" ]]; then
+ if [[ "$1" = "cd" ]]; then
cd $(cat ~/.dim-last-path) || exit
else
command dim "$@"
--
2.33.0
[PATCH 1/2] dim: Error checking for git commit in rebuild-tip
There's nothing we can do, but also I was baffled about what's going on. The reason was that a topic branch was deleted on the server, but not removed from nightly.conf. Which means git merge fails, but not in a way we expect, so we keep falling over until this git commit (which should always succeed) also falls over and the scrip just stops. Make the failure a notch more verbose for next time around. Signed-off-by: Daniel Vetter --- dim | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dim b/dim index 9da768fe5f5b..d382d41bbb5c 100755 --- a/dim +++ b/dim @@ -798,7 +798,10 @@ function dim_rebuild_tip # because we filter out fast-forward merges there will # always be something to commit - git commit --no-edit --quiet --no-verify + if ! git commit --no-edit --quiet --no-verify ; then + echoerr "Commit failed, missing topic branch?" + return 1 + fi echo "Done." fi -- 2.33.0
Re: [PATCH] dim: Add myself to the pull recipients list
On Wed, Nov 10, 2021 at 09:49:24AM +, Tvrtko Ursulin wrote: > From: Tvrtko Ursulin > > Another thing to do having obtained a drm-intel-gt-next co-maintainer hat. > > Signed-off-by: Tvrtko Ursulin > Suggested-by: Joonas Lahtinen Acked-by: Daniel Vetter > --- > dim | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/dim b/dim > index 4bc23ee5fea9..74342f14b1e4 100755 > --- a/dim > +++ b/dim > @@ -87,6 +87,7 @@ > maintainer_tools_https=https://gitlab.freedesktop.org/drm/maintainer-tools.git > dim_pull_request_recipients=( > -c "Jani Nikula " > -c "Joonas Lahtinen " > + -c "Tvrtko Ursulin " > -c "Rodrigo Vivi " > -c "Sean Paul " > -c "Maarten Lankhorst " > -- > 2.30.2 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH] dim: update drm/for-linux-next-gt
On Fri, Oct 22, 2021 at 1:39 PM Joonas Lahtinen
wrote:
>
> This will allow integrating drm-intel-gt-next with linux-nexlinux-nextt
>
> Signed-off-by: Joonas Lahtinen
Acked-by: Daniel Vetter
> ---
> dim | 27 ---
> 1 file changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/dim b/dim
> index 9da768f..4bc23ee 100755
> --- a/dim
> +++ b/dim
> @@ -532,16 +532,18 @@ function dim_range_diff
> fi
> }
>
> -# update for-linux-next and for-linux-next-fixes branches
> -function update_linux_next # branch next next-fixes fixes
> +# update for-linux-next* branches
> +function update_linux_next # branch next next-fixes fixes [for-linux-next]
> [for-linux-next-fixes]
> {
> - local branch linux_next linux_next_fixes linux_fixes repo remote
> + local branch linux_next linux_next_fixes linux_fixes for_linux_next
> for_linux_next_fixes repo remote
>
> cd $DIM_PREFIX/drm-tip
> branch=$1
> linux_next=$2
> linux_next_fixes=$3
> linux_fixes=$4
> + for_linux_next=${5:-for-linux-next}
> + for_linux_next_fixes=${6:-for-linux-next-fixes}
>
> repo=$(branch_to_repo $branch)
>
> @@ -553,24 +555,25 @@ function update_linux_next # branch next next-fixes
> fixes
>
> git_fetch_helper $remote
>
> - # always update drm-intel-fixes
> - echo -n "Pushing $linux_fixes to for-linux-next-fixes... "
> - git_push $remote +$remote/$linux_fixes:for-linux-next-fixes
> - echo "Done."
> + if [ -n "$for_linux_next_fixes" ] ; then
> + echo -n "Pushing $linux_fixes to $for_linux_next_fixes... "
> + git_push $remote +$remote/$linux_fixes:$for_linux_next_fixes
> + echo "Done."
> + fi
>
> if git merge-base --is-ancestor $remote/$linux_next_fixes
> $remote/$linux_fixes ; then
> # -fixes has caught up to dinf, i.e. we're out of the merge
> # window. Push the next queue.
> - echo -n "Out of merge window. Pushing $linux_next to
> for-linux-next... "
> - git_push $remote +$remote/$linux_next:for-linux-next
> + echo -n "Out of merge window. Pushing $linux_next to
> $for_linux_next... "
> + git_push $remote +$remote/$linux_next:$for_linux_next
> echo "Done."
> else
> # dinf is ahead of -fixes, i.e. drm-next has already closed
> for
> # the next merge window and we've started to gather new fixes
> # for the current -next cycle. Push dinf
>
> - echo -n "Pushing $linux_next_fixes to for-linux-next... "
> - git_push $remote +$remote/$linux_next_fixes:for-linux-next
> + echo -n "Pushing $linux_next_fixes to $for_linux_next... "
> + git_push $remote +$remote/$linux_next_fixes:$for_linux_next
> echo "Done."
> fi
> }
> @@ -1021,6 +1024,8 @@ function dim_push_branch
> git_push $remote $branch "$@"
>
> update_linux_next $branch drm-intel-next drm-intel-next-fixes
> drm-intel-fixes
> + update_linux_next $branch drm-intel-gt-next drm-intel-next-fixes
> drm-intel-fixes \
> + for-linux-next-gt "" # no for-linux-next-gt-fixes for now
> update_linux_next $branch drm-misc-next drm-misc-next-fixes
> drm-misc-fixes
> update_linux_next $branch drm-amd-next drm-amd-next-fixes
> drm-amd-fixes
>
> --
> 2.31.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Re: [PULL] drm-intel-fixes
On Thu, Sep 30, 2021 at 11:50:20AM +0300, Jani Nikula wrote: > > Hi Dave & Daniel - > > drm-intel-fixes-2021-09-30: > drm/i915 fixes for v5.15-rc4: > - Fix GVT scheduler ww lock usage > - Fix pdfdocs documentation build > - Fix request early tracepoints > - Fix an invalid warning from rps worker > > BR, > Jani. > > The following changes since commit 5816b3e6577eaa676ceb00a848f0fd65fe2adc29: > > Linux 5.15-rc3 (2021-09-26 14:08:19 -0700) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2021-09-30 > > for you to fetch changes up to 4b8bcaf8a6d6ab5db51e30865def5cb694eb2966: > > drm/i915: Remove warning from the rps worker (2021-09-27 12:46:40 +0300) Merged into drm-fixes, apologies for being a bit late, I was held up in a drm-misc-fixes chaos. -Daniel > > > drm/i915 fixes for v5.15-rc4: > - Fix GVT scheduler ww lock usage > - Fix pdfdocs documentation build > - Fix request early tracepoints > - Fix an invalid warning from rps worker > > > Akira Yokosawa (1): > drm/i915/guc, docs: Fix pdfdocs build error by removing nested grid > > Jani Nikula (1): > Merge tag 'gvt-fixes-2021-09-18' of https://github.com/intel/gvt-linux > into drm-intel-fixes > > Matthew Auld (1): > drm/i915/request: fix early tracepoints > > Tejas Upadhyay (1): > drm/i915: Remove warning from the rps worker > > Zhi A Wang (1): > drm/i915/gvt: fix the usage of ww lock in gvt scheduler. > > drivers/gpu/drm/i915/gt/intel_rps.c | 2 -- > drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h | 10 +- > drivers/gpu/drm/i915/gt/uc/abi/guc_communication_mmio_abi.h | 10 +- > drivers/gpu/drm/i915/gvt/scheduler.c| 4 ++-- > drivers/gpu/drm/i915/i915_request.c | 11 ++- > 5 files changed, 14 insertions(+), 23 deletions(-) > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-fixes
On Fri, Oct 01, 2021 at 11:50:52AM +0200, Daniel Vetter wrote: > On Thu, Sep 30, 2021 at 12:06:21PM +0200, Maarten Lankhorst wrote: > > drm-misc-fixes-2021-09-30: > > drm-misc-fixes for v5.15: > > - Not sure if drm-misc-fixes-2021-09-08 tag was pulled, assuming it is. > > - Power management fixes for vc4. > > - Compiler fix for vc4. > > - Cursor fix for nouveau. > > - Fix ttm buffer moves for ampere gpu's by adding minimal acceleration > > support. > > - Small rockchip fixes. > > - Fix DT bindings indent for ili9341. > > - Fix y030xx067a init sequence to not get a yellow tint. > > - Kconfig fix for fb_simple vs simpledrm. > > The following changes since commit 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f: > > > > Linux 5.15-rc1 (2021-09-12 16:28:37 -0700) > > > > are available in the Git repository at: > > > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2021-09-30 > > > > for you to fetch changes up to fd09961dbb9ca6558d8ad318a3967c1048bdb090: > > > > fbdev: simplefb: fix Kconfig dependencies (2021-09-29 09:26:58 +0200) > > > > > > drm-misc-fixes for v5.15: > > - Not sure if drm-misc-fixes-2021-09-08 tag was pulled, assuming it is. Dave said he won't pull it and just cherry-picked the ttm fix, and asked for a rebase of the remaining bits. > > - Power management fixes for vc4. > > - Compiler fix for vc4. > > - Cursor fix for nouveau. > > - Fix ttm buffer moves for ampere gpu's by adding minimal acceleration > > support. > > - Small rockchip fixes. > > - Fix DT bindings indent for ili9341. > > - Fix y030xx067a init sequence to not get a yellow tint. > > - Kconfig fix for fb_simple vs simpledrm. > > I can't pull this, because it conflicts with vc4 reverts in -rc2. There's > a completely busted merge resolution in drm-tip, which doesn't even > compile. > > Please > - drop all vc4 patches > - rebase onto -rc3 or -rc4 if it's too late > > I'll do the pull to Linus this afternoon, would be good to get the other > fixes in. I didn't see anything, so I guess it's going to be rebase onto -rc4 next week. Please don't fumble this for another week, the kmb fix is almost a month old by now because it keeps falling through cracks. drm-misc is supposed to be worry-free, not "where is my drm-misc-fixes" pull request land ... -Daniel > -Daniel > > > > > > > Arnd Bergmann (1): > > fbdev: simplefb: fix Kconfig dependencies > > > > Ben Skeggs (3): > > drm/nouveau/kms/tu102-: delay enabling cursor until after > > assign_windows > > drm/nouveau/ga102-: support ttm buffer moves via copy engine > > drm/nouveau/fifo/ga102: initialise chid on return from channel > > creation > > > > Chris Morgan (1): > > drm/rockchip: Update crtc fixup to account for fractional clk change > > > > Christophe Branchereau (1): > > drm/panel: abt-y030xx067a: yellow tint fix > > > > Edmund Dea (1): > > drm/kmb: Enable alpha blended second plane > > > > Jernej Skrabec (1): > > drm/sun4i: dw-hdmi: Fix HDMI PHY clock setup > > > > Krzysztof Kozlowski (1): > > dt-bindings: panel: ili9341: correct indentation > > > > Maarten Lankhorst (1): > > Merge drm/drm-fixes into drm-misc-fixes > > > > Maxime Ripard (7): > > drm/vc4: select PM > > drm/vc4: hdmi: Make sure the controller is powered up during bind > > drm/vc4: hdmi: Rework the pre_crtc_configure error handling > > drm/vc4: hdmi: Split the CEC disable / enable functions in two > > drm/vc4: hdmi: Make sure the device is powered with CEC > > drm/vc4: hdmi: Warn if we access the controller while disabled > > drm/vc4: hdmi: Remove unused struct > > > > Palmer Dabbelt (1): > > drm/rockchip: cdn-dp-core: Fix cdn_dp_resume unused warning > > > > xinhui pan (1): > > drm/ttm: Fix a deadlock if the target BO is not idle during swap > > > > .../bindings/display/panel/ilitek,ili9341.yaml | 2 +- > > drivers/gpu/drm/kmb/kmb_drv.c | 8 +- > > drivers/gpu/drm/kmb/kmb_drv.h | 5 + > > drivers/gpu/drm/kmb/kmb_plane.c| 81 +- > > drivers/gpu/drm/kmb/kmb_plane.h| 5 +- > > drivers/gpu/drm/kmb/kmb_regs.h | 3 + > > drivers/gpu/drm/nouveau/dis
Re: [PULL] drm-misc-fixes
h | 4 +- > drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 97 --- > drivers/gpu/drm/vc4/Kconfig| 1 + > drivers/gpu/drm/vc4/vc4_hdmi.c | 133 + > drivers/gpu/drm/vc4/vc4_hdmi_regs.h| 6 + > drivers/of/base.c | 1 + > drivers/video/fbdev/Kconfig| 5 +- > 28 files changed, 591 insertions(+), 139 deletions(-) > create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga102.c -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-fixes
On Thu, Sep 9, 2021 at 5:35 AM Dave Airlie wrote: > > On Thu, 9 Sept 2021 at 03:44, Thomas Zimmermann wrote: > > > > Hi Dave and Daniel, > > > > here's this week's PR for drm-misc-fixes. One patch is a potential deadlock > > in TTM, the other enables an additional plane in kmb. I'm slightly unhappy > > that the latter one ended up in -fixes as it's not a bugfix AFAICT. > > To avoid messy merge window, I'm not pulling this until after rc1 > unless there is some major reason? Christian misplaced a ttm fix, so we really want this. Maybe cherry-pick to drm-next and then drm-misc-fixes gets rebased instead. And yeah I dunno what do with our conflicts around merge window, maybe we're letting trees diverge a bit too much. -Daniel > > the current drm-next doesn't have v5.14 in it, and the merge is rather > ugly right now. > > (maybe I should always pull it in before sending to Linus to avoid > this in future). > > Dave. -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH] dim: force merge commit for backmerges
On Wed, Aug 11, 2021 at 10:13 AM Jani Nikula wrote: > > On Mon, 02 Aug 2021, Daniel Vetter wrote: > > We have all these remainders to actually type a commit message, but > > --no-commit doesn't imply --no-ff, so let's fix that. > > *reminders > > Reviewed-by: Jani Nikula Fixed and pushed, thanks for taking a look. -Daniel > > > > > > Noticed because Maarten managed to do a fast-forward backmerge into > > drm-misc-next somehow. > > > > Signed-off-by: Daniel Vetter > > --- > > dim | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/dim b/dim > > index 56463eb0c0a6..b3016d921a1a 100755 > > --- a/dim > > +++ b/dim > > @@ -1240,7 +1240,7 @@ function dim_backmerge > > > > validate_upstream_baseline $branch $upstream > > > > - git merge --rerere-autoupdate --no-commit $upstream >& /dev/null || > > true > > + git merge --rerere-autoupdate --no-commit --no-ff $upstream >& > > /dev/null || true > > > > patch_file=$(git_dir)/MERGE_MSG > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH] dim: add additional prompts for pushing merges
On Wed, Aug 11, 2021 at 4:22 PM Jani Nikula wrote:
> On Wed, 11 Aug 2021, "Vivi, Rodrigo" wrote:
> > On Wed, 2021-08-11 at 13:58 +0300, Jani Nikula wrote:
> >> It's not exactly trivial to add the smarts to properly check for
> >> pushing
> >> backmerges, rebases, topic branches and subtree branches (such as
> >> gvt). For a start, prompt the user with hints about what's going on.
> >>
> >> Cc: Daniel Vetter
> >> Signed-off-by: Jani Nikula
> >>
> >> ---
> >>
> >> Untested.
> >> ---
> >> dim | 14 ++
> >> 1 file changed, 10 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/dim b/dim
> >> index 56463eb0c0a6..9fc2d78b8617 100755
> >> --- a/dim
> >> +++ b/dim
> >> @@ -989,7 +989,7 @@ function checkpatch_commit_push_range
> >> # push.
> >> function dim_push_branch
> >> {
> >> - local branch remote committer_email count
> >> + local branch remote committer_email commit_count merge_count
> >>
> >> branch=${1:?$usage}
> >> shift
> >> @@ -1004,9 +1004,15 @@ function dim_push_branch
> >>
> >> # Apart from maintainers pushing merges or rebases, most
> >> patches should
> >> # be pushed in small batches.
> >> - count=$(git rev-list --count --first-parent
> >> "$branch@{u}..$branch")
> >> - if [[ $count -gt 10 ]]; then
> >> - if ! ask_user "Pushing $count commits. Are you
> >> sure?"; then
> >> + commit_count=$(git rev-list --count --no-merges --first-
> >> parent "$branch@{u}..$branch")
> >> + merge_count=$(git rev-list --count --merges --first-parent
> >> "$branch@{u}..$branch")
> >> + if [[ $merge_count -gt 0 ]]; then
> >> + if ! ask_user "Pushing $merge_count merges and
> >> $commit_count non-merge commits. Merges should only be pushed by
> >> maintainers. Are you sure?"; then
> >
> > With our flow of drm-intel-next and drm-intel-gt-next, there are a few
> > cases where it is much easier a topic branch to get merged to both.
> >
> > On a recent case I asked Matt Roper to go ahead and merge to both
> > directly since I was sure that all of them had the same base and all
> > patches really ready for merge.
> >
> > Are we going to block cases like this and force pull request on all
> > kind of topic branches? or with the right maintainer acks we can
> > get this path and then we'd need to adjust this message?
>
> We have the workflow and tooling in place to send and apply pull
> requests via mail specifically to do merge checks and add an audit trail
> of sorts on what happened. We get the diffstat in the pull request, and
> dim also adds the Link: tag to the merge commit.
>
> So yeah, I want a pull request on the list even for topic branches.
> This is what I've done with all the topic branches I've set up and
> merged. The bar should be as high for merges as for patches. Or even
> higher.
+1. Maintainers playing cowboy on the tree directly without a public
audit trail is bad, no matter who does it or why. The rare exception
is when the problem their fixing is worse than the solution, like when
someone managed to push all of drm-tip onto drm-misc-next, then
maintainers have to use their powers.
> It just looks really bad to have a merge commit in the branch by a
> non-maintainer with no pull request on the list and no acks recorded in
> the merge commit.
>
> Whether we should let committers merge the pull request with maintainer
> acks, recorded in the merge commit, is, I think, a separate discussion.
Agreed, that's imo up to maintainer teams. For drm-misc I've strongly
suggested that only maintainers do that, mostly because drm-misc is
all volunteers and so it just makes sense if that rarely needed
special flow knowledge is concentrated. It avoids screw-ups. drm-intel
I guess you guys can make a case that platform enabling needs to do
this regularly enough that they can start the topic branch.
Oh also: dim has tooling for topic branches too. Was that used, or
not? Without that the topic branch won't be included in drm-tip, which
means you can really test it before baking in the topic branch for
good.
Anywy, I think the patch is the right thing to do.
Reviewed-by: Daniel Vetter
When we have a tested version I think it'd be good to Cc: all current
maintainers just so they're aware. Dave might be confused if dim has
even more to complain :-)
-Daniel
>
> BR,
> Jani.
>
>
>
> >
> >> + echoerr "NOTE: Branch not pushed."
> >> + return 1
> >> + fi
> >> + elif [[ $commit_count -gt 10 ]]; then
> >> + if ! ask_user "Pushing $commit_count commits. Commits
> >> should be only be pushed in relatively small batches. Are you sure?";
> >> then
> >> echoerr "NOTE: Branch not pushed."
> >> return 1
> >> fi
> >
>
> --
> Jani Nikula, Intel Open Source Graphics Center
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
[PATCH] dim: force merge commit for backmerges
We have all these remainders to actually type a commit message, but --no-commit doesn't imply --no-ff, so let's fix that. Noticed because Maarten managed to do a fast-forward backmerge into drm-misc-next somehow. Signed-off-by: Daniel Vetter --- dim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dim b/dim index 56463eb0c0a6..b3016d921a1a 100755 --- a/dim +++ b/dim @@ -1240,7 +1240,7 @@ function dim_backmerge validate_upstream_baseline $branch $upstream - git merge --rerere-autoupdate --no-commit $upstream >& /dev/null || true + git merge --rerere-autoupdate --no-commit --no-ff $upstream >& /dev/null || true patch_file=$(git_dir)/MERGE_MSG -- 2.32.0
Re: [PATCH] dim/drm-misc: Add rule to not push patches with issues
On Fri, Jul 9, 2021 at 10:11 AM Daniel Vetter wrote: > > We kinda left this out, and I like the wording from the drm-intel > side, so add that. Motivated by a discussion with Christian. > > Cc: Christian König > Cc: Maarten Lankhorst > Cc: Maxime Ripard > Cc: Thomas Zimmermann > Signed-off-by: Daniel Vetter Pushed, thanks for all the r-b/acks. -Daniel > --- > committer-drm-misc.rst | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/committer-drm-misc.rst b/committer-drm-misc.rst > index 9497a5d26a9d..110ca8b0525e 100644 > --- a/committer-drm-misc.rst > +++ b/committer-drm-misc.rst > @@ -21,6 +21,9 @@ Merge Criteria > > Right now the only hard merge criteria are: > > +* There must not be open issues or unresolved or conflicting feedback from > + anyone. Clear them up first. Defer to maintainers as needed. > + > * Patch is properly reviewed or at least Ack, i.e. don't just push your own >stuff directly. This rule holds even more for bugfix patches - it would be >embarrassing if the bugfix contains a small gotcha that review would have > -- > 2.32.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] drm-misc-fixes
On Tue, Jul 13, 2021 at 10:44:05AM +0200, Thomas Zimmermann wrote: > Hi Dave and Daniel, > > these two fixes in drm-misc-fixes got lost during last cycle. Sending them > now. Applied to drm-fixes, thanks. -Daniel > > Best regards > Thomas > > drm-misc-fixes-2021-07-13: > Short summary of fixes pull: > > * dma-buf: Fix fence leak in sync_file_merge() error code > * drm/panel: nt35510: Don't fail on DSI reads > The following changes since commit d330099115597bbc238d6758a4930e72b49ea9ba: > > drm/nouveau: fix dma_address check for CPU/GPU sync (2021-06-24 15:40:44 > +0200) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2021-07-13 > > for you to fetch changes up to ffe000217c5068c5da07ccb1c0f8cce7ad767435: > > dma-buf/sync_file: Don't leak fences on merge failure (2021-07-12 13:34:49 > +0200) > > > Short summary of fixes pull: > > * dma-buf: Fix fence leak in sync_file_merge() error code > * drm/panel: nt35510: Don't fail on DSI reads > > > Jason Ekstrand (1): > dma-buf/sync_file: Don't leak fences on merge failure > > Linus Walleij (1): > drm/panel: nt35510: Do not fail if DSI read fails > > drivers/dma-buf/sync_file.c | 13 +++-- > drivers/gpu/drm/panel/panel-novatek-nt35510.c | 4 +--- > 2 files changed, 8 insertions(+), 9 deletions(-) > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PATCH] dim/drm-misc: Add rule to not push patches with issues
We kinda left this out, and I like the wording from the drm-intel side, so add that. Motivated by a discussion with Christian. Cc: Christian König Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann Signed-off-by: Daniel Vetter --- committer-drm-misc.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/committer-drm-misc.rst b/committer-drm-misc.rst index 9497a5d26a9d..110ca8b0525e 100644 --- a/committer-drm-misc.rst +++ b/committer-drm-misc.rst @@ -21,6 +21,9 @@ Merge Criteria Right now the only hard merge criteria are: +* There must not be open issues or unresolved or conflicting feedback from + anyone. Clear them up first. Defer to maintainers as needed. + * Patch is properly reviewed or at least Ack, i.e. don't just push your own stuff directly. This rule holds even more for bugfix patches - it would be embarrassing if the bugfix contains a small gotcha that review would have -- 2.32.0 ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] drm-misc-next-fixes
t (2021-06-11 14:19:12 +1000) > > > > > > are available in the Git repository at: > > > > > > git://anongit.freedesktop.org/drm/drm-misc > > > tags/drm-misc-next-fixes-2021-06-16 > > > > > > for you to fetch changes up to 3769e4c0af5b82c8ea21d037013cb9564dfaa51f: > > > > > > drm/dp_mst: Avoid to mess up payload table by ports in stale topology > > > (2021-06-16 12:57:46 -0400) > > > > > > > > > Short summary of fixes pull: > > > > > > * hyperv: advertise the correct formatmodifiers for its primary plane > > > * dp_mst: VCPI fixes to make it work with StarTech hub > > > > > > > > > Pu Lehui (1): > > > drm/hyperv: Fix unused const variable 'hyperv_modifiers' > > > > > > Wayne Lin (2): > > > drm/dp_mst: Do not set proposed vcpi directly > > > drm/dp_mst: Avoid to mess up payload table by ports in stale > > > topology > > > > > > drivers/gpu/drm/drm_dp_mst_topology.c | 65 > > > + > > > drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 2 +- > > > 2 files changed, 40 insertions(+), 27 deletions(-) > > > > > > -- > > > Thomas Zimmermann > > > Graphics Driver Developer > > > SUSE Software Solutions Germany GmbH > > > Maxfeldstr. 5, 90409 Nürnberg, Germany > > > (HRB 36809, AG Nürnberg) > > > Geschäftsführer: Felix Imendörffer -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] drm-misc-next
On Thu, Jun 10, 2021 at 1:15 PM Thomas Zimmermann wrote: > > Hi Dave and Daniel, > > here's the second PR for drm-misc-next for this week, and the final one > for 5.14. I backmerged drm-next for the TTM changes. As for highlights > nouveau now has eDP backlight support and udmabuf supports huge pages. Why did you do this backmerge? It's done now so nothing to fix, but I'm not really seeing the reason - the backmerge is the last patch right before you've done the pull request. -Daniel > > Best regards > Thomas > > drm-misc-next-2021-06-10: > drm-misc-next for 5.14: > > UAPI Changes: > > Cross-subsystem Changes: > > * dma-buf: Support huge pages in udmabuf > > Core Changes: > > * Backmerge of drm/drm-next > > * drm/dp: Import eDP backlight code from i915 > > Driver Changes: > > * drm/bridge: TI SN65DSI83: Fix sparse warnings > > * drm/i915: Cleanup eDP backlight code before moving it into helper > > * drm/nouveau: Support DPCD backlights; Fix GEM init for internal BOs > The following changes since commit c707b73f0cfb1acc94a20389aecde65e6385349b: > > Merge tag 'amd-drm-next-5.14-2021-06-09' of > https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-06-10 13:47:13 > +1000) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2021-06-10 > > for you to fetch changes up to 86441fa29e57940eeb00f35fefb1853c1fbe67bb: > > Merge drm/drm-next into drm-misc-next (2021-06-10 12:18:54 +0200) > > > drm-misc-next for 5.14: > > UAPI Changes: > > Cross-subsystem Changes: > > * dma-buf: Support huge pages in udmabuf > > Core Changes: > > * Backmerge of drm/drm-next > > * drm/dp: Import eDP backlight code from i915 > > Driver Changes: > > * drm/bridge: TI SN65DSI83: Fix sparse warnings > > * drm/i915: Cleanup eDP backlight code before moving it into helper > > * drm/nouveau: Support DPCD backlights; Fix GEM init for internal BOs > > > Christian König (1): > drm/nouveau: init the base GEM fields for internal BOs > > Lyude Paul (9): > drm/i915/dpcd_bl: Remove redundant AUX backlight frequency calculations > drm/i915/dpcd_bl: Handle drm_dpcd_read/write() return values correctly > drm/i915/dpcd_bl: Cleanup intel_dp_aux_vesa_enable_backlight() a bit > drm/i915/dpcd_bl: Cache some backlight capabilities in > intel_panel.backlight > drm/i915/dpcd_bl: Move VESA backlight enabling code closer together > drm/i915/dpcd_bl: Return early in vesa_calc_max_backlight if we can't > read PWMGEN_BIT_COUNT > drm/i915/dpcd_bl: Print return codes for VESA backlight failures > drm/dp: Extract i915's eDP backlight code into DRM helpers > drm/nouveau/kms/nv50-: Add basic DPCD backlight support for nouveau > > Marek Vasut (1): > drm/bridge: ti-sn65dsi83: Fix sparse warnings > > Thomas Zimmermann (1): > Merge drm/drm-next into drm-misc-next > > Vivek Kasireddy (1): > udmabuf: Add support for mapping hugepages (v4) > > drivers/dma-buf/udmabuf.c | 50 ++- > drivers/gpu/drm/bridge/ti-sn65dsi83.c | 21 +- > drivers/gpu/drm/drm_dp_helper.c| 347 > + > drivers/gpu/drm/i915/display/intel_display_types.h | 2 +- > .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 329 +++ > drivers/gpu/drm/nouveau/dispnv50/disp.c| 28 ++ > drivers/gpu/drm/nouveau/nouveau_backlight.c| 166 +- > drivers/gpu/drm/nouveau/nouveau_bo.c | 6 + > drivers/gpu/drm/nouveau/nouveau_connector.h| 9 +- > drivers/gpu/drm/nouveau/nouveau_encoder.h | 1 + > include/drm/drm_dp_helper.h| 48 +++ > 11 files changed, 682 insertions(+), 325 deletions(-) > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [drm-rerere PATCH] nightly.conf: drop amd branches from drm-tip
On Wed, May 19, 2021 at 11:49:32AM +0300, Jani Nikula wrote: > We've had a stale repo for amd in drm-tip since around v4.15 i.e. for > more than three years. Nobody seems to notice or care. Drop the amd > branches from drm-tip. > > Having the current amd branches in drm-tip would be nice to have, if > only to have a common drm integration tree. However, maintaining that > has a cost due to the inevitable conflicts. We can add the branches back > if and when there's interest in sharing the burden. > > Cc: Alex Deucher > Cc: Christian König > Cc: Pan, Xinhui > Cc: Daniel Vetter > Signed-off-by: Jani Nikula Acked-by: Daniel Vetter > --- > nightly.conf | 9 - > 1 file changed, 9 deletions(-) > > diff --git a/nightly.conf b/nightly.conf > index 9211550ef75c..35fb1d9ba600 100644 > --- a/nightly.conf > +++ b/nightly.conf > @@ -40,12 +40,6 @@ git://anongit.freedesktop.org/drm-misc > https://anongit.freedesktop.org/git/drm/drm-misc > https://anongit.freedesktop.org/git/drm/drm-misc.git > " > -drm_tip_repos[drm-amd]=" > -ssh://git.freedesktop.org/git/drm/drm-amd > -git://anongit.freedesktop.org/drm/drm-amd > -https://anongit.freedesktop.org/git/drm/drm-amd > -https://anongit.freedesktop.org/git/drm/drm-amd.git > -" > drm_tip_repos[drm]=" > ssh://git.freedesktop.org/git/drm/drm > git://anongit.freedesktop.org/drm/drm > @@ -76,17 +70,14 @@ drm_tip_config=( > "drmdrm-fixes" > "drm-misc drm-misc-fixes" > "drm-intel drm-intel-fixes" > - "drm-amddrm-amd-fixes" > > "drmdrm-next" > "drm-misc drm-misc-next-fixes" > "drm-intel drm-intel-next-fixes" > - "drm-amddrm-amd-next-fixes" > > "drm-misc drm-misc-next" > "drm-intel drm-intel-next" > "drm-intel drm-intel-gt-next" > - "drm-amddrm-amd-next" > > "sound-upstream for-linus" > "sound-upstream for-next" > -- > 2.20.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] drm-intel-fixes
On Thu, Apr 15, 2021 at 08:59:11AM -0400, Rodrigo Vivi wrote: > Hi Dave and Daniel, > > Here goes drm-intel-fixes-2021-04-15: > > Display panel & power related fixes: > > - Backlight fix (Lyude) > - Display watermark fix (Ville) > - VLV panel power fix (Hans) > > Thanks, > Rodrigo. > > The following changes since commit d434405aaab7d0ebc516b68a8fc4100922d7f5ef: > > Linux 5.12-rc7 (2021-04-11 15:16:13 -0700) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2021-04-15 > > for you to fetch changes up to aee6f25e9c911323aa89a200e1bb160c1613ed3d: > > drm/i915/display/vlv_dsi: Do not skip panel_pwr_cycle_delay when disabling > the panel (2021-04-12 08:00:33 -0400) Applied to drm-fixes, thanks for the pull. -Daniel > > > Display panel & power related fixes: > > - Backlight fix (Lyude) > - Display watermark fix (Ville) > - VLV panel power fix (Hans) > > > Hans de Goede (1): > drm/i915/display/vlv_dsi: Do not skip panel_pwr_cycle_delay when > disabling the panel > > Lyude Paul (1): > drm/i915/dpcd_bl: Don't try vesa interface unless specified by VBT > > Ville Syrjälä (1): > drm/i915: Don't zero out the Y plane's watermarks > > drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c | 1 - > drivers/gpu/drm/i915/display/vlv_dsi.c | 4 ++-- > drivers/gpu/drm/i915/intel_pm.c | 4 ++-- > 3 files changed, 4 insertions(+), 5 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] topic/i915-gem-next
On Fri, Mar 26, 2021 at 2:31 PM Jani Nikula wrote: > > On Fri, 26 Mar 2021, Daniel Vetter wrote: > > The rough plan we discussed somewhat ad-hoc with Jani (Joonas was > > out this week, but back next) is that they send out a pull with what's > > there right now. Then once both this branch here and the -gt-next pull are > > in drm-next they will backmerge, and the -gt-next tree is open for > > business again. > > I guess worth noting is that drm-intel-gt-next is now rebased on top of > current drm-next. Since the topic branch is part of drm-tip, I presume > the conflicts are manageable. Ah yes the only conflict between i915-gem-next and drm-intel-gt-next is in a header where 2 function prototypes got changed next to each another. Otherwise I didn't hit anything, and CI seems to approve of both drm-tip and dign. So probably about as good as it will get with a big shuffle like this one here. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] topic/i915-gem-next
Hi Dave, topic/i915-gem-next-2021-03-26: special i915-gem-next pull as requested - Conversion to dma_resv_locking, obj->mm.lock is gone (Maarten, with help from Thomas Hellström) - watchdog (Tvrtko, one patch to cancel individual request from Chris) - legacy ioctl cleanup (Jason+Ashutosh) - i915-gem TODO and RFC process doc (me) - i915_ prefix for vma_lookup (Liam Howlett) just because I spotted it and put it in here too After this it's back to normal drm-intel-gt-next pull request flow. The rough plan we discussed somewhat ad-hoc with Jani (Joonas was out this week, but back next) is that they send out a pull with what's there right now. Then once both this branch here and the -gt-next pull are in drm-next they will backmerge, and the -gt-next tree is open for business again. Ofc new rules apply, anything that lands in there should be cc: dri-devel and reviewed there, but I think that's working fairly well already. Jani/Rodrigo/Joonas, can you pls send out internal mail once that's done since I'm on vacation next week? Also I want to thank Maarten for sticking around for well over a year with the dma_resv locking rework, it's a huge thing, tons of work, but finally we have it merged. Cheers, Daniel The following changes since commit 06debd6e1b28029e6e77c41e59a162868f377897: Merge tag 'drm-intel-next-2021-03-16' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2021-03-18 08:06:34 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/topic/i915-gem-next-2021-03-26 for you to fetch changes up to e1a5e6a8c48bf99ea374fb3e535661cfe226bca4: drm/doc: Add RFC section (2021-03-26 09:24:39 +0100) special i915-gem-next pull as requested - Conversion to dma_resv_locking, obj->mm.lock is gone (Maarten, with help from Thomas Hellström) - watchdog (Tvrtko, one patch to cancel individual request from Chris) - legacy ioctl cleanup (Jason+Ashutosh) - i915-gem TODO and RFC process doc (me) - i915_ prefix for vma_lookup (Liam Howlett) just because I spotted it and put it in here too Ashutosh Dixit (1): drm/i915: Disable pread/pwrite ioctl's for future platforms (v3) Chris Wilson (1): drm/i915: Individual request cancellation Daniel Vetter (2): drm/i915: add gem/gt TODO drm/doc: Add RFC section Jason Ekstrand (2): drm/i915/gem: Drop legacy execbuffer support (v2) drm/i915/gem: Drop relocation support on all new hardware (v6) Liam Howlett (1): i915_vma: Rename vma_lookup to i915_vma_lookup Maarten Lankhorst (62): drm/i915: Do not share hwsp across contexts any more, v8. drm/i915: Pin timeline map after first timeline pin, v4. drm/i915: Move cmd parser pinning to execbuffer drm/i915: Add missing -EDEADLK handling to execbuf pinning, v2. drm/i915: Ensure we hold the object mutex in pin correctly. drm/i915: Add gem object locking to madvise. drm/i915: Move HAS_STRUCT_PAGE to obj->flags drm/i915: Rework struct phys attachment handling drm/i915: Convert i915_gem_object_attach_phys() to ww locking, v2. drm/i915: make lockdep slightly happier about execbuf. drm/i915: Disable userptr pread/pwrite support. drm/i915: No longer allow exporting userptr through dma-buf drm/i915: Reject more ioctls for userptr, v2. drm/i915: Reject UNSYNCHRONIZED for userptr, v2. drm/i915: Make compilation of userptr code depend on MMU_NOTIFIER. drm/i915: Fix userptr so we do not have to worry about obj->mm.lock, v7. drm/i915: Flatten obj->mm.lock drm/i915: Populate logical context during first pin. drm/i915: Make ring submission compatible with obj->mm.lock removal, v2. drm/i915: Handle ww locking in init_status_page drm/i915: Rework clflush to work correctly without obj->mm.lock. drm/i915: Pass ww ctx to intel_pin_to_display_plane drm/i915: Add object locking to vm_fault_cpu drm/i915: Move pinning to inside engine_wa_list_verify() drm/i915: Take reservation lock around i915_vma_pin. drm/i915: Make lrc_init_wa_ctx compatible with ww locking, v3. drm/i915: Make __engine_unpark() compatible with ww locking. drm/i915: Take obj lock around set_domain ioctl drm/i915: Defer pin calls in buffer pool until first use by caller. drm/i915: Fix pread/pwrite to work with new locking rules. drm/i915: Fix workarounds selftest, part 1 drm/i915: Add igt_spinner_pin() to allow for ww locking around spinner. drm/i915: Add ww locking around vm_access() drm/i915: Increase ww locking for perf. drm/i915: Lock ww in ucode objects correctly drm/i915: Add ww locking to dma-buf ops, v2. drm/i915: Add missing ww lock in intel_dsb_prepare. drm/i915: Fix ww locking in shmem_create_from_
Re: [PULL] drm-misc-fixes
On Thu, Mar 18, 2021 at 12:33 PM Maarten Lankhorst wrote: > > drm-misc-fixes-2021-03-18: > drm-misc-fixes for v5.12-rc4: > - Make ttm_bo_unpin() not wraparound on too many unpins. > - Fix coccicheck warning in omap. Still missing the 2 patches from drm-misc-next-fixes, and those being left out also means drm-misc-next isn't pushed to for-linux-next branch, which is causing a ton of confusion itself. -Daniel > The following changes since commit de066e116306baf3a6a62691ac63cfc0b1dabddb: > > drm/compat: Clear bounce structures (2021-03-11 11:11:33 +0100) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2021-03-18 > > for you to fetch changes up to 6909115442759efef3d4bc5d9c54d7943f1afc14: > > drm/omap: dsi: fix unsigned expression compared with zero (2021-03-17 > 13:59:23 +0200) > > > drm-misc-fixes for v5.12-rc4: > - Make ttm_bo_unpin() not wraparound on too many unpins. > - Fix coccicheck warning in omap. > > > Christian König (1): > drm/ttm: make ttm_bo_unpin more defensive > > Junlin Yang (1): > drm/omap: dsi: fix unsigned expression compared with zero > > drivers/gpu/drm/omapdrm/dss/dsi.c | 7 --- > include/drm/ttm/ttm_bo_api.h | 6 -- > 2 files changed, 8 insertions(+), 5 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] drm-misc-fixes
On Thu, Feb 25, 2021 at 8:53 AM Thomas Zimmermann wrote: > > Hi > > Am 25.02.21 um 02:55 schrieb Dave Airlie: > > On Wed, 24 Feb 2021 at 20:27, Thomas Zimmermann wrote: > >> > >> Hi Dave and Daniel, > >> > >> here's this week's PR for drm-misc-fixes. One of the patches is a memory > >> leak; the rest is for hardware issues. > >> > > > > This is based on 5.11 and I'm not currently in the market for a > > backmege now before rc1 so can you just top this up next week? > > I can, but I think Maxime will take over after -rc1. I think we could also cherry-pick these 3 patches over to Maarten's drm-misc-next-fixes pull. Committers pushing stuff to the wrong branch is kinda normal, it's always a bit tricky around the merge window :-) -Daniel > > Best regards > Thomas > > > > > Though maybe the ttm fix should be fast tracked, will contemplate it. > > > > Dave. > > > >> Best regards > >> Thomas > >> > >> drm-misc-fixes-2021-02-24: > >> * drm/panel: kd35t133: Work with non-continuous DSI clock > >> * drm/rockchip: Require YTR modifier for AFBC > >> * drm/ttm: Fix a memory leak in error handling > >> The following changes since commit > >> f40ddce88593482919761f74910f42f4b84c004b: > >> > >>Linux 5.11 (2021-02-14 14:32:24 -0800) > >> > >> are available in the Git repository at: > >> > >>git://anongit.freedesktop.org/drm/drm-misc > >> tags/drm-misc-fixes-2021-02-24 > >> > >> for you to fetch changes up to 54dab3a718f7094532daf7d25cd14121a0e00e34: > >> > >>drm/panel: kd35t133: allow using non-continuous dsi clock (2021-02-23 > >> 22:44:58 +0100) > >> > >> > >> * drm/panel: kd35t133: Work with non-continuous DSI clock > >> * drm/rockchip: Require YTR modifier for AFBC > >> * drm/ttm: Fix a memory leak in error handling > >> > >> > >> Alyssa Rosenzweig (1): > >>drm/rockchip: Require the YTR modifier for AFBC > >> > >> Heiko Stuebner (1): > >>drm/panel: kd35t133: allow using non-continuous dsi clock > >> > >> xinhui pan (1): > >>drm/ttm: Fix a memory leak > >> > >> drivers/gpu/drm/panel/panel-elida-kd35t133.c | 3 ++- > >> drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 11 +++ > >> drivers/gpu/drm/ttm/ttm_bo.c | 9 ++--- > >> 3 files changed, 19 insertions(+), 4 deletions(-) > >> > >> -- > >> Thomas Zimmermann > >> Graphics Driver Developer > >> SUSE Software Solutions Germany GmbH > >> Maxfeldstr. 5, 90409 Nürnberg, Germany > >> (HRB 36809, AG Nürnberg) > >> Geschäftsführer: Felix Imendörffer > > ___ > > dri-devel mailing list > > dri-de...@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] drm-misc-next
On Tue, Jan 19, 2021 at 12:39:22PM +0100, Maarten Lankhorst wrote: > drm-misc-next-2021-01-19: > drm-misc-next for v5.12: > > UAPI Changes: > - Fix fourcc macro for amlogic video fbc. > > Cross-subsystem Changes: > - Export pci_rebar_bytes_to_size. > - Add a PCI quirk to increase bar0 for RX 5600 XT Pulse to max possible size. > - Convert devicetree bindings to use the OF graph schema. > - Update s6e63m0 bindings. > - Make omapfb2 DSI_CM incompatible with drm/omap2 DSI-CM because of > module conflicts. > - Add Zack Rusin as vmwgfx maintainer. > - Add CONFIG_DMABUF_DEBUG for validating dma-buf users don't loo kat struct > page when importing or detaching. > > Core Changes: > - Remove references to drm_device.pdev > - Fix regression in ttm_bo_move_to_lru_tail(). > - Assorted docbook updates. > - Do not send dp-mst hotplug events on error when probing. > - Move some agp macros to agpsupport.c, so it's not always compiled. > - Move drm_need_swiotlb.h to drm_cache.c > - Only build drm_memory.o for legacy drivers, and move CONFIG_DRM_VM to > legacy. > - Nuke drm_device.hose > - Warn when the ttm resource manager is non-empty when disabling. > - Assorted small fixes. > > Driver Changes: > - Small assorted fixes in radeon, v3d, hisilicon, mipi-dbi, panfrost, hibmc, > vc4, amdgpu, vkms, vmwgfx. > - Move hisilicon to use simple encode. > - Add writeback connector to vkms. > - Add support for BT2020 to DE3. > - Use gem prime mmap helpers in vc4, and move the mmap function upwards. > - Use managed drm device, and cleanup error paths and display registers in > vmwgfx. > - Use correct bus_format and connector_type for innolux_n116bge. > - Fix a lot of warnings with W=1 (Lee Jones) > The following changes since commit cb3cfbf79aff7decb4e5ee69a7c74864497f61dc: > > Merge tag 'drm-misc-next-2021-01-06' of > git://anongit.freedesktop.org/drm/drm-misc into drm-next (2021-01-07 13:40:20 > +0100) Pulled, thanks. -Daniel > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2021-01-19 > > for you to fetch changes up to c31eb10fd5aee124b78ce72ebf7d0cd13fca6095: > > drm/amdgpu: Remove accidentally added small unused hunk. (2021-01-19 > 11:18:39 +0100) > > > drm-misc-next for v5.12: > > UAPI Changes: > - Fix fourcc macro for amlogic video fbc. > > Cross-subsystem Changes: > - Export pci_rebar_bytes_to_size. > - Add a PCI quirk to increase bar0 for RX 5600 XT Pulse to max possible size. > - Convert devicetree bindings to use the OF graph schema. > - Update s6e63m0 bindings. > - Make omapfb2 DSI_CM incompatible with drm/omap2 DSI-CM because of > module conflicts. > - Add Zack Rusin as vmwgfx maintainer. > - Add CONFIG_DMABUF_DEBUG for validating dma-buf users don't loo kat struct > page when importing or detaching. > > Core Changes: > - Remove references to drm_device.pdev > - Fix regression in ttm_bo_move_to_lru_tail(). > - Assorted docbook updates. > - Do not send dp-mst hotplug events on error when probing. > - Move some agp macros to agpsupport.c, so it's not always compiled. > - Move drm_need_swiotlb.h to drm_cache.c > - Only build drm_memory.o for legacy drivers, and move CONFIG_DRM_VM to > legacy. > - Nuke drm_device.hose > - Warn when the ttm resource manager is non-empty when disabling. > - Assorted small fixes. > > Driver Changes: > - Small assorted fixes in radeon, v3d, hisilicon, mipi-dbi, panfrost, hibmc, > vc4, amdgpu, vkms, vmwgfx. > - Move hisilicon to use simple encode. > - Add writeback connector to vkms. > - Add support for BT2020 to DE3. > - Use gem prime mmap helpers in vc4, and move the mmap function upwards. > - Use managed drm device, and cleanup error paths and display registers in > vmwgfx. > - Use correct bus_format and connector_type for innolux_n116bge. > - Fix a lot of warnings with W=1 (Lee Jones) > > > Andrey Grodzovsky (2): > drm: Unamp the entire device address space on device unplug > drm/sched: Cancel and flush all outstanding jobs before finish. > > Chia-I Wu (2): > drm/virtio: make sure context is created in gem open > drm/virtio: fix prime export for vram objects > > Colin Ian King (1): > drm/vkms: Fix missing kmalloc allocation failure check > > Daniel Vetter (4): > drm/vmwgfx: Drop svga_lock > drm/vmwgfx: Always evict vram _before_ disabling it > drm/ttm: WARN_ON non-empty lru when disabling a resource manager > dma-buf: Add debug option > > Darren Salt (1): >
Re: reminder: review of maintainer-tools patches is mandatory
On Thu, Jan 14, 2021 at 12:21 PM Daniel Stone wrote: > On Thu, 14 Jan 2021 at 07:15, Jani Nikula wrote: > > On Wed, 13 Jan 2021, Daniel Vetter wrote: > > > Yeah with proper MR flow we'd have marge set up (to do the MR merging > > > for us, it's a bot), which adds a Part-of: tag to each commit it > > > pushes through an MR, so you can go back to the MR link and see all > > > the discussion. There's an r-b: tag from me there. I think we should > > > either set that up or disable MR since it's confusing. > > > > I think as a project maintainer-tools is now so detached and independent > > from the kernel git flows that we can move to support merge requests > > here if you like. All in, or support both patches and merge requests? If we go MR I'd say MR-only, since that'll stop me from failing to run make check, which I'm way too guilty of :-/ > Takes about 5 minutes to set Marge up and we can enforce it so only > Marge can push as well. Let me know if you want that done. Afaiui maintainers/owners can still force push and everything, and Marge is just for developers? Does marge then check for whether you have commit rights or not? -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: reminder: review of maintainer-tools patches is mandatory
On Wed, Jan 13, 2021 at 3:21 PM Jani Nikula wrote: > On Wed, 13 Jan 2021, Sumit Semwal wrote: > > Hi Jani, > > > > Apologies on this - I understand the review part as well, you're right. > > > > Just to give you context: This patch was a quick response to Daniel's ask > > to update the documentation over IRC. I didn't know the process for this, > > and assuming gitlab, created a PR. By the time I could offer Daniel to send > > a patch, he had merged the PR. > > > > Irrespective, I will take care going forward. Apologies again. > > Oh, okay, don't worry about it. Daniel merging the PR is certainly > enough of an ack here. The problem is that in git logs you appeared to > be the committer and Daniel's involvement was completely lost, and > that's what I was going by. Yeah with proper MR flow we'd have marge set up (to do the MR merging for us, it's a bot), which adds a Part-of: tag to each commit it pushes through an MR, so you can go back to the MR link and see all the discussion. There's an r-b: tag from me there. I think we should either set that up or disable MR since it's confusing. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] drm-misc-fixes
On Fri, Jan 08, 2021 at 10:34:34AM +0100, Thomas Zimmermann wrote:
> Hi Dave and Daniel,
>
> sorry for being a bit late. Here's this week's PR for drm-misc-fixes.
No worries, Dave's out anyway so this is all in time for me to do the pull
:-)
>
> Best regards
> Thomas
>
> drm-misc-fixes-2021-01-08:
> * dma-buf: fix a use-after-free
> * radeon: don't init the TTM page pool manually
> * ttm: unexport ttm_pool_{init,fini}()
> The following changes since commit e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62:
>
> Linux 5.11-rc2 (2021-01-03 15:55:30 -0800)
>
> are available in the Git repository at:
>
> git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2021-01-08
Pulled, thanks.
-Daniel
>
> for you to fetch changes up to a73858ef4d5e1d425e171f0f6a52864176a6a979:
>
> drm/ttm: unexport ttm_pool_init/fini (2021-01-07 14:25:43 +0100)
>
>
> * dma-buf: fix a use-after-free
> * radeon: don't init the TTM page pool manually
> * ttm: unexport ttm_pool_{init,fini}()
>
>
> Charan Teja Reddy (1):
> dmabuf: fix use-after-free of dmabuf's file->f_inode
>
> Christian König (2):
> drm/radeon: stop re-init the TTM page pool
> drm/ttm: unexport ttm_pool_init/fini
>
> drivers/dma-buf/dma-buf.c | 21 +
> drivers/gpu/drm/radeon/radeon_ttm.c | 3 ---
> drivers/gpu/drm/ttm/ttm_pool.c | 2 --
> 3 files changed, 17 insertions(+), 9 deletions(-)
>
> --
> Thomas Zimmermann
> Graphics Driver Developer
> SUSE Software Solutions Germany GmbH
> Maxfeldstr. 5, 90409 Nürnberg, Germany
> (HRB 36809, AG Nürnberg)
> Geschäftsführer: Felix Imendörffer
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] drm-misc-next
On Wed, Jan 06, 2021 at 12:13:12PM +0100, Maarten Lankhorst wrote: > drm-misc-next-2021-01-06: > drm-misc-next for v5.12: > > Core Changes: > - Lots of drm documentation updates by Simor Ser. Extra kudos for documentation work! > - Require that each crtc has a unique primary plane. > - Add fixme that fbdev_generic_setup is confusing. > > Driver Changes: > - Update addresses for TI display drivers maintainers. > - Make DRM_VIRTIO_GPU select VIRTIO. > - Small fixes to qxl, virtio, hisilicon, tve200, panel/s6e63m0. > The following changes since commit 5fbd41d3bf123af6a135bdea564087ec0f563eb0: > > Merge tag 'drm-misc-next-2020-11-27-1' of > git://anongit.freedesktop.org/drm/drm-misc into drm-next (2020-12-15 10:21:48 > +0100) Pulled, thanks. -Daniel > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2021-01-06 > > for you to fetch changes up to cf9a4be47fd14473b4d0dd6f494ed7279c2bc8a0: > > drm/doc: render drm.h uapi docs (2021-01-05 14:22:26 +0100) > > > drm-misc-next for v5.12: > > Core Changes: > - Lots of drm documentation updates by Simor Ser. > - Require that each crtc has a unique primary plane. > - Add fixme that fbdev_generic_setup is confusing. > > Driver Changes: > - Update addresses for TI display drivers maintainers. > - Make DRM_VIRTIO_GPU select VIRTIO. > - Small fixes to qxl, virtio, hisilicon, tve200, panel/s6e63m0. > > > Arnd Bergmann (1): > drm/kmb: fix array bounds warning > > Bernard Zhao (1): > via/via_irq: use __func__ to replace string function name > > Chia-I Wu (1): > drm/virtio: align blob resources to page sizes > > Christian König (13): > drm/radeon: fix check order in radeon_bo_move > drm/radeon: stop using pages with drm_prime_sg_to_page_addr_arrays v2 > drm/amdgpu: stop using pages with drm_prime_sg_to_page_addr_arrays > drm/nouveau: stop using pages with drm_prime_sg_to_page_addr_arrays v2 > drm/vmwgfx: switch to ttm_sg_tt_init > drm/qxl: switch to ttm_sg_tt_init > drm/ttm: nuke ttm_dma_tt_init > drm/prime: split array import functions v4 > drm/ttm/drivers: remove unecessary ttm_module.h include v2 > drm/ttm: stop destroying pinned ghost object > drm/ttm: cleanup BO size handling v3 > drm/ttm: use pin_count more extensively > drm/ttm: cleanup LRU handling further > > Chuhong Yuan (1): > drm/fb-helper: Add missed unlocks in setcmap_legacy() > > Dafna Hirschfeld (2): > drm/rockchip: for error print, use the correct device pointer > drm/rockchip: fix typo in Kconfig 's/HDMI/dsi/' > > Dan Carpenter (3): > drm/kmb: Remove an unnecessary NULL check > gma500: clean up error handling in init > drm/panel: khadas: Fix error code in khadas_ts050_panel_add() > > Daniel Vetter (10): > drm/ttm: Warn on pinning without holding a reference > drm/nouveau: Drop mutex_lock_nested for atomic > dma-buf: Fix kerneldoc formatting > drm/vkms: Unset preferred_depth > drm/amdkfd: fix ttm size refactor fallout > dma-buf: Remove kmap kerneldoc vestiges > dma-buf: some kerneldoc formatting fixes > dma-buf: begin/end_cpu might lock the dma_resv lock > dma-buf: doc polish for pin/unpin > drm/fb-helper: Add a FIXME that generic_setup is very confusing > > Dave Stevenson (4): > drm/vc4: dsi: Correct DSI register definition > drm/vc4: dsi: Add support for DSI0 > dt-bindings: Add compatible for BCM2711 DSI1 > drm/vc4: dsi: Add configuration for BCM2711 DSI1 > > Douglas Anderson (7): > drm: panel: simple: Fixup the struct panel_desc kernel doc > drm: panel: simple: Defer unprepare delay till next prepare to shorten > it > drm: panel: simple: Allow specifying the delay from prepare to enable > dt-bindings: dt-bindings: display: simple: Add BOE NV110WTM-N61 > drm: panel: simple: Add BOE NV110WTM-N61 > drm: panel: Fully transition panel_desc kerneldoc to inline style > drm: panel: add flags to BOE NV110WTM-N61 > > Enrico Weigelt, metux IT consult (1): > drivers: gpu: drm: virtio: fix dependency of DRM_VIRTIO_GPU on VIRTIO > > Guido Günther (6): > drm/panel: st7703: Use dev_err_probe > drm/panel: mantix: Tweak init sequence > drm/panel: mantix: Allow to specify default mode for different panels > drm/panel: mantix: Support panel from Shenzhen Yashi Changhua > Intelligent Technolog
Re: [PULL] drm-intel-next
| 95 +- > .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 115 +- > .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 21 +- > drivers/gpu/drm/i915/display/intel_dvo.c |4 - > drivers/gpu/drm/i915/display/intel_fbc.c | 19 +- > drivers/gpu/drm/i915/display/intel_hdmi.c | 26 +- > drivers/gpu/drm/i915/display/intel_lspcon.c| 162 +- > drivers/gpu/drm/i915/display/intel_lspcon.h| 12 + > drivers/gpu/drm/i915/display/intel_panel.c | 226 ++- > drivers/gpu/drm/i915/display/intel_psr.c | 22 +- > drivers/gpu/drm/i915/display/intel_sprite.c| 50 +- > drivers/gpu/drm/i915/display/intel_sprite.h| 10 + > drivers/gpu/drm/i915/display/intel_tc.c|2 +- > drivers/gpu/drm/i915/display/intel_vdsc.c |4 +- > drivers/gpu/drm/i915/gvt/handlers.c|2 +- > drivers/gpu/drm/i915/i915_debugfs.c| 582 +-- > drivers/gpu/drm/i915/i915_drv.c|8 +- > drivers/gpu/drm/i915/i915_drv.h| 41 +- > drivers/gpu/drm/i915/i915_irq.c| 382 ++--- > drivers/gpu/drm/i915/i915_perf.c |2 +- > drivers/gpu/drm/i915/i915_reg.h|7 +- > drivers/gpu/drm/i915/i915_suspend.c| 33 +- > drivers/gpu/drm/i915/intel_device_info.c |2 +- > drivers/gpu/drm/i915/intel_pm.c| 552 +++--- > drivers/gpu/drm/i915/intel_sideband.c |4 +- > drivers/gpu/drm/i915/intel_uncore.c|4 +- > drivers/gpu/drm/i915/intel_uncore.h|6 +- > include/drm/drm_dsc.h |1 + > 49 files changed, 3222 insertions(+), 3075 deletions(-) > create mode 100644 drivers/gpu/drm/i915/display/i9xx_plane.c > create mode 100644 drivers/gpu/drm/i915/display/i9xx_plane.h > create mode 100644 drivers/gpu/drm/i915/display/intel_cursor.c > create mode 100644 drivers/gpu/drm/i915/display/intel_cursor.h -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] topic/dp-hdmi-2.1-pcon for drm-misc-next
ted. > > Currently, we have tested the FRL training and are able to enable 4K > display with TGL Platform + Realtek PCON RTD2173 with HDMI2.1 supporting > panel. > > > Ankit Nautiyal (11): > drm/edid: Parse DSC1.2 cap fields from HFVSDB block > drm/dp_helper: Add Helpers for FRL Link Training support for DP-HDMI2.1 > PCON > drm/dp_helper: Add support for Configuring DSC for HDMI2.1 Pcon > drm/dp_helper: Add helpers to configure PCONs RGB-YCbCr Conversion > drm/i915: Capture max frl rate for PCON in dfp cap structure > drm/i915: Add support for starting FRL training for HDMI2.1 via PCON > drm/i915: Check for FRL training before DP Link training > drm/i915: Read DSC capabilities of the HDMI2.1 PCON encoder > drm/i915: Add helper functions for calculating DSC parameters for > HDMI2.1 > drm/i915/display: Configure PCON for DSC1.1 to DSC1.2 encoding > drm/i915/display: Let PCON convert from RGB to YCbCr if it can > > Swati Sharma (4): > drm/edid: Add additional HFVSDB fields for HDMI2.1 > drm/edid: Parse MAX_FRL field from HFVSDB block > drm/dp_helper: Add support for link failure detection > drm/i915: Add support for enabling link status and recovery > > drivers/gpu/drm/drm_dp_helper.c| 566 > + > drivers/gpu/drm/drm_edid.c | 103 > drivers/gpu/drm/i915/display/intel_ddi.c | 6 +- > drivers/gpu/drm/i915/display/intel_display_types.h | 10 + > drivers/gpu/drm/i915/display/intel_dp.c| 440 +++- > drivers/gpu/drm/i915/display/intel_dp.h| 7 +- > drivers/gpu/drm/i915/display/intel_hdmi.c | 233 + > drivers/gpu/drm/i915/display/intel_hdmi.h | 7 + > include/drm/drm_connector.h| 49 ++ > include/drm/drm_dp_helper.h| 218 > include/drm/drm_edid.h | 30 ++ > 11 files changed, 1650 insertions(+), 19 deletions(-) > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] drm-misc-next
n omap, to add support for CTM and
> color encoding/range properties.
> - Rework omap DSI code, and merge all omapdrm modules now that the last omap
> panel is now a drm panel.
> - More refactoring of omap dsi code.
> - Enable 10/12 bpc outputs in vc4.
>
>
> Arnd Bergmann (1):
> drm/kmb: fix array bounds warning
>
> Bernard Zhao (1):
> via/via_irq: use __func__ to replace string function name
>
> Christian König (13):
> drm/radeon: fix check order in radeon_bo_move
> drm/radeon: stop using pages with drm_prime_sg_to_page_addr_arrays v2
> drm/amdgpu: stop using pages with drm_prime_sg_to_page_addr_arrays
> drm/nouveau: stop using pages with drm_prime_sg_to_page_addr_arrays v2
> drm/vmwgfx: switch to ttm_sg_tt_init
> drm/qxl: switch to ttm_sg_tt_init
> drm/ttm: nuke ttm_dma_tt_init
> drm/prime: split array import functions v4
> drm/ttm/drivers: remove unecessary ttm_module.h include v2
> drm/ttm: stop destroying pinned ghost object
> drm/ttm: cleanup BO size handling v3
> drm/ttm: use pin_count more extensively
> drm/ttm: cleanup LRU handling further
>
> Chuhong Yuan (1):
> drm/fb-helper: Add missed unlocks in setcmap_legacy()
>
> Dafna Hirschfeld (2):
> drm/rockchip: for error print, use the correct device pointer
> drm/rockchip: fix typo in Kconfig 's/HDMI/dsi/'
>
> Dan Carpenter (3):
> drm/kmb: Remove an unnecessary NULL check
> gma500: clean up error handling in init
> drm/panel: khadas: Fix error code in khadas_ts050_panel_add()
>
> Daniel Vetter (9):
> drm/ttm: Warn on pinning without holding a reference
> drm/nouveau: Drop mutex_lock_nested for atomic
> dma-buf: Fix kerneldoc formatting
> drm/vkms: Unset preferred_depth
> drm/amdkfd: fix ttm size refactor fallout
> dma-buf: Remove kmap kerneldoc vestiges
> dma-buf: some kerneldoc formatting fixes
> dma-buf: begin/end_cpu might lock the dma_resv lock
> dma-buf: doc polish for pin/unpin
>
> Dave Stevenson (4):
> drm/vc4: dsi: Correct DSI register definition
> drm/vc4: dsi: Add support for DSI0
> dt-bindings: Add compatible for BCM2711 DSI1
> drm/vc4: dsi: Add configuration for BCM2711 DSI1
>
> Douglas Anderson (7):
> drm: panel: simple: Fixup the struct panel_desc kernel doc
> drm: panel: simple: Defer unprepare delay till next prepare to shorten
> it
> drm: panel: simple: Allow specifying the delay from prepare to enable
> dt-bindings: dt-bindings: display: simple: Add BOE NV110WTM-N61
> drm: panel: simple: Add BOE NV110WTM-N61
> drm: panel: Fully transition panel_desc kerneldoc to inline style
> drm: panel: add flags to BOE NV110WTM-N61
>
> Guido Günther (6):
> drm/panel: st7703: Use dev_err_probe
> drm/panel: mantix: Tweak init sequence
> drm/panel: mantix: Allow to specify default mode for different panels
> drm/panel: mantix: Support panel from Shenzhen Yashi Changhua
> Intelligent Technology Co
> dt-bindings: vendor-prefixes: Add ys vendor prefix
> dt-bindings: display: mantix: Add compatible for panel from YS
>
> Gurchetan Singh (3):
> drm/virtio: virtio_{blah} --> virtio_gpu_{blah}
> drm/virtio: rework virtio_fence_signaled
> drm/virtio: consider dma-fence context when signaling
>
> Jialin Zhang (1):
> drm/gma500: Fix error return code in psb_driver_load()
>
> Jonathan Liu (1):
> drm/rockchip: dw_hdmi: fix incorrect clock in vpll clock error message
>
> Jyri Sarha (2):
> drm/omap: Implement CTM property for CRTC using OVL managers CPR matrix
> drm/omap: Enable COLOR_ENCODING and COLOR_RANGE properties for planes
>
> Krzysztof Kozlowski (1):
> drm/ingenic: depend on COMMON_CLK to fix compile tests
>
> Laurent Pinchart (1):
> drm: Remove drmm_add_final_kfree() declaration from public headers
>
> Linus Walleij (2):
> dt-bindings: display: mcde: Convert to YAML schema
> drm/panel: s6e63m0: Fix init sequence again
>
> Luben Tuikov (4):
> drm/scheduler: "node" --> "list"
> gpu/drm: ring_mirror_list --> pending_list
> drm/scheduler: Essentialize the job done callback
> drm/sched: Add missing structure comment
>
> Maarten Lankhorst (1):
> Merge drm/drm-next into drm-misc-next
>
> Maxime Ripard (20):
> drm/vc4: hdmi: Don't poll for the infoframes status on setup
> drm/vc4: drv: Remove the DSI pointer in vc4_drv
> drm/vc4: dsi: Use snprintf f
Re: [PULL] drm-intel-fixes
On Thu, Jan 07, 2021 at 09:50:28AM +0200, Jani Nikula wrote: > > Hi Dave & Daniel - > > Pretty quiet still, but here's some cc: stable fixes. Pulled, thanks. -Daniel > > (Well, one doesn't have the explicit stable tag, but the Fixes tag > points at a commit in v3.9...) > > drm-intel-fixes-2021-01-07: > drm/i915 fixes for v5.11-rc3: > - Use per-connector PM QoS tracking for DP aux communication > - GuC firmware fix for older Cometlakes > - Clear the gpu reloc and shadow batches > > BR, > Jani. > > The following changes since commit e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62: > > Linux 5.11-rc2 (2021-01-03 15:55:30 -0800) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2021-01-07 > > for you to fetch changes up to 9397d66212cdf7a21c66523f1583e5d63a609e84: > > drm/i915/dp: Track pm_qos per connector (2021-01-05 10:25:03 +0200) > > > drm/i915 fixes for v5.11-rc3: > - Use per-connector PM QoS tracking for DP aux communication > - GuC firmware fix for older Cometlakes > - Clear the gpu reloc and shadow batches > > > Chris Wilson (2): > drm/i915/gt: Define guc firmware blob for older Cometlakes > drm/i915/dp: Track pm_qos per connector > > Matthew Auld (2): > drm/i915: clear the shadow batch > drm/i915: clear the gpu reloc batch > > drivers/gpu/drm/i915/display/intel_display_types.h | 3 +++ > drivers/gpu/drm/i915/display/intel_dp.c| 8 +-- > drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 4 +++- > drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 + > drivers/gpu/drm/i915/i915_cmd_parser.c | 27 > -- > drivers/gpu/drm/i915/i915_drv.c| 5 > drivers/gpu/drm/i915/i915_drv.h| 3 --- > 7 files changed, 22 insertions(+), 29 deletions(-) > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] drm-intel-next-fixes
On Fri, Dec 18, 2020 at 05:04:09PM +0200, Jani Nikula wrote: > > Hi Dave & Daniel - > > drm-intel-next-fixes-2020-12-18: > drm/i915 fixes for the merge window Pulled, thanks a lot. -Daniel > > > BR, > Jani. > > The following changes since commit efd3043790c6e92f0bbe1fe385db9b544131c59c: > > Merge tag 'amd-drm-fixes-5.11-2020-12-16' of > git://people.freedesktop.org/~agd5f/linux into drm-next (2020-12-16 23:25:51 > +0100) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-intel > tags/drm-intel-next-fixes-2020-12-18 > > for you to fetch changes up to 046f70d31ddb2069941aec54966fec5b7fbc7b7b: > > drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping > (2020-12-18 12:30:10 +0200) > > > drm/i915 fixes for the merge window > > > Aditya Swarup (1): > drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping > > Chris Wilson (2): > Revert "drm/i915: re-order if/else ladder for hpd_irq_setup" > drm/i915: Fix mismatch between misplaced vma check and vma insert > > Lionel Landwerlin (1): > drm/i915/perf: also include Gen11 in OATAILPTR workaround > > drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- > drivers/gpu/drm/i915/i915_drv.h| 12 ++-- > drivers/gpu/drm/i915/i915_irq.c| 27 > ++ > drivers/gpu/drm/i915/i915_perf.c | 2 +- > 4 files changed, 23 insertions(+), 20 deletions(-) > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PATCH] dim: require Python 3
On Wed, Dec 16, 2020 at 12:29:26PM +0200, Jani Nikula wrote:
> On Wed, 16 Dec 2020, Simon Ser wrote:
> > Python 2 has been end-of-life'd, and d79c57846950 ("dim: fix handling of
> > 8-bit
> > non-UTF-8 messages") relies on functions introduced in Python 3.2.
> >
> > Signed-off-by: Simon Ser
>
> Thanks,
>
> Reviewed-by: Jani Nikula
Pushed & thanks for handling the fallout.
-Daniel
>
> > ---
> > dim | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/dim b/dim
> > index f4366ea165a2..01bba3129be4 100755
> > --- a/dim
> > +++ b/dim
> > @@ -76,7 +76,7 @@ dim=$(basename $0)
> > dim_today=$(date +%Y-%m-%d)
> > dim_timestamp="$(date --utc +%Yy-%mm-%dd-%Hh-%Mm-%Ss) UTC"
> >
> > -dim_python=$(command -v python || command -v python3)
> > +dim_python=$(command -v python3)
> >
> > dim_fdo_cookie="--push-option
> > fdo.pushedWithDim=this-was-pushed-with-dim-and-not-manually"
>
> --
> Jani Nikula, Intel Open Source Graphics Center
> ___
> dim-tools mailing list
> dim-tools@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dim-tools
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PATCH] dim: fix handling of 8-bit non-UTF-8 messages
Worksforme, so I applied it. Thanks for figuring out what's going on here.
-Daniel
On Tue, Dec 15, 2020 at 11:37 AM Simon Ser wrote:
>
> Python's open() function will return a file object that decodes input
> bytes to an UTF-8 string. Python assumes all files are UTF-8 by default
> (unless an explicit encoding param is passed).
>
> This works fine with 7-bit and UTF-8 messages. However, when a message
> uses a 8-bit Content-Transfer-Encoding and a non-UTF-8 charset (such as
> iso-8859-1), Python will error out.
>
> To prevent this, open the file in binary mode to prevent Python from
> doing any charset conversion under-the-hood.
>
> Signed-off-by: Simon Ser
> Cc: Daniel Vetter
> ---
> dim | 12 +++-
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/dim b/dim
> index ac53ade475c4..f4366ea165a2 100755
> --- a/dim
> +++ b/dim
> @@ -443,9 +443,11 @@ function check_dim_config
> message_get_id ()
> {
> $dim_python < -from email.parser import Parser
> -headers = Parser().parse(open('$1', 'r'))
> -message_id = headers['message-id']
> +import email
> +
> +f = open('$1', 'rb')
> +msg = email.message_from_binary_file(f)
> +message_id = msg['message-id']
> if message_id is not None:
> print(message_id.strip('<> \n'))
> EOF
> @@ -457,12 +459,12 @@ message_print_body ()
> import email
>
> def print_msg(file):
> -msg = email.message_from_file(file)
> +msg = email.message_from_binary_file(file)
> for part in msg.walk():
> if part.get_content_type() == 'text/plain':
>
> print(part.get_payload(decode=True).decode(part.get_content_charset(failobj='us-ascii'),
> 'replace'))
>
> -print_msg(open('$1', 'r'))
> +print_msg(open('$1', 'rb'))
> EOF
> }
>
> --
> 2.29.2
>
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] drm-misc-next-fixes
On Tue, Dec 15, 2020 at 02:04:31PM +0100, Thomas Zimmermann wrote: > Hi Dave and Daniel, > > here's this week's PR for drm-misc-next-fixes. IIRC the radeon fix is > already in drm-misc-next. Pulled, and also your previous -next pull which got stuck somewhere. Thanks, Daniel > > Best regards > Thomas > > drm-misc-next-fixes-2020-12-15: > Short summary of fixes pull (less than what git shortlog provides): > > * dma-buf: Fix docs > * mxsfb: Silence invalid error message > * radeon: Fix TTM multihop > > The following changes since commit 05faf1559de52465f1e753e31883aa294e6179c1: > > drm/imx/dcss: allow using nearest neighbor interpolation scaling > (2020-11-26 11:29:44 +0100) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc > tags/drm-misc-next-fixes-2020-12-15 > > for you to fetch changes up to ee46d16d2e40bebc2aa790fd7b6a056466ff895c: > > drm: mxsfb: Silence -EPROBE_DEFER while waiting for bridge (2020-12-15 > 11:01:10 +0100) > > > Short summary of fixes pull (less than what git shortlog provides): > > * dma-buf: Fix docs > * mxsfb: Silence invalid error message > * radeon: Fix TTM multihop > > -------- > Christian König (1): > drm/radeon: fix check order in radeon_bo_move > > Daniel Vetter (1): > dma-buf: Fix kerneldoc formatting > > Guido Günther (1): > drm: mxsfb: Silence -EPROBE_DEFER while waiting for bridge > > Documentation/driver-api/dma-buf.rst | 2 +- > drivers/gpu/drm/mxsfb/mxsfb_drv.c| 10 +++ > drivers/gpu/drm/radeon/radeon_ttm.c | 54 > > include/linux/dma-buf-map.h | 2 +- > 4 files changed, 30 insertions(+), 38 deletions(-) > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PATCH] dim: decode email message content charset to unicode
On Tue, Dec 15, 2020 at 12:26 PM Jani Nikula wrote: > > On Tue, 15 Dec 2020, Daniel Vetter wrote: > > Adding Thomas too. > > > > On Tue, Dec 15, 2020 at 10:23 AM Daniel Vetter wrote: > >> > >> On Wed, Nov 4, 2020 at 9:33 AM Jani Nikula wrote: > >> > > >> > On Wed, 04 Nov 2020, Dave Airlie wrote: > >> > > is this why I get > >> > > dim apply-pull drm-next < /tmp/PULL-drm-intel-next-queued.patch > >> > > Traceback (most recent call last): > >> > > File "", line 9, in > >> > > File "", line 7, in print_msg > >> > > UnicodeEncodeError: 'ascii' codec can't encode character u'\xe9' in > >> > > position 1256: ordinal not in range(128) > >> > > > >> > > now? > >> > > > >> > > just taking the pull request patch from patchwork > >> > > https://patchwork.freedesktop.org/patch/398659/ > >> > > >> > *sigh* > >> > > >> > When the message left here, and also when a copy arrived through a round > >> > trip via the mailing list, it had Content-Transfer-Encoding: > >> > quoted-printable, and the decoding works fine on the local copies, on > >> > both python2 and python3. > >> > > >> > The message from patchwork has Content-Transfer-Encoding: 8bit, > >> > i.e. patchwork modified the encoding, and the decoding fails on > >> > python3 due to invalid characters. Python2 is less picky. > >> > > >> > With the change reverted, message_print_body() prints the message as > >> > binary without decoding on python3. I don't know if that works by > >> > coincidence. > >> > > >> > Everything also seems to work on the mbox downloaded from Lore [1], can > >> > you please use that in the mean time? > >> > >> gmail seems to do the same mangling, at least my local mailbox also > >> has issues. And it's with all of Thomas' pull requests. Pulling from > >> lore is kinda awkward. > >> > >> Any ideas? > > Isn't this fixed by > > commit 03f281de0f9175875b8d4da0a43d9d288debb228 > Author: Jani Nikula > Date: Wed Nov 18 15:11:03 2020 +0200 > > dim: replace message characters leading to decoding errors with U+FFFD Nope, I had that one already. Simon debugged it, apparently problem is even earlier in the python magic. -Daniel > > BR, > Jani. > > > > >> -Daniel > >> > >> > > >> > > >> > BR, > >> > Jani. > >> > > >> > > >> > [1] https://lore.kernel.org/dri-devel/87o8kehbaj@intel.com/raw > >> > > >> > > >> > > > >> > > Dave. > >> > > > >> > > On Wed, 28 Oct 2020 at 21:16, Vivi, Rodrigo > >> > > wrote: > >> > >> > >> > >> > >> > >> > >> > >> On Oct 28, 2020, at 12:46 AM, Jani Nikula > >> > >> wrote: > >> > >> > >> > >> On Tue, 27 Oct 2020, Rodrigo Vivi wrote: > >> > >> > >> > >> On Mon, Oct 26, 2020 at 12:21:24PM +0200, Jani Nikula wrote: > >> > >> > >> > >> On Wed, 16 Sep 2020, Rodrigo Vivi wrote: > >> > >> > >> > >> On Wed, Sep 16, 2020 at 12:57:43PM +0300, Jani Nikula wrote: > >> > >> > >> > >> Email messages need two levels of decoding: First, content transfer > >> > >> encoding, such as base64 or quoted-printable. Second, charset > >> > >> decoding. > >> > >> > >> > >> We've done the first (with part.get_payload(decode=True)), but we've > >> > >> ignored the charset. Mostly, it has not mattered, since most email is > >> > >> ascii or utf-8 anyway, and python2 has been relaxed about it. However, > >> > >> python3 part.get_payload(decode=True) gives us binary instead of > >> > >> unicode, so we also need to do the charset decoding to get the result > >> > >> we > >> > >> want. > >> > >> > >> > >> The problem has likely been observed only now that 'python' no longer > >> > >> exists or points at python3 instead of python2. > >> > >> > >> > >> Use part.get_content_charset() for charset decoding, defaulting to > >
Re: [PATCH] dim: decode email message content charset to unicode
Adding Thomas too.
On Tue, Dec 15, 2020 at 10:23 AM Daniel Vetter wrote:
>
> On Wed, Nov 4, 2020 at 9:33 AM Jani Nikula wrote:
> >
> > On Wed, 04 Nov 2020, Dave Airlie wrote:
> > > is this why I get
> > > dim apply-pull drm-next < /tmp/PULL-drm-intel-next-queued.patch
> > > Traceback (most recent call last):
> > > File "", line 9, in
> > > File "", line 7, in print_msg
> > > UnicodeEncodeError: 'ascii' codec can't encode character u'\xe9' in
> > > position 1256: ordinal not in range(128)
> > >
> > > now?
> > >
> > > just taking the pull request patch from patchwork
> > > https://patchwork.freedesktop.org/patch/398659/
> >
> > *sigh*
> >
> > When the message left here, and also when a copy arrived through a round
> > trip via the mailing list, it had Content-Transfer-Encoding:
> > quoted-printable, and the decoding works fine on the local copies, on
> > both python2 and python3.
> >
> > The message from patchwork has Content-Transfer-Encoding: 8bit,
> > i.e. patchwork modified the encoding, and the decoding fails on
> > python3 due to invalid characters. Python2 is less picky.
> >
> > With the change reverted, message_print_body() prints the message as
> > binary without decoding on python3. I don't know if that works by
> > coincidence.
> >
> > Everything also seems to work on the mbox downloaded from Lore [1], can
> > you please use that in the mean time?
>
> gmail seems to do the same mangling, at least my local mailbox also
> has issues. And it's with all of Thomas' pull requests. Pulling from
> lore is kinda awkward.
>
> Any ideas?
> -Daniel
>
> >
> >
> > BR,
> > Jani.
> >
> >
> > [1] https://lore.kernel.org/dri-devel/87o8kehbaj@intel.com/raw
> >
> >
> > >
> > > Dave.
> > >
> > > On Wed, 28 Oct 2020 at 21:16, Vivi, Rodrigo
> > > wrote:
> > >>
> > >>
> > >>
> > >> On Oct 28, 2020, at 12:46 AM, Jani Nikula wrote:
> > >>
> > >> On Tue, 27 Oct 2020, Rodrigo Vivi wrote:
> > >>
> > >> On Mon, Oct 26, 2020 at 12:21:24PM +0200, Jani Nikula wrote:
> > >>
> > >> On Wed, 16 Sep 2020, Rodrigo Vivi wrote:
> > >>
> > >> On Wed, Sep 16, 2020 at 12:57:43PM +0300, Jani Nikula wrote:
> > >>
> > >> Email messages need two levels of decoding: First, content transfer
> > >> encoding, such as base64 or quoted-printable. Second, charset decoding.
> > >>
> > >> We've done the first (with part.get_payload(decode=True)), but we've
> > >> ignored the charset. Mostly, it has not mattered, since most email is
> > >> ascii or utf-8 anyway, and python2 has been relaxed about it. However,
> > >> python3 part.get_payload(decode=True) gives us binary instead of
> > >> unicode, so we also need to do the charset decoding to get the result we
> > >> want.
> > >>
> > >> The problem has likely been observed only now that 'python' no longer
> > >> exists or points at python3 instead of python2.
> > >>
> > >> Use part.get_content_charset() for charset decoding, defaulting to
> > >> 'us-ascii' source charset if nothing is specified.
> > >>
> > >> Cc: Rodrigo Vivi
> > >> Cc: Daniel Vetter
> > >> Signed-off-by: Jani Nikula
> > >>
> > >>
> > >> Reviewed-by: Rodrigo Vivi
> > >> Tested-by: Rodrigo Vivi
> > >>
> > >> (Although it continue to fail with the encoded email)
> > >>
> > >>
> > >> Thanks, pushed, though still work to do I guess. :/
> > >>
> > >>
> > >> yeap... it also fails with recent gvt-fixes pull request :(
> > >>
> > >>
> > >> Except this is an altogether different issue. The mail parsing works
> > >> just fine.
> > >>
> > >> Pulling https://github.com/intel/gvt-linux tags/gvt-fixes-2020-10-27 ...
> > >> From https://github.com/intel/gvt-linux
> > >> * tag gvt-fixes-2020-10-27 -> FETCH_HEAD
> > >> dim: 401ccfa87856 ("drm/i915/gvt: Only pin/unpin intel_context along
> > >> with workload"): Subject in fixes line doesn't match referenced commit:
> > >> dim: e6ba76480299 (drm/i915: Remove i915->kernel_context)
> > >>
Re: [PATCH] dim: decode email message content charset to unicode
On Wed, Nov 4, 2020 at 9:33 AM Jani Nikula wrote:
>
> On Wed, 04 Nov 2020, Dave Airlie wrote:
> > is this why I get
> > dim apply-pull drm-next < /tmp/PULL-drm-intel-next-queued.patch
> > Traceback (most recent call last):
> > File "", line 9, in
> > File "", line 7, in print_msg
> > UnicodeEncodeError: 'ascii' codec can't encode character u'\xe9' in
> > position 1256: ordinal not in range(128)
> >
> > now?
> >
> > just taking the pull request patch from patchwork
> > https://patchwork.freedesktop.org/patch/398659/
>
> *sigh*
>
> When the message left here, and also when a copy arrived through a round
> trip via the mailing list, it had Content-Transfer-Encoding:
> quoted-printable, and the decoding works fine on the local copies, on
> both python2 and python3.
>
> The message from patchwork has Content-Transfer-Encoding: 8bit,
> i.e. patchwork modified the encoding, and the decoding fails on
> python3 due to invalid characters. Python2 is less picky.
>
> With the change reverted, message_print_body() prints the message as
> binary without decoding on python3. I don't know if that works by
> coincidence.
>
> Everything also seems to work on the mbox downloaded from Lore [1], can
> you please use that in the mean time?
gmail seems to do the same mangling, at least my local mailbox also
has issues. And it's with all of Thomas' pull requests. Pulling from
lore is kinda awkward.
Any ideas?
-Daniel
>
>
> BR,
> Jani.
>
>
> [1] https://lore.kernel.org/dri-devel/87o8kehbaj@intel.com/raw
>
>
> >
> > Dave.
> >
> > On Wed, 28 Oct 2020 at 21:16, Vivi, Rodrigo wrote:
> >>
> >>
> >>
> >> On Oct 28, 2020, at 12:46 AM, Jani Nikula wrote:
> >>
> >> On Tue, 27 Oct 2020, Rodrigo Vivi wrote:
> >>
> >> On Mon, Oct 26, 2020 at 12:21:24PM +0200, Jani Nikula wrote:
> >>
> >> On Wed, 16 Sep 2020, Rodrigo Vivi wrote:
> >>
> >> On Wed, Sep 16, 2020 at 12:57:43PM +0300, Jani Nikula wrote:
> >>
> >> Email messages need two levels of decoding: First, content transfer
> >> encoding, such as base64 or quoted-printable. Second, charset decoding.
> >>
> >> We've done the first (with part.get_payload(decode=True)), but we've
> >> ignored the charset. Mostly, it has not mattered, since most email is
> >> ascii or utf-8 anyway, and python2 has been relaxed about it. However,
> >> python3 part.get_payload(decode=True) gives us binary instead of
> >> unicode, so we also need to do the charset decoding to get the result we
> >> want.
> >>
> >> The problem has likely been observed only now that 'python' no longer
> >> exists or points at python3 instead of python2.
> >>
> >> Use part.get_content_charset() for charset decoding, defaulting to
> >> 'us-ascii' source charset if nothing is specified.
> >>
> >> Cc: Rodrigo Vivi
> >> Cc: Daniel Vetter
> >> Signed-off-by: Jani Nikula
> >>
> >>
> >> Reviewed-by: Rodrigo Vivi
> >> Tested-by: Rodrigo Vivi
> >>
> >> (Although it continue to fail with the encoded email)
> >>
> >>
> >> Thanks, pushed, though still work to do I guess. :/
> >>
> >>
> >> yeap... it also fails with recent gvt-fixes pull request :(
> >>
> >>
> >> Except this is an altogether different issue. The mail parsing works
> >> just fine.
> >>
> >> Pulling https://github.com/intel/gvt-linux tags/gvt-fixes-2020-10-27 ...
> >> From https://github.com/intel/gvt-linux
> >> * tag gvt-fixes-2020-10-27 -> FETCH_HEAD
> >> dim: 401ccfa87856 ("drm/i915/gvt: Only pin/unpin intel_context along with
> >> workload"): Subject in fixes line doesn't match referenced commit:
> >> dim: e6ba76480299 (drm/i915: Remove i915->kernel_context)
> >> dim: ERROR: issues in commits detected, aborting
> >>
> >>
> >> $ git log e6ba76480299 -1 --format="%s"
> >> drm/i915: Remove i915->kernel_context
> >>
> >>
> >> This is a valid complaint.
> >>
> >> This is what's in the pull request:
> >>
> >> $ git show 401ccfa87856 | grep Fixes
> >>Fixes: e6ba76480299 (drm/i915: Remove i915->kernel_context)
> >>
> >> And this is what it should have:
> >>
> >> $ dim fixes e6ba76480299 | grep Fixes
> >> Fixes: e6ba76480299 ("drm/i915: Remove i91
[PATCH] gitlab-ci: enable pages job by default again
Was disabled because of flaky infrastructure, Benjamin says it's looking good now. Cc: Benjamin Tissoires Signed-off-by: Daniel Vetter --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 948f3058774b..ab68a168b3d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,6 @@ check: - make check pages: -when: manual stage: deploy script: - make html -- 2.29.2 ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PATCH] dim: replace message characters leading to decoding errors with U+FFFD
On Mon, Nov 23, 2020 at 10:37 AM Jani Nikula wrote:
>
>
> Anyone care to review, please?
>
> For convenience, see [1] and [2] for what's going on.
>
> BR,
> Jani.
>
>
> [1] https://docs.python.org/3/howto/unicode.html#the-string-type
> [2] https://docs.python.org/3/library/stdtypes.html#bytes.decode
Thanks for the pointers.
Reviewed-by: Daniel Vetter
>
>
> On Wed, 18 Nov 2020, Jani Nikula wrote:
> > The character set decoding added in commit b66d07db11e5 ("dim: decode
> > email message content charset to unicode") started failing with unicode
> > decoding failures under certain conditions. (Specifically python 3 and
> > mboxes downloaded from patchwork.)
> >
> > Instead of raising UnicodeDecodeErrors, replace values that can't be
> > converted with U+FFFD (REPLACEMENT CHARACTER, �).
> >
> > Reported-by: Dave Airlie
> > Cc: Dave Airlie
> > Cc: Rodrigo Vivi
> > Signed-off-by: Jani Nikula
> > ---
> > dim | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/dim b/dim
> > index 1be1435a1a52..1572cf33f25c 100755
> > --- a/dim
> > +++ b/dim
> > @@ -460,7 +460,7 @@ def print_msg(file):
> > msg = email.message_from_file(file)
> > for part in msg.walk():
> > if part.get_content_type() == 'text/plain':
> > -
> > print(part.get_payload(decode=True).decode(part.get_content_charset(failobj='us-ascii')))
> > +
> > print(part.get_payload(decode=True).decode(part.get_content_charset(failobj='us-ascii'),
> > 'replace'))
> >
> > print_msg(open('$1', 'r'))
> > EOF
>
> --
> Jani Nikula, Intel Open Source Graphics Center
> ___
> dim-tools mailing list
> dim-tools@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dim-tools
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PATCH] dim: change the drm-intel-next and drm-intel-next-queued process
On Tue, Nov 03, 2020 at 04:26:46PM +0200, Jani Nikula wrote:
> Remove the special casing of drm-intel-next/drm-intel-next-queued
> tagging and pull requests. Instead of having a two-step process for
> dinq, follow the same pull request process for all branches. As the
> first step, use drm-intel-next-queued for pull requests, and ignore
> drm-intel-next for now. The change is only relevant for maintainers.
>
> In the future, we'll want to switch from drm-intel-next-queued to
> drm-intel-next completely. This will need a flag day switch for all
> committers and maintainers.
>
> We also decouple driver date update from dinq pull requests. We may want
> to apply the driver date update to drm-intel-gt-next branch instead.
>
> With the change, we also lose the ability to add multiple drm-intel-next
> tags, and create a single pull request for them. In practice, we haven't
> really used this possibility, as it lacks the merging of the annotated
> tag changelogs together, missing information. We may want to resurrect
> the feature in an improved form in the future, generalized for all
> branches.
I think the approach used in drm-misc is to do a culmulative tag.
Essentially just use the tag for note keeping partway through the merge
window.
-Daniel
>
> Cc: Daniel Vetter
> Cc: Joonas Lahtinen
> Cc: Rodrigo Vivi
> Signed-off-by: Jani Nikula
> ---
> dim | 61 ++--
> dim.rst | 35 ---
> maintainer-drm-intel.rst | 17 +++
> 3 files changed, 19 insertions(+), 94 deletions(-)
>
> diff --git a/dim b/dim
> index 8f2151365556..640844a93c65 100755
> --- a/dim
> +++ b/dim
> @@ -2027,34 +2027,9 @@ function dim_update_driver_date
> git commit $DRY_RUN -sm "$prefix: Update DRIVER_DATE to $driver_date"
> }
>
> -function dim_update_next
> +function dim_update_i915_driver_date
> {
> - assert_branch drm-intel-next-queued
> -
> - git pull --ff-only
> -
> dim_update_driver_date "drm/i915" "drivers/gpu/drm/i915/i915_drv.h"
> -
> - gitk --first-parent drm-intel-next-queued ^$(branch_to_remote
> drm-next)/drm-next &
> -
> - # try to push dinq first in case someone raced
> - FORCE=1 dim_push_queued
> -
> - dim_update_next_continue
> -}
> -
> -function dim_update_next_continue
> -{
> - local remote tag
> -
> - assert_branch drm-intel-next-queued
> -
> - remote=$(repo_to_remote drm-intel)
> -
> - git_push -f $remote drm-intel-next-queued:drm-intel-next
> - tag=$(tag_name "drm-intel-next")
> -
> - tag_branch $tag drm-intel-next
> }
>
> function dim_tag_branch
> @@ -2091,11 +2066,6 @@ function dim_tag_branch
> tag_branch $tag $branch
> }
>
> -function dim_tag_next
> -{
> - dim_tag_branch "drm-intel-next"
> -}
> -
> # dim_pull_request branch upstream
> function dim_pull_request
> {
> @@ -2106,31 +2076,18 @@ function dim_pull_request
> remote=$(branch_to_remote $branch)
> req_file=$(mktemp)
>
> - if [ "$branch" != "drm-intel-next" ]; then
> - assert_branch $branch
> - else
> - cd $DIM_PREFIX/$DIM_REPO
> - fi
> + assert_branch $branch
>
> git_fetch_helper ${upstream%%/*}
> echo "Using $upstream as the upstream"
>
> - if [ "$branch" = "drm-intel-next" ]; then
> - # drm-intel-next pulls have been tagged using dim update-next
> - drm_intel_next_tags=$(git_unmerged_tags "$branch" "$upstream")
> - prep_pull_mail $req_file $drm_intel_next_tags
> - tag=$(git describe --all --exact "$branch@{upstream}")
> -
> - repo="drm-intel"
> - else
> - checkpatch_commit_push_range 1 "$upstream..$branch"
> - tag=$(tag_name "$branch")
> - gitk --first-parent "$branch" ^$upstream &
> - tag_branch $tag $branch
> - prep_pull_mail $req_file $tag
> + checkpatch_commit_push_range 1 "$upstream..$branch"
> + tag=$(tag_name "$branch")
> + gitk --first-parent "$branch" ^$upstream &
> + tag_branch $tag $branch
> + prep_pull_mail $req_file $tag
>
> - repo=$(branch_to_repo $branch)
> - fi
> + repo=$(branch_to_repo $branch)
>
> url_list=${drm_tip_repos[$repo]}
> git_url=$(pick_protocol_url git $url_list)
> @@ -2143,7 +2100,7 @@ function dim_pull_request
>
Re: [RFC] dim: add a simple facility to require minimum dim version
On Mon, Oct 26, 2020 at 2:44 PM Jani Nikula wrote:
>
> Add simple single-digit dim version scheme, and add 'dim version'
> subcommand to print it. Start off with version 0.
>
> If $DIM_MIN_VERSION is set, bail out if the requirement is not met. The
> idea is to set this in nightly.conf to be able to soft-enforce dim
> updates before rolling out changes. (It's obviously possible to bypass
> the requirement.)
>
> We do have the dim uptodate nag, but it never bails out.
>
> Signed-off-by: Jani Nikula
>
> ---
>
> Background: We're planning on finally dropping drm-intel-next-queued
> branch in favor of just using drm-intel-next directly. This will need
> some flag day updates. First roll out a way to enforce new
> dim... although the users need to first update to a dim version that has
> the facility. But gotta start somewhere.
Ah yes, this should come handy when moving to gitlab too from the old
fd.o git servers.
Reviewed-by: Daniel Vetter
> ---
> dim | 15 +++
> 1 file changed, 15 insertions(+)
>
> diff --git a/dim b/dim
> index 33e2400c32cc..8f2151365556 100755
> --- a/dim
> +++ b/dim
> @@ -305,6 +305,11 @@ function branch_to_repo # branch
> echo ""
> }
>
> +function dim_version
> +{
> + echo "0"
> +}
> +
> function dim_uptodate
> {
> local using
> @@ -417,6 +422,14 @@ function check_git_version
> fi
> }
>
> +function check_dim_version
> +{
> + if [[ -n "$DIM_MIN_VERSION" ]] && [[ "$(dim_version)" <
> "$DIM_MIN_VERSION" ]]; then
> + echoerr "ERROR: required minimum dim version
> $DIM_MIN_VERSION, you have $(dim_version)"
> + exit 1
> + fi
> +}
> +
> function check_dim_config
> {
> if [[ "$DIM_REPO" == "drm-tip" || "$DIM_REPO" == "drm-rerere" ||
> "$DIM_REPO" == "maintainer-tools" ]]; then
> @@ -2365,6 +2378,7 @@ function list_developer_commands
> # help commands
> "help"
> "usage"
> + "version"
> # include setup
> "setup"
> )
> @@ -2622,6 +2636,7 @@ else
> read_integration_config
>
> check_for_updates
> + check_dim_version
> check_git_version
> fi
>
> --
> 2.20.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
