[PULL] drm-misc-fixes
Hi Dave and Daniel, Back with what might be my last -misc pull request :-( Just a couple fixes. We have our customary MST fix from AMD and a panfrost fix. Please pull! drm-misc-fixes-2020-01-22-1: -mst: Fix SST branch device handling (Wayne) -panfrost: Fix mapping of globally visible BO's (Boris) Cc: Wayne Lin CC: Boris Brezillon Cheers, Sean The following changes since commit 5a64967a2f3bbc01cc708ee43c7b0893089c61c4: drm/dp_mst: Have DP_Tx send one msg at a time (2020-01-15 17:01:21 -0500) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2020-01-22-1 for you to fetch changes up to bdefca2d8dc0f80bbe49e08bf52a717146490706: drm/panfrost: Add the panfrost_gem_mapping concept (2020-01-21 10:32:55 -0600) -mst: Fix SST branch device handling (Wayne) -panfrost: Fix mapping of globally visible BO's (Boris) Cc: Wayne Lin CC: Boris Brezillon Boris Brezillon (1): drm/panfrost: Add the panfrost_gem_mapping concept Wayne Lin (1): drm/dp_mst: Handle SST-only branch device case drivers/gpu/drm/drm_dp_mst_topology.c| 140 +-- drivers/gpu/drm/panfrost/panfrost_drv.c | 91 +-- drivers/gpu/drm/panfrost/panfrost_gem.c | 124 +--- drivers/gpu/drm/panfrost/panfrost_gem.h | 41 ++- drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 3 +- drivers/gpu/drm/panfrost/panfrost_job.c | 13 ++- drivers/gpu/drm/panfrost/panfrost_job.h | 1 + drivers/gpu/drm/panfrost/panfrost_mmu.c | 61 +- drivers/gpu/drm/panfrost/panfrost_mmu.h | 6 +- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 34 -- 10 files changed, 380 insertions(+), 134 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hi Dave and Daniel, I'm delighted to present another -misc-fixes pull. Dock users rejoice, MST keeps getting better! Please pull! drm-misc-fixes-2020-01-16: virtio: maintain obj reservation lock when submitting cmds (Gerd) rockchip: increase link rate var size to accommodate rates (Tobias) mst: serialize down messages and clear timeslots are on unplug (Wayne) Cc: Gerd Hoffmann Cc: Tobias Schramm Cc: Wayne Lin Cheers, Sean The following changes since commit 023b3b0e139f54a680202790ba801f61aa43a5c8: Merge tag 'drm-intel-fixes-2020-01-09-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2020-01-10 11:43:02 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2020-01-16 for you to fetch changes up to 5a64967a2f3bbc01cc708ee43c7b0893089c61c4: drm/dp_mst: Have DP_Tx send one msg at a time (2020-01-15 17:01:21 -0500) virtio: maintain obj reservation lock when submitting cmds (Gerd) rockchip: increase link rate var size to accommodate rates (Tobias) mst: serialize down messages and clear timeslots are on unplug (Wayne) Cc: Gerd Hoffmann Cc: Tobias Schramm Cc: Wayne Lin Gerd Hoffmann (1): drm/virtio: add missing virtio_gpu_array_lock_resv call Tobias Schramm (1): drm/rockchip: fix integer type used for storing dp data rate Wayne Lin (2): drm/dp_mst: clear time slots for ports invalid drm/dp_mst: Have DP_Tx send one msg at a time drivers/gpu/drm/drm_dp_mst_topology.c | 39 +++--- drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +- drivers/gpu/drm/virtio/virtgpu_plane.c | 1 + include/drm/drm_dp_mst_helper.h| 6 ++ 4 files changed, 44 insertions(+), 4 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hi Dave and Daniel, Either our code is nearly perfect, or things are still slow due to holidays. I'll choose to believe the former. Please pull! drm-misc-fixes-2020-01-08: -mst: Fix NO_STOP_BIT bit offset (Wayne) -sun4i: Fix RGB_DIV clock min divider on old hardware (Chen-Yu) -fb_helper: Fix bits_per_pixel param set behavior to round up (Geert) Cc: Wayne Lin Cc: Chen-Yu Tsai Cc: Geert Uytterhoeven Cheers, Sean The following changes since commit ac2917b01992c098b8d4e6837115e3ca347fdd90: drm/arm/mali: make malidp_mw_connector_helper_funcs static (2019-12-20 15:23:51 +) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2020-01-08 for you to fetch changes up to f30e27779d3031a092c2a177b7fb76adccc45241: drm/fb-helper: Round up bits_per_pixel if possible (2020-01-07 16:54:03 +0100) -mst: Fix NO_STOP_BIT bit offset (Wayne) -sun4i: Fix RGB_DIV clock min divider on old hardware (Chen-Yu) -fb_helper: Fix bits_per_pixel param set behavior to round up (Geert) Cc: Wayne Lin Cc: Chen-Yu Tsai Cc: Geert Uytterhoeven Chen-Yu Tsai (1): drm/sun4i: tcon: Set RGB DCLK min. divider based on hardware model Geert Uytterhoeven (1): drm/fb-helper: Round up bits_per_pixel if possible Wayne Lin (1): drm/dp_mst: correct the shifting in DP_REMOTE_I2C_READ drivers/gpu/drm/drm_dp_mst_topology.c | 2 +- drivers/gpu/drm/drm_fb_helper.c | 7 ++- drivers/gpu/drm/sun4i/sun4i_tcon.c| 15 --- drivers/gpu/drm/sun4i/sun4i_tcon.h| 1 + 4 files changed, 20 insertions(+), 5 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hi Dave and Daniel, 2 fixes, 1 of which is marked for stable. drm-misc-fixes-2019-12-31: -sun4i: Fix double-free in connector/encoder cleanup (Stefan) -malidp: Make vtable static (Ben) Cc: Ben Dooks Cc: Stefan Mavrodiev Cheers, Sean The following changes since commit d16f0f61400074dbc75797ca5ef5c3d50f6c0ddf: Merge tag 'drm-fixes-5.5-2019-12-12' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2019-12-13 14:50:01 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2019-12-31 for you to fetch changes up to ac2917b01992c098b8d4e6837115e3ca347fdd90: drm/arm/mali: make malidp_mw_connector_helper_funcs static (2019-12-20 15:23:51 +) -sun4i: Fix double-free in connector/encoder cleanup (Stefan) -malidp: Make vtable static (Ben) Cc: Ben Dooks Cc: Stefan Mavrodiev Ben Dooks (Codethink) (1): drm/arm/mali: make malidp_mw_connector_helper_funcs static Stefan Mavrodiev (1): drm/sun4i: hdmi: Remove duplicate cleanup calls drivers/gpu/drm/arm/malidp_mw.c| 2 +- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next-fixes
Hi Dave and Daniel, I realized there were a few leftovers from -next-fixes which should find their way to drm-fixes. Sean drm-misc-next-fixes-2019-12-12: -mgag200: more startadd mitigation (Thomas) -panfrost: devfreq fix + several memory fixes (Steven, Boris) Cc: Boris Brezillon Cc: Steven Price Cc: Thomas Zimmermann Cheers, Sean The following changes since commit e5a6ca27eb72c67533ddfc11c06df84beaa167fa: drm/dp_mst: Correct the bug in drm_dp_update_payload_part1() (2019-12-04 15:31:16 -0500) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2019-12-12 for you to fetch changes up to 0a5239985a3bc084738851afdf3fceb7d5651b0c: drm/panfrost: Open/close the perfcnt BO (2019-12-06 11:06:20 -0600) -mgag200: more startadd mitigation (Thomas) -panfrost: devfreq fix + several memory fixes (Steven, Boris) Cc: Boris Brezillon Cc: Steven Price Cc: Thomas Zimmermann Boris Brezillon (4): drm/panfrost: Fix a race in panfrost_ioctl_madvise() drm/panfrost: Fix a BO leak in panfrost_ioctl_mmap_bo() drm/panfrost: Fix a race in panfrost_gem_free_object() drm/panfrost: Open/close the perfcnt BO Steven Price (1): drm/panfrost: devfreq: Round frequencies to OPPs Thomas Zimmermann (1): drm/mgag200: Flag all G200 SE A machines as broken wrt drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +-- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 19 ++- drivers/gpu/drm/panfrost/panfrost_drv.c | 20 +++- drivers/gpu/drm/panfrost/panfrost_gem.c | 19 --- drivers/gpu/drm/panfrost/panfrost_gem.h | 4 drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 23 ++- drivers/gpu/drm/panfrost/panfrost_perfcnt.h | 2 +- 7 files changed, 49 insertions(+), 41 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hi Dave and Daniel, A couple patches from -misc-fixes. drm-misc-fixes-2019-12-11: - Expand dma-buf MAINTAINER scope - Fix mode matching for drivers not using picture_aspect_ratio Cheers, Sean The following changes since commit 6645d42d79d33e8a9fe262660a75d5f4556bbea9: dma-buf: Fix memory leak in sync_file_merge() (2019-11-25 10:21:33 +0100) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2019-12-11 for you to fetch changes up to 78baee8d3b976a6a6a2c208e3a36d3f1e6297e6c: MAINTAINERS: Match on dma_buf|fence|resv anywhere (2019-12-10 11:26:19 +0100) - Expand dma-buf MAINTAINER scope - Fix mode matching for drivers not using picture_aspect_ratio Daniel Vetter (1): MAINTAINERS: Match on dma_buf|fence|resv anywhere Martin Blumenstingl (1): drm: meson: venc: cvbs: fix CVBS mode matching MAINTAINERS | 1 + drivers/gpu/drm/meson/meson_venc_cvbs.c | 48 ++--- 2 files changed, 28 insertions(+), 21 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next-fixes
Hi Dave & Daniel, A handful of fixes this week, all straightforward. drm-misc-next-fixes-2019-12-04: mgag200- Fix hw with broken 'startadd' support (Thomas) mst- Avoid skipping payloads in payload deletion loop (Wayne) omap- Fix dma_addr refcounting (Tomi) Cc: Wayne Lin Cc: Tomi Valkeinen Cc: Thomas Zimmermann Cheers, Sean The following changes since commit 9786b65bc61acec63f923978c75e707afbb74bc7: drm/ttm: fix mmap refcounting (2019-11-15 08:00:08 +0100) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2019-12-04 for you to fetch changes up to e5a6ca27eb72c67533ddfc11c06df84beaa167fa: drm/dp_mst: Correct the bug in drm_dp_update_payload_part1() (2019-12-04 15:31:16 -0500) mgag200- Fix hw with broken 'startadd' support (Thomas) mst- Avoid skipping payloads in payload deletion loop (Wayne) omap- Fix dma_addr refcounting (Tomi) Cc: Wayne Lin Cc: Tomi Valkeinen Cc: Thomas Zimmermann Guenter Roeck (1): drm/dp_mst: Fix build on systems with STACKTRACE_SUPPORT=n Thomas Zimmermann (3): drm/mgag200: Extract device type from flags drm/mgag200: Store flags from PCI driver data in device structure drm/mgag200: Add workaround for HW that does not support 'startadd' Tomi Valkeinen (1): drm/omap: fix dma_addr refcounting Wayne Lin (1): drm/dp_mst: Correct the bug in drm_dp_update_payload_part1() drivers/gpu/drm/Kconfig| 1 + drivers/gpu/drm/drm_dp_mst_topology.c | 6 -- drivers/gpu/drm/mgag200/mgag200_drv.c | 36 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 18 + drivers/gpu/drm/mgag200/mgag200_main.c | 3 ++- drivers/gpu/drm/omapdrm/omap_gem.c | 4 6 files changed, 64 insertions(+), 4 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next-fixes
Hi Dave & Daniel, Just one patch this week which fixes the bo refcounts when mmap'ing ttm buffers using the new ->mmap() hook. drm-misc-next-fixes-2019-11-20: - Fix ttm bo refcnt when using the new gem obj mmap hook (Thomas) Cc: Gerd Hoffmann Cheers, Sean The following changes since commit a64fc11b9a520c55ca34d82e5ca32274f49b6b15: drm/msm: fix memleak on release (2019-11-13 15:34:15 -0500) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2019-11-20 for you to fetch changes up to 9786b65bc61acec63f923978c75e707afbb74bc7: drm/ttm: fix mmap refcounting (2019-11-15 08:00:08 +0100) - Fix ttm bo refcnt when using the new gem obj mmap hook (Thomas) Cc: Gerd Hoffmann Gerd Hoffmann (1): drm/ttm: fix mmap refcounting drivers/gpu/drm/drm_gem.c| 24 ++-- drivers/gpu/drm/drm_gem_ttm_helper.c | 13 - 2 files changed, 26 insertions(+), 11 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next-fixes
Hi Dave & Daniel, Just one msm patch this week. Looks like -misc is going to be perfect when merge window rolls around :-) drm-misc-next-fixes-2019-11-13: - Fix memory leak in gpu debugfs node's release (Johan) Cc: Johan Hovold Cheers, Sean The following changes since commit 3ca3a9eab7085b3c938b5d088c3020269cfecdc8: Merge tag 'drm-misc-next-fixes-2019-11-06' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (2019-11-08 16:48:22 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2019-11-13 for you to fetch changes up to a64fc11b9a520c55ca34d82e5ca32274f49b6b15: drm/msm: fix memleak on release (2019-11-13 15:34:15 -0500) - Fix memory leak in gpu debugfs node's release (Johan) Cc: Johan Hovold Johan Hovold (1): drm/msm: fix memleak on release drivers/gpu/drm/msm/msm_debugfs.c | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next-fixes
Hi Dave & Daniel, drm-misc-next-fixes is open and just a couple of patches this week. drm-misc-next-fixes-2019-11-06: -msm: Fix up a6xx debugbus register names (Sharat) -mst: Avoid u64 division (Sean) Cc: Sharat Masetty Cc: Sean Paul Cheers, Sean The following changes since commit cea35f5ad5ffac06ea29e0d7a7f748683e1f1b7d: drm/i915: Don't select BROKEN (2019-11-06 05:46:04 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2019-11-06 for you to fetch changes up to b149cbfeecaa2b2870d2c4f878382a024e6e4975: drm/mst: Fix up u64 division (2019-11-06 15:20:37 -0500) -msm: Fix up a6xx debugbus register names (Sharat) -mst: Avoid u64 division (Sean) Cc: Sharat Masetty Cc: Sean Paul ---- Sean Paul (1): drm/mst: Fix up u64 division Sharat Masetty (1): drm: msm: a6xx: fix debug bus register configuration drivers/gpu/drm/drm_dp_mst_topology.c | 4 ++-- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 24 2 files changed, 14 insertions(+), 14 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next
Hi Dave & Daniel, Here's the last -misc-next pull request for 5.5. Lots of refactoring going on this week which results in a negative diffstat. Only thing to highlight is the dma-buf heap introduction and revert, which you are already aware of, so hopefully no other surprises here. drm-misc-next-2019-10-31: drm-misc-next for 5.5: UAPI Changes: -dma-buf: Introduce and revert dma-buf heap (Andrew/John/Sean) Cross-subsystem Changes: - None Core Changes: -dma-buf: add dynamic mapping to allow exporters to choose dma_resv lock state on mmap/munmap (Christian) -vram: add prepare/cleanup fb helpers to vram helpers (Thomas) -ttm: always keep bo's on the lru + ttm cleanups (Christian) -sched: allow a free_job routine to sleep (Steven) -fb_helper: remove unused drm_fb_helper_defio_init() (Thomas) Driver Changes: -bochs/hibmc/vboxvideo: Use new vram helpers for prepare/cleanup fb (Thomas) -amdgpu: Implement dma-buf import/export without drm helpers (Christian) -panfrost: Simplify devfreq integration in driver (Steven) Cc: Christian König Cc: Thomas Zimmermann Cc: Steven Price Cc: Andrew F. Davis Cc: John Stultz Cc: Sean Paul Cheers, Sean The following changes since commit 9a42c7c647a9ad0f7ebb147a52eda3dcb7c84292: drm/tegra: Move drm_dp_link helpers to Tegra DRM (2019-10-23 18:22:10 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2019-10-31 for you to fetch changes up to fae7d7d5f374eadbb0b5dd31b39162e7176e9c3d: Revert "dma-buf: Add dma-buf heaps framework" (2019-10-30 16:41:49 -0400) drm-misc-next for 5.5: UAPI Changes: -dma-buf: Introduce and revert dma-buf heap (Andrew/John/Sean) Cross-subsystem Changes: - None Core Changes: -dma-buf: add dynamic mapping to allow exporters to choose dma_resv lock state on mmap/munmap (Christian) -vram: add prepare/cleanup fb helpers to vram helpers (Thomas) -ttm: always keep bo's on the lru + ttm cleanups (Christian) -sched: allow a free_job routine to sleep (Steven) -fb_helper: remove unused drm_fb_helper_defio_init() (Thomas) Driver Changes: -bochs/hibmc/vboxvideo: Use new vram helpers for prepare/cleanup fb (Thomas) -amdgpu: Implement dma-buf import/export without drm helpers (Christian) -panfrost: Simplify devfreq integration in driver (Steven) Cc: Christian König Cc: Thomas Zimmermann Cc: Steven Price Cc: Andrew F. Davis Cc: John Stultz Cc: Sean Paul Andrew F. Davis (1): dma-buf: Add dma-buf heaps framework Anna Karas (1): doc: drm: Update references to previously renamed files Bhanusree (3): drm/gpu: Add comment for memory barrier drm/gpu: Fix Missing blank line after declarations drm/gpu: Fix Memory barrier without comment Issue Christian König (10): dma-buf: change DMA-buf locking convention v3 dma-buf: stop using the dmabuf->lock so much v2 drm/ttm, drm/vmwgfx: move cpu_writers handling into vmwgfx drm/ttm: always keep BOs on the LRU drm/ttm: remove pointers to globals drm/ttm: use the parent resv for ghost objects v3 drm/qxl: stop using TTM to call driver internal functions drm/ttm: stop exporting ttm_mem_io_* functions drm/amdgpu: add independent DMA-buf export v8 drm/amdgpu: add independent DMA-buf import v9 Daniel Vetter (1): drm/simple-kms: Standardize arguments for callbacks Geert Uytterhoeven (1): drm: Spelling s/connet/connect/ Hans de Goede (1): drm/vboxvideo: Use drm_gem_fb_create_with_dirty instead of drm_gem_fb_create John Stultz (4): dma-buf: heaps: Add heap helpers dma-buf: heaps: Add system heap to dmabuf heaps dma-buf: heaps: Add CMA heap to dmabuf heaps kselftests: Add dma-heap test Rob Herring (1): drm/gem: Fix mmap fake offset handling for drm_gem_object_funcs.mmap Sean Paul (5): Revert "kselftests: Add dma-heap test" Revert "dma-buf: heaps: Add CMA heap to dmabuf heaps" Revert "dma-buf: heaps: Add system heap to dmabuf heaps" Revert "dma-buf: heaps: Add heap helpers" Revert "dma-buf: Add dma-buf heaps framework" Steven Price (3): drm: Don't free jobs in wait_event_interruptible() drm/panfrost: Use generic code for devfreq drm/panfrost: Simplify devfreq utilisation tracking Thomas Zimmermann (6): drm/vram-helpers: Add helpers for prepare_fb() and cleanup_fb() drm/bochs: Replace prepare_fb()/cleanup_fb() with GEM VRAM helpers drm/hisilicon/hibmc: Use GEM VRAM's prepare_fb() and cleanup_fb() helpers drm/vboxvideo: Replace prepare_fb()/cleanup_fb() with GEM VRAM helpers drm/fb-helper: Remove drm_fb_helper_defio_init() and update docs drm/todo: Clarify situation around fbdev and defio Wambui Karuga (1): dr
[PULL] drm-misc-next
Hi Dave & Daniel, Here's the pull for last week and this week. As you know we had some trouble with the OMAP_BO* additions last week, those have since been reverted. Speaking of UAPI, we have a new DRM_SYNCOBJ_QUERY_FLAGS_LAST_SUBMITTED flag from AMD to get the last signaled timeline value from the kernel. It's used by the AMD implementation of timeline semaphores [1]. The kernel patch was reviewed by Lionel, but the userspace portion was not reviewed in the open (and not even posted before the kernel patch was reviewed). Overall the process was lacking on this submission (as well as the commit message and the kerneldoc), but the addition itself seems fine. Other than that, relatively quiet week overall. [1]- https://github.com/GPUOpen-Drivers/pal/commit/66e78b997748d03d77e1d706c10f1f17e18e5654 drm-misc-next-2019-10-24-2: drm-misc-next for 5.5: UAPI Changes: -syncobj: allow querying the last submitted timeline value (David) -fourcc: explicitly defineDRM_FORMAT_BIG_ENDIAN as unsigned (Adam) -omap: revert the OMAP_BO_* flags that were added -- no userspace (Sean) Cross-subsystem Changes: -MAINTAINERS: add Mihail as komeda co-maintainer (Mihail) Core Changes: -edid: a few cleanups, add AVI infoframe bar info (Ville) -todo: remove i915 device_link item and add difficulty levels (Daniel) -dp_helpers: add a few new helpers to parse dpcd (Thierry) Driver Changes: -gma500: fix a few memory disclosure leaks (Kangjie) -qxl: convert to use the new drm_gem_object_funcs.mmap (Gerd) -various: open code dp_link helpers in preparation for helper removal (Thierry) Cc: Chunming Zhou Cc: Adam Jackson Cc: Sean Paul Cc: Ville Syrjälä Cc: Kangjie Lu Cc: Mihail Atanassov Cc: Daniel Vetter Cc: Thierry Reding Cheers, Sean The following changes since commit 2e79e22e092acd55da0b2db066e4826d7d152c41: Merge v5.4-rc4 into drm-next (2019-10-23 12:10:05 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2019-10-24-2 for you to fetch changes up to 9a42c7c647a9ad0f7ebb147a52eda3dcb7c84292: drm/tegra: Move drm_dp_link helpers to Tegra DRM (2019-10-23 18:22:10 +0200) drm-misc-next for 5.5: UAPI Changes: -syncobj: allow querying the last submitted timeline value (David) -fourcc: explicitly defineDRM_FORMAT_BIG_ENDIAN as unsigned (Adam) -omap: revert the OMAP_BO_* flags that were added -- no userspace (Sean) Cross-subsystem Changes: -MAINTAINERS: add Mihail as komeda co-maintainer (Mihail) Core Changes: -edid: a few cleanups, add AVI infoframe bar info (Ville) -todo: remove i915 device_link item and add difficulty levels (Daniel) -dp_helpers: add a few new helpers to parse dpcd (Thierry) Driver Changes: -gma500: fix a few memory disclosure leaks (Kangjie) -qxl: convert to use the new drm_gem_object_funcs.mmap (Gerd) -various: open code dp_link helpers in preparation for helper removal (Thierry) Cc: Chunming Zhou Cc: Adam Jackson Cc: Sean Paul Cc: Ville Syrjälä Cc: Kangjie Lu Cc: Mihail Atanassov Cc: Daniel Vetter Cc: Thierry Reding Adam Jackson (1): drm/fourcc: Fix undefined left shift in DRM_FORMAT_BIG_ENDIAN macros Andy Shevchenko (1): drm/mipi_dbi: Use simple right shift instead of double negation Ben Dooks (3): drm/scheduler: make unexported items static drm/rockchip: include rockchip_drm_drv.h drm/rockchip: make rockchip_gem_alloc_object static Ben Dooks (Codethink) (1): drm/arm: make undeclared items static Brian Masney (1): drm/bridge: analogix-anx78xx: add support for 7808 addresses Chunming Zhou (1): drm/syncobj: extend syncobj query ability v3 Colin Ian King (1): drm/komeda: remove redundant assignment to pointer disable_done Daniel Kurtz (1): drm/bridge: dw-hdmi: Restore audio when setting a mode Daniel Vetter (4): drm/dp-mst: Drop connection_mutex check drm/doc: Drop misleading comment on drm_mode_config_cleanup drm/todo: Remove i915 device_link task drm/todo: Add levels Dariusz Marcinkiewicz (1): drm: tda998x: use cec_notifier_conn_(un)register Douglas Anderson (1): drm/rockchip: Round up _before_ giving to the clock framework Ezequiel Garcia (2): dt-bindings: display: rockchip: document VOP gamma LUT address drm/rockchip: Add optional support for CRTC gamma LUT Gerd Hoffmann (18): drm: add mmap() to drm_gem_object_funcs drm/shmem: switch shmem helper to _gem_object_funcs.mmap drm/shmem: drop VM_DONTDUMP drm/shmem: drop VM_IO drm/shmem: drop DEFINE_DRM_GEM_SHMEM_FOPS drm/ttm: factor out ttm_bo_mmap_vma_setup drm/ttm: rename ttm_fbdev_mmap drm/ttm: add drm_gem_ttm_mmap() drm/vram: switch vram helper to _gem_object_funcs.mmap() drm/vram: drop verify_access drm/vram: drop DRM_VRAM_MM_FILE_OPERATIONS drm/qxl:
Re: [PULL] drm-misc-next
On Mon, Oct 21, 2019 at 4:11 AM Tomi Valkeinen wrote: > > Hi, > > On 18/10/2019 23:11, Sean Paul wrote: > > On Fri, Oct 18, 2019 at 9:46 AM Tomi Valkeinen > > wrote: > >> > >> Hi Sean, > >> > >> On 17/10/2019 22:26, Sean Paul wrote: > >> > >>> concern for those. The omap OMAP_BO_MEM_* changes though I don't think > >>> have > >>> really reached non-TI eyes. There's no link in the commit message to a > >>> UAPI > >>> implementation and the only reference I could find is libkmsxx which can > >>> set > >>> them through the python bindings. Since this is TI-specific gunk in > >>> TI-specific > >>> headers I'm inclined to let it pass, but I would have liked to have this > >>> conversation upfront. I figured I'd call this out so you have final say. > >> > >> There was some discussion about that a few years back when I initially > >> sent the patches, but now that I look, the discussion died before really > >> even starting. > >> > >> This is what I said about userspace implementation: > >> > >>> Yes, unfortunately that is not going to happen. I don't see how this > >>> could be used in a generic system like Weston or X. It's meant for very > >>> specific use cases, where you know exactly the requirements of your > >>> application and the capabilities of the whole system, and optimize based > >>> on that. > > > > Thanks for the context, Tomi. > > > > Indeed it looks like the discussion died, but Laurent still brought up > > the u/s requirement and the patch was effectively dead until Daniel or > > Dave weighed in. I'd expect at least some outreach before pushing the > > patch directly 2+ years later. Has anything changed since then? > > There were new review rounds for the series this summer & autumn, but > no, nothing else. I haven't specifically pinged anyone about the UAPI > changes. > > This series introduces three new flags to an already existing UAPI, and, > for whatever reason, this didn't register to me as a new UAPI, even if > Laurent asked about it some years back. > > So, my mistake. > > The flags are added in a single patch, so I can easily push a revert for > that if this patch is not acceptable. The rest of the series is cleanup. > I'll wait for Dave or Daniel to weigh in on whether they want to take this, otherwise I'll revert before sending the next pull and we can have this conversation on the review. > >> I know this feature is used by customers, but I don't have access to > >> their applications. > > > > Unfortunately, and as you know, that is insufficient/irrelevant for > > introducing new UAPI. So the question is if the libkmsxx bindings > > constitute opensource userspace, it's really thin IMO. > > Ok. Well, I know and understand the general rule here. But perhaps I > haven't taken it as strictly as needed. > > I have to say I don't quite understand why this rule would be always > strictly held, though. > It's strictly held because once you start accepting the harmless/isolated features every driver has, you end up with untestable bloat sprinkled everywhere. > These flags, for example, what should we do with them? > - They provide a proven, real use-case benefit. > - They are specific to SoCs with OMAP DSS and DMM IPs. > - They are relatively simple. > - All the details, including the details about the HW, are public. > - Using them makes sense only in cases where you are tuning your system > to your application, and you must know the resource needs of all the > apps in your system. So they cannot really be used in any generic setup, > or at least I have no idea how. > > Does the history and experience say that such specific case as above > cases don't really exist, and we can always have a generic UAPI (or, in > worst case, a device specific UAPI) which can be used from X/Weston/or-such? > We don't need generic userspace to be able to make use of it, but at least some oss project should find it useful. Otherwise why are we maintaining code that no one in the open source community cares about? How do we test it when the closed source implementations have been abandoned? > Or do things like above exist, but they need to carried in vendors' kernels? That's really the problem. _Everybody_ has features they would describe as above, so where do we draw the line? Sean > > Tomi > > -- > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki > ___ > dri-devel mailing list > dri-de...@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hi Dave/Daniel, Guest-Maxime here with a drm-misc-fixes pull. Interesting stuff has been highlighted below in the tag. I realized that we have Steven's stopped job patch in both -next and -fixes, so we'll need to watch out for conflicts when they come together. drm-misc-fixes-2019-10-17: -dma-resv: Change shared_count to post-increment to fix lima crash (Qiang) -ttm: A couple fixes related to lifetime and restore prefault behavior (Christian & Thomas) -panfrost: Fill in missing feature reg values and fix stoppedjob timeouts (Steven) Cc: Qiang Yu Cc: Thomas Hellstrom Cc: Christian König Cc: Steven Price Cheers, Sean The following changes since commit fd70c7755bf0172ddd33b558aef69c322de3b5cf: drm/bridge: tc358767: fix max_tu_symbol value (2019-10-10 11:15:45 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2019-10-17 for you to fetch changes up to 5b3ec8134f5f9fa1ed0a538441a495521078bbee: drm/panfrost: Handle resetting on timeout better (2019-10-15 11:38:22 -0500) -dma-resv: Change shared_count to post-increment to fix lima crash (Qiang) -ttm: A couple fixes related to lifetime and restore prefault behavior (Christian & Thomas) -panfrost: Fill in missing feature reg values and fix stoppedjob timeouts (Steven) Cc: Qiang Yu Cc: Thomas Hellstrom Cc: Christian König Cc: Steven Price Christian König (2): drm/ttm: fix busy reference in ttm_mem_evict_first drm/ttm: fix handling in ttm_bo_add_mem_to_lru Jeffrey Hugo (1): drm/msm/dsi: Implement reset correctly Kai-Heng Feng (1): drm/edid: Add 6 bpc quirk for SDC panel in Lenovo G50 Qiang Yu (1): dma-buf/resv: fix exclusive fence get Steven Price (2): drm/panfrost: Add missing GPU feature registers drm/panfrost: Handle resetting on timeout better Thomas Hellstrom (1): drm/ttm: Restore ttm prefaulting Ulf Magnusson (1): drm/tiny: Kconfig: Remove always-y THERMAL dep. from TINYDRM_REPAPER drivers/dma-buf/dma-resv.c | 2 +- drivers/gpu/drm/drm_edid.c | 3 +++ drivers/gpu/drm/msm/dsi/dsi_host.c | 6 -- drivers/gpu/drm/panfrost/panfrost_gpu.c | 3 +++ drivers/gpu/drm/panfrost/panfrost_job.c | 16 +++- drivers/gpu/drm/tiny/Kconfig| 1 - drivers/gpu/drm/ttm/ttm_bo.c| 9 + drivers/gpu/drm/ttm/ttm_bo_vm.c | 16 +++- 8 files changed, 34 insertions(+), 22 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next
er Cc: Robert Chiras Cc: Thomas Zimmermann Cc: Lowry Li Cc: Gerd Hoffmann Cc: Qiang Yu Cc: Tomi Valkeinen Cc: Ezequiel Garcia Cc: Jean-Jacques Hiblot Ben Dooks (3): drm/scheduler: make unexported items static drm/rockchip: include rockchip_drm_drv.h drm/rockchip: make rockchip_gem_alloc_object static Brian Masney (1): drm/bridge: analogix-anx78xx: add support for 7808 addresses Colin Ian King (1): drm/komeda: remove redundant assignment to pointer disable_done Daniel Kurtz (1): drm/bridge: dw-hdmi: Restore audio when setting a mode Daniel Vetter (1): drm/dp-mst: Drop connection_mutex check Douglas Anderson (1): drm/rockchip: Round up _before_ giving to the clock framework Ezequiel Garcia (2): dt-bindings: display: rockchip: document VOP gamma LUT address drm/rockchip: Add optional support for CRTC gamma LUT Gerd Hoffmann (11): drm: add mmap() to drm_gem_object_funcs drm/shmem: switch shmem helper to _gem_object_funcs.mmap drm/shmem: drop VM_DONTDUMP drm/shmem: drop VM_IO drm/shmem: drop DEFINE_DRM_GEM_SHMEM_FOPS drm/ttm: factor out ttm_bo_mmap_vma_setup drm/ttm: rename ttm_fbdev_mmap drm/ttm: add drm_gem_ttm_mmap() drm/vram: switch vram helper to _gem_object_funcs.mmap() drm/vram: drop verify_access drm/vram: drop DRM_VRAM_MM_FILE_OPERATIONS Guido Günther (1): drm/mxsfb: Read bus flags from bridge if present Jean-Jacques Hiblot (1): drm/omap: use refcount API to track the number of users of dma_addr Jonas Karlman (4): drm/bridge: dw-hdmi: Add Dynamic Range and Mastering InfoFrame support drm/rockchip: Enable DRM InfoFrame support on RK3328 and RK3399 drm/meson: Enable DRM InfoFrame support on GXL, GXM and G12A drm/sun4i: Enable DRM InfoFrame support on H6 Lee Shawn C (1): drm/edid: Select DMT timing if EDID's display feature not support GTF Lowry Li (Arm Technology China) (4): drm/komeda: Add line size support drm/komeda: Adds layer horizontal input size limitation check for D71 drm/komeda: Set output color depth for output drm/komeda: Adds output-color format support Lucas De Marchi (1): drm/dp-mst: fix warning on unused var Maarten Lankhorst (1): drm/plane: Clarify our expectations for src/dst rectangles Markus Elfring (1): drm/rockchip: rk3066_hdmi: Use devm_platform_ioremap_resource() in rk3066_hdmi_bind() Nickey Yang (1): drm/rockchip: vop: add the definition of dclk_pol Oleg Vasilev (1): drm/vkms: prime import support Qiang Yu (3): drm/lima: use drm_gem_shmem_helpers drm/lima: use drm_gem_(un)lock_reservations drm/lima: add __GFP_NOWARN flag to all dma_alloc_wc Robert Chiras (1): drm/mxsfb: Update mxsfb to support a bridge Rodrigo Siqueira (3): drm: Add link training repeaters addresses drm/drm_vblank: Change EINVAL by the correct errno drm: Add LT-tunable PHY repeater mode operations Ronald Tschalär (1): drm/bridge: sil_sii8620: make remote control optional. Sam Ravnborg (2): drm_dp_cec: drop use of drmP.h drm: delete drmP.h + drm_os_linux.h Sean Paul (1): Documentation: Fix warning in drm-kms-helpers.rst Sebastian Andrzej Siewior (1): drm/i810: Refer to `PREEMPTION' in comment Simon Ser (1): drm: two planes with the same zpos have undefined ordering Steven Price (3): drm/panfrost: Remove NULL check for regulator drm/panfrost: Handle resetting on timeout better drm/panfrost: Remove commented out call to panfrost_core_dump Thomas Zimmermann (5): drm/vboxvideo: Switch to generic fbdev emulation drm/vboxvideo: Switch to drm_atomic_helper_dirty_fb() drm/vboxvideo: Replace struct vram_framebuffer with generic implemenation drm: Add TODO item for fbdev driver conversion drm/cirrus: Remove obsolete header file Tomi Valkeinen (7): drm/omap: add omap_gem_unpin_locked() drm/omap: accept NULL for dma_addr in omap_gem_pin drm/omap: cleanup OMAP_BO flags drm/omap: remove OMAP_BO_TILED define drm/omap: cleanup OMAP_BO_SCANOUT use drm/omap: add omap_gem_validate_flags() drm/omap: add OMAP_BO flags to affect buffer allocation Ville Syrjälä (1): drm/atmel-hlcdc: Use swap() where appropriate Wen He (2): drm/arm/mali-dp: Add display QoS interface configuration for Mali DP500 dt/bindings: display: Add optional property node define for Mali DP500 Wolfram Sang (1): gpu: drm: bridge: sii9234: convert to devm_i2c_new_dummy_device YueHaibing (2): drm/vkms: Remove duplicated include from vkms_drv.c drm/qxl: Fix randbuild error zhengbin (4): drm/omap: Remove set but not used variable 'plane' drm/omap: Remove set but not used variable 'tclk_trail' drm/omap: Remove set but not used
[PULL] drm-misc-next
printer()
drm/dp_mst: Combine redundant cases in drm_dp_encode_sideband_req()
drm/dp_mst: Add sideband down request tracing + selftests
drm/dp_mst: Refactor drm_dp_send_enum_path_resources
drm/dp_mst: Remove huge conditional in drm_dp_mst_handle_up_req()
drm/dp_mst: Constify guid in drm_dp_get_mst_branch_by_guid()
drm/dp_mst: Refactor drm_dp_mst_handle_up_req()
drm/dp_mst: Refactor drm_dp_mst_handle_down_rep()
drm/dp_mst: Cleanup drm_dp_send_link_address() a bit
drm/encoder: Fix possible_clones documentation
drm/encoder: Fix possible_crtcs documentation
drm/encoder: Don't raise voice in drm_encoder_mask() documentation
drm/dp_mst: Destroy topology_mgr mutexes
drm/dp_mst: Rename drm_dp_add_port and drm_dp_update_port
drm/dp_mst: Remove lies in {up, down}_rep_recv documentation
Markus Elfring (1):
drm/bridge/synopsys: dsi: Use devm_platform_ioremap_resource() in
__dw_mipi_dsi_probe()
Matt Roper (1):
drm: Destroy the correct mutex name in drm_dp_mst_topology_mgr_destroy
Matthias Kaehlcke (1):
drm/bridge: dw-hdmi: Refuse DDC/CI transfers on the internal I2C
controller
Maxime Ripard (3):
MAINTAINERS: Update Allwinner DRM drivers entry
MAINTAINERS: Add Jernej Škrabec as a reviewer for DE2
Merge drm/drm-next into drm-misc-next
Mihail Atanassov (4):
drm/komeda: Add ACLK rate to sysfs
drm/komeda: Remove in-code use of ifdef
drm/komeda: Use IRQ_RETVAL shorthand in d71_irq_handler
drm/komeda: Workaround for broken FLIP_COMPLETE timestamps
Neil Armstrong (3):
drm/meson: dw_hdmi: add resume/suspend hooks
drm/meson: add resume/suspend hooks
drm/meson: vclk: use the correct G12A frac max value
Nishka Dasgupta (1):
drm/tilcdc: plane: Make structure tilcdc_plane_funcs constant
Ondrej Jirman (1):
drm: Remove redundant of_device_is_available check
Peter Griffin (1):
drm/lima: Add support for multiple reset lines
Qiang Yu (1):
dma-buf/resv: fix exclusive fence get
Raymond Smith (1):
drm/fourcc: Add Arm 16x16 block modifier
Rob Herring (5):
MAINTAINERS: Add Steven and Alyssa as panfrost reviewers
drm/panfrost: Fix possible suspend in panfrost_remove
drm/shmem: Do dma_unmap_sg before purging pages
drm/shmem: Use mutex_trylock in drm_gem_shmem_purge
drm/panfrost: Use mutex_trylock in panfrost_gem_purge
Sean Paul (3):
drm: mst: Fix query_payload ack reply struct
Documentation/gpu: Fix no structured comments warning for
drm_gem_ttm_helper.h
drm: damage_helper: Fix race checking plane->state->fb
Stephen Rothwell (1):
drm/virtio: module_param_named() requires linux/moduleparam.h
Steven Price (1):
drm/panfrost: Add missing check for pfdev->regulator
Thierry Reding (1):
drm/prime: Remove duplicate forward declaration
Thomas Zimmermann (24):
drm/vram: Add kmap ref-counting to GEM VRAM objects
drm/vram: Acquire lock only once per call to vmap()/vunmap()
drm/vram: Add infrastructure for move_notify()
drm/vram: Implement lazy unmapping for GEM VRAM buffers
drm/vram: Move VRAM memory manager to GEM VRAM implementation
drm/vram: Have VRAM MM call GEM VRAM functions directly
drm/vram: Unexport internal functions of VRAM MM
drm/vram: Unconditonally set BO call-back functions
drm/vram: Provide vmap and vunmap operations for GEM VRAM objects
drm/ast: Use drm_gem_vram_{vmap,vunmap}() to map cursor source BO
drm/mgag200: Use drm_gem_vram_{vmap, vunmap}() to map cursor source BO
drm/vram: Support top-down placement flag
drm/ast: Don't call ast_show_cursor() from ast_cursor_move()
drm/ast: Move ast_{show,hide}_cursor() within source file
drm/ast: Move cursor update code to ast_show_cursor()
drm/ast: Move cursor offset swapping into ast_show_cursor()
drm/ast: Allocate cursor BOs at high end of video memory
drm/mgag200: Rename cursor functions to use mgag200_ prefix
drm/mgag200: Add init and fini functions for cursor handling
drm/mgag200: Add separate move-cursor function
drm/mgag200: Move cursor-image update to mgag200_show_cursor()
drm/mgag200: Move cursor BO swapping into mgag200_show_cursor()
drm/mgag200: Reserve video memory for cursor plane
drm/mgag200: Allocate cursor BOs at high end of video memory
Tomi Valkeinen (5):
drm/omap: drop unneeded locking from mgr_fld_write()
drm/omap: avoid copy in mgr_fld_read/write
drm/omap: fix missing scaler pixel fmt limitations
drm/omap: hdmi5: automatically choose limited/full range output
drm/omap: hdmi4: fix use of uninitialized var
Ulf Magnusson (1):
drm/tiny: Kconfig: Remove always-y THERMAL dep. from TINYDRM_REPAPER
Ville Syrjälä (15):
drm: Add drm_modeset_lock_assert_held()
drm/atomic-helper: Make crtc helper funcs optional
drm/dp: Add definitons fo
[PULL] drm-misc-fixes
Hi all, Substitute-Maarten here for another pull request. This week is pretty light, as you would expect. I merged a leftover nugget from drm-misc-next that didn't make -rc1 and am abusing covering for Maarten by sneaking in a handful of msm changes to avoid having to send 2 pulls. drm-misc-fixes-2019-07-25: - pick up the cmdline fix which missed the merge window (Dmitry) - a handful of msm fixes so i don't have to spin up msm-fixes (Various) - fix -Wunused-but-set-variable warning in drm_framebuffer (Qian) Cc: Dmitry Osipenko Cc: Rob Clark Cc: Qian Cai Cheers, Sean The following changes since commit 5f9e832c137075045d15cd6899ab0505cfb2ca4b: Linus 5.3-rc1 (2019-07-21 14:05:38 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2019-07-25 for you to fetch changes up to bbb6fc43f131f77fcb7ae8081f6d7c51396a2120: drm: silence variable 'conn' set but not used (2019-07-22 16:04:53 -0400) - pick up the cmdline fix which missed the merge window (Dmitry) - a handful of msm fixes so i don't have to spin up msm-fixes (Various) - fix -Wunused-but-set-variable warning in drm_framebuffer (Qian) Cc: Dmitry Osipenko Cc: Rob Clark Cc: Qian Cai Brian Masney (1): drm/msm: correct NULL pointer dereference in context_init Dmitry Osipenko (1): drm/modes: Don't apply cmdline's rotation if it wasn't specified Qian Cai (1): drm: silence variable 'conn' set but not used Rob Clark (1): drm/msm: stop abusing dma_map/unmap for cache Sean Paul (1): Merge drm-misc-next-fixes-2019-07-18 into drm-misc-fixes Shubhashree Dhar (1): drm/msm/dpu: Correct dpu encoder spinlock initialization drivers/gpu/drm/drm_client_modeset.c| 2 +- drivers/gpu/drm/drm_framebuffer.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 3 +-- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/msm/msm_gem.c | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next-fixes
Hi team, I am Guest-Maarten this week and next! Not exactly a quiet last PR for the merge window, but I think this is right in line with how things have gone over the rest of 5.3. Although there's more volume than we'd like, I don't think there's anything here that is contraversial. So, welcome komeda to -misc, and happy pulling :-) drm-misc-next-fixes-2019-07-18: - Rip out komeda internal properties and move the driver to -misc (Daniel) - Handle a couple edge cases with incomplete/incorrect cmdline modes (Dmitry) - Fix some silly warnings (Arnd) - Add orientation quirk for newer GPD MicroPCs (Hans) Cc: Daniel Vetter Cc: Liviu Dudau Cc: Dmitry Osipenko Cc: Arnd Bergmann Cc: Hans de Goede Cheers, Sean The following changes since commit daed277e4d5ace0883d30b9be245d35c46289f49: Merge tag 'topic/remove-fbcon-notifiers-2019-06-26' into drm-misc-next-fixes (2019-06-26 12:26:34 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2019-07-18 for you to fetch changes up to 7aaddd96d5febcf5b24357a326b3038d49a20532: drm/modes: Don't apply cmdline's rotation if it wasn't specified (2019-07-16 10:34:38 +0200) - Rip out komeda internal properties and move the driver to -misc (Daniel) - Handle a couple edge cases with incomplete/incorrect cmdline modes (Dmitry) - Fix some silly warnings (Arnd) - Add orientation quirk for newer GPD MicroPCs (Hans) Cc: Daniel Vetter Cc: Liviu Dudau Cc: Dmitry Osipenko Cc: Arnd Bergmann Cc: Hans de Goede Arnd Bergmann (2): drm/selftests: reduce stack usage drm: connector: remove bogus NULL check Daniel Vetter (5): drm/komeda: Remove clock ratio property drm/komeda: remove slave_planes property drm/komeda: remove img_enhancement property drm/komeda: Remove layer_split property MAINTAINERS: maintain drm/arm drivers in drm-misc for now Dmitry Osipenko (2): drm/modes: Skip invalid cmdline mode drm/modes: Don't apply cmdline's rotation if it wasn't specified Gerd Hoffmann (1): drm/bochs: fix framebuffer setup. Hans de Goede (1): drm: panel-orientation-quirks: Add extra quirk table entry for GPD MicroPC james qian wang (Arm Technology China) (2): drm/komeda: Computing layer_split internally drm/komeda: Computing image enhancer internally MAINTAINERS| 4 +- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 63 -- drivers/gpu/drm/arm/display/komeda/komeda_kms.h| 18 +-- .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 3 +- .../drm/arm/display/komeda/komeda_pipeline_state.c | 15 ++- drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 84 + .../drm/arm/display/komeda/komeda_wb_connector.c | 10 +- drivers/gpu/drm/bochs/bochs.h | 2 +- drivers/gpu/drm/bochs/bochs_hw.c | 14 ++- drivers/gpu/drm/bochs/bochs_kms.c | 3 +- drivers/gpu/drm/drm_client_modeset.c | 5 +- drivers/gpu/drm/drm_connector.c| 2 +- drivers/gpu/drm/drm_modes.c| 14 ++- drivers/gpu/drm/drm_panel_orientation_quirks.c | 12 ++ .../gpu/drm/selftests/test-drm_cmdline_parser.c| 136 - include/drm/drm_modes.h| 2 +- 16 files changed, 110 insertions(+), 277 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hiya, Looks like the last -fixes pull for this cycle. One patch to fix a possible double-free. drm-misc-fixes-2019-07-03: panfrost- Avoid double free by deleting GEM handle in create_bo failure path (Boris) Cc: Boris Brezillon Cheers, Sean The following changes since commit 41de4be6f6efa4132b29af51158cd672d93f2543: drm/virtio: move drm_connector_update_edid_property() call (2019-06-26 11:05:05 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2019-07-03 for you to fetch changes up to 2f040d27080ddfffecff2be1a77107c494d0e4f4: drm/panfrost: Fix a double-free error (2019-06-28 16:45:51 -0600) panfrost- Avoid double free by deleting GEM handle in create_bo failure path (Boris) Cc: Boris Brezillon Boris Brezillon (1): drm/panfrost: Fix a double-free error drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hi maintainers, One patch this week, no magic. drm-misc-fixes-2019-06-26: virtio- Don't call drm_connector_update_edid_property() while holding spinlock Cc: Gerd Hoffmann Cheers, Sean The following changes since commit 5eab9cf87b6c261f4e2f6c7623171cc2f5ea1a9c: Merge tag 'imx-drm-fixes-2019-06-20' of git://git.pengutronix.de/git/pza/linux into drm-fixes (2019-06-21 11:44:24 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2019-06-26 for you to fetch changes up to 41de4be6f6efa4132b29af51158cd672d93f2543: drm/virtio: move drm_connector_update_edid_property() call (2019-06-26 11:05:05 +0200) virtio- Don't call drm_connector_update_edid_property() while holding spinlock Cc: Gerd Hoffmann Gerd Hoffmann (1): drm/virtio: move drm_connector_update_edid_property() call drivers/gpu/drm/virtio/virtgpu_vq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hey team, 2 fixes this week, the 5.2 trickle continues. drm-misc-fixes-2019-06-19: panfrost- Only unmap BO's if they're mapped (Boris) core- Handle buffer desc copy_to_user failure properly (Dan) Cc: Boris Brezillon Cc: Dan Carpenter Cheers, Sean The following changes since commit 48eaeb7664c76139438724d520a1ea4a84a3ed92: drm: add fallback override/firmware EDID modes workaround (2019-06-12 13:26:25 +0300) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2019-06-19 for you to fetch changes up to 74b67efa8d7b4f90137f0ab9a80dd319da050350: drm: return -EFAULT if copy_to_user() fails (2019-06-18 13:08:48 -0400) panfrost- Only unmap BO's if they're mapped (Boris) core- Handle buffer desc copy_to_user failure properly (Dan) Cc: Boris Brezillon Cc: Dan Carpenter Boris Brezillon (1): drm/panfrost: Make sure a BO is only unmapped when appropriate Dan Carpenter (1): drm: return -EFAULT if copy_to_user() fails drivers/gpu/drm/drm_bufs.c | 5 - drivers/gpu/drm/drm_ioc32.c | 5 - drivers/gpu/drm/panfrost/panfrost_gem.c | 3 ++- drivers/gpu/drm/panfrost/panfrost_gem.h | 1 + drivers/gpu/drm/panfrost/panfrost_mmu.c | 8 5 files changed, 19 insertions(+), 3 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hi Da.*, A bit more meat on this PR, which should probably be expected given how light we have been on the last 4. drm-misc-fixes-2019-06-13: meson: A few G12A fixes across the driver (Neil) quirks: A couple quirks for GPD devices (Hans) gem_shmem: Use writecombine when vmapping non-dmabuf BOs (Boris) panfrost: A couple tweaks to requiring devfreq (Neil & Ezequiel) edid: Ensure we return the override mode when ddc probe fails (Jani) Cc: Hans de Goede Cc: Neil Armstrong Cc: Boris Brezillon Cc: Ezequiel Garcia Cc: Jani Nikula Cheers, Sean The following changes since commit 283f1e383e91d96fe652fad549537ae15cf31d60: udmabuf: actually unmap the scatterlist (2019-06-05 10:41:17 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2019-06-13 for you to fetch changes up to 48eaeb7664c76139438724d520a1ea4a84a3ed92: drm: add fallback override/firmware EDID modes workaround (2019-06-12 13:26:25 +0300) meson: A few G12A fixes across the driver (Neil) quirks: A couple quirks for GPD devices (Hans) gem_shmem: Use writecombine when vmapping non-dmabuf BOs (Boris) panfrost: A couple tweaks to requiring devfreq (Neil & Ezequiel) edid: Ensure we return the override mode when ddc probe fails (Jani) Cc: Hans de Goede Cc: Neil Armstrong Cc: Boris Brezillon Cc: Ezequiel Garcia Cc: Jani Nikula Boris Brezillon (1): drm/gem_shmem: Use a writecombine mapping for ->vaddr Ezequiel Garcia (1): drm/panfrost: Require the simple_ondemand governor Hans de Goede (2): drm: panel-orientation-quirks: Add quirk for GPD pocket2 drm: panel-orientation-quirks: Add quirk for GPD MicroPC Jani Nikula (2): drm/edid: abstract override/firmware EDID retrieval drm: add fallback override/firmware EDID modes workaround Neil Armstrong (4): drm/meson: fix G12A HDMI PLL settings for 4K60 1000/1001 variations drm/meson: fix primary plane disabling drm/meson: fix G12A primary plane disabling drm/panfrost: make devfreq optional again drivers/gpu/drm/drm_edid.c | 55 ++ drivers/gpu/drm/drm_gem_shmem_helper.c | 3 +- drivers/gpu/drm/drm_panel_orientation_quirks.c | 32 +++ drivers/gpu/drm/drm_probe_helper.c | 7 drivers/gpu/drm/meson/meson_crtc.c | 6 +-- drivers/gpu/drm/meson/meson_plane.c| 8 ++-- drivers/gpu/drm/meson/meson_vclk.c | 13 +- drivers/gpu/drm/meson/meson_viu.c | 3 +- drivers/gpu/drm/panfrost/Kconfig | 1 + drivers/gpu/drm/panfrost/panfrost_devfreq.c| 13 +- include/drm/drm_edid.h | 1 + 11 files changed, 121 insertions(+), 21 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hi Da.*, Our slow release cycle continues, only 2 contributors since last time! The set from Helen avoids blocking in async commits and Lucas ensures the sg list is unmapped with the udmabuf. drm-misc-fixes-2019-06-05: - Allow fb changes in async commits (fixes igt failures) (Helen) - Actually unmap the scatterlist when unmapping udmabuf (Lucas) Cc: Lucas Stach Cc: Helen Koike Cheers, Sean The following changes since commit 2a3e0b716296a504d9e65fea7acb379c86fe4283: Merge tag 'imx-drm-fixes-2019-05-29' of git://git.pengutronix.de/git/pza/linux into drm-fixes (2019-05-31 09:15:25 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2019-06-05 for you to fetch changes up to 283f1e383e91d96fe652fad549537ae15cf31d60: udmabuf: actually unmap the scatterlist (2019-06-05 10:41:17 +0200) - Allow fb changes in async commits (fixes igt failures) (Helen) - Actually unmap the scatterlist when unmapping udmabuf (Lucas) Cc: Lucas Stach Cc: Helen Koike Helen Koike (5): drm/rockchip: fix fb references in async update drm/amd: fix fb references in async update drm/msm: fix fb references in async update drm/vc4: fix fb references in async update drm: don't block fb changes for async plane updates Lucas Stach (1): udmabuf: actually unmap the scatterlist drivers/dma-buf/udmabuf.c | 1 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +- drivers/gpu/drm/drm_atomic_helper.c | 22 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c| 4 ++ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 51 --- drivers/gpu/drm/vc4/vc4_plane.c | 2 +- include/drm/drm_modeset_helper_vtables.h | 8 7 files changed, 53 insertions(+), 38 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hi Da.*, One line pull-request, one-line summary. Please pull :) drm-misc-fixes-2019-05-29: qxl: Drop WARN when u/s tries to mmap a prime buffer (Gerd) Cc: Gerd Hoffmann Cheers, Sean The following changes since commit f3617b449d0bcf3b5d80a97f51498dcf7463cf7e: drm/panfrost: Select devfreq (2019-05-22 13:05:13 -0500) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2019-05-29 for you to fetch changes up to 95b74ce88943747fff0a3a8a6f04eecbe7b1c3ce: drm/qxl: drop WARN_ONCE() (2019-05-27 13:17:03 +0200) qxl: Drop WARN when u/s tries to mmap a prime buffer (Gerd) Cc: Gerd Hoffmann Gerd Hoffmann (1): drm/qxl: drop WARN_ONCE() drivers/gpu/drm/qxl/qxl_prime.c | 1 - 1 file changed, 1 deletion(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] drm-misc-next
se for lima_pp_bcast_irq_handler
>
> Peter Ujfalusi (5):
> dt-bindings: display: Add bindings for OSD101T2045-53TS
> drm/panel: simple: Add support for OSD101T2045-53TS
> dt-bindings: display: Add bindings for OSD101T2587-53TS panel
> drm/panel: Add OSD101T2587-53TS driver
> drm/panel: simple: Fix panel_simple_dsi_probe
>
> Philip Yang (1):
> drm: increase drm mmap_range size to 1TB
>
> Philippe Cornu (1):
> drm/stm: ltdc: use DRM_WARN for fifo & transfer error messages
>
> Robert Foss (1):
> drm/virtio: Remove redundant return type
>
> Sabyasachi Gupta (1):
> drm/bridge: Remove duplicate header
>
> Sam Bobroff (1):
> drm/bochs: Fix connector leak during driver unload
>
> Sam Ravnborg (6):
> drm: drop drm_bus from todo
> drm/gma500: remove empty gma_drm.h header file
> drm/gma500: drop drmP.h from header files
> drm/gma500: make local header files more self-contained
> drm/gma500: drop use of DRM_UDELAY wrapper
> drm/gma500: drop drmp.h include from all .c files
>
> Sean Paul (1):
> Merge drm/drm-next into drm-misc-next
>
> Souptick Joarder (1):
> drm/panel: Remove duplicate header
>
> Thierry Reding (1):
> MAINTAINERS: Add Sam as reviewer for drm/panel
>
> Thomas Zimmermann (25):
> drm: Add |struct drm_gem_vram_object| and helpers
> drm: Add |struct drm_gem_vram_object| callbacks for |struct
> ttm_bo_driver|
> drm: Add |struct drm_gem_vram_object| callbacks for |struct drm_driver|
> drm: Add drm_gem_vram_fill_create_dumb() to create dumb buffers
> drm: Add simple PRIME helpers for GEM VRAM
> drm: Add VRAM MM, a simple memory manager for dedicated VRAM
> drm: Add default instance for VRAM MM callback functions
> drm: Integrate VRAM MM into struct drm_device
> drm/ast: Convert AST driver to |struct drm_gem_vram_object|
> drm/ast: Convert AST driver to VRAM MM
> drm/ast: Replace mapping code with drm_gem_vram_{kmap/kunmap}()
> drm/bochs: Convert bochs driver to |struct drm_gem_vram_object|
> drm/bochs: Convert bochs driver to VRAM MM
> drm/mgag200: Convert mgag200 driver to |struct drm_gem_vram_object|
> drm/mgag200: Convert mgag200 driver to VRAM MM
> drm/mgag200: Replace mapping code with drm_gem_vram_{kmap/kunmap}()
> drm/vboxvideo: Convert vboxvideo driver to |struct drm_gem_vram_object|
> drm/vboxvideo: Convert vboxvideo driver to VRAM MM
> drm/hisilicon: Convert hibmc-drm driver to |struct drm_gem_vram_object|
> drm/hisilicon: Convert hibmc-drm driver to VRAM MM
> drm: Add drm_gem_vram_{pin/unpin}_reserved() and convert mgag200
> drm: Reserve/unreserve GEM VRAM BOs from within pin/unpin functions
> drm: Replace drm_gem_vram_push_to_system() with kunmap + unpin
> drm: Rename reserve/unreserve to lock/unlock in GEM VRAM helpers
> drm: Assert that BO is locked in drm_gem_vram_{pin, unpin}_locked()
>
> Uma Shankar (4):
> drm: Add HDR source metadata property
> drm: Parse HDR metadata info from EDID
> drm: Enable HDR infoframe support
> video/hdmi: Add Unpack function for DRM infoframe
>
> Ville Syrjälä (1):
> drm: Add HLG EOTF
>
> Yannick Fertré (8):
> drm/stm: ltdc: disable hw interrupts before its handler init
> drm/stm: ltdc: fix data enable polarity
> drm/stm: ltdc: update planes at next vblank to avoid partial refresh
> drm/stm: ltdc: limit number of layer to avoid memory overflow
> drm/stm: ltdc: reset controller to avoid partial refresh
> drm/stm: ltdc: add modifier support
> dt-bindings: display: stm32: add supply property to DSI controller
> drm/stm: dsi: add regulator support
>
> kbuild test robot (1):
> drm/bochs: fix ptr_ret.cocci warnings
>
> .../bindings/display/panel/edt,et-series.txt | 16 +
> .../display/panel/evervision,vgg804821.txt | 12 +
> .../bindings/display/panel/friendlyarm,hd702e.txt | 32 +
> .../display/panel/osddisplays,osd101t2045-53ts.txt | 11 +
> .../display/panel/osddisplays,osd101t2587-53ts.txt | 14 +
> .../bindings/display/panel/samsung,s6e63m0.txt | 33 +
> .../display/panel/tfc,s9700rtwv43tr-01b.txt| 15 +
> .../bindings/display/panel/vl050_8048nt_c01.txt| 12 +
> .../devicetree/bindings/display/st,stm32-ltdc.txt | 3 +
> .../devicetree/bindings/gpu/arm,mali-midgard.txt | 19 +-
> .../devicetree/bindings/vendor-prefixes.txt| 468 +
> Documentation/gpu/drm-mm.rst | 34 +-
> Documentation/gpu/drm-uapi.rst
[PULL] drm-misc-next-fixes
Hi Da.*, Some more fixes for -next. As predicted more panfrost cleanup. We also have 4 msm patches that Rob and I figured should just go through -misc instead of spinning up an msm-fixes branch. If we pooled together all msm fixes for 5.2, maybe the -fixes branch would have been warranted, but we've been boiling this frog for a while so why not continue. Anyways, hopefully this is it until we move back to -misc-fixes. drm-misc-next-fixes-2019-05-15: - A couple new panfrost fixes - Fix the low refresh rate register in adv7511 - A handful of msm fixes that fell out of 5.1 bringup on SDM845 - Fix spinlock initialization in pl111 Cheers, Sean The following changes since commit eb85d03e01c3e9f3b0ba7282b2e3515a635decb2: Merge tag 'drm-misc-next-fixes-2019-05-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (2019-05-09 11:04:00 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2019-05-15 for you to fetch changes up to 2b117451277140b782f3e4e56a4296c0a165e7ae: drm/msm: Upgrade gxpd checks to IS_ERR_OR_NULL (2019-05-15 16:03:08 -0400) - A couple new panfrost fixes - Fix the low refresh rate register in adv7511 - A handful of msm fixes that fell out of 5.1 bringup on SDM845 - Fix spinlock initialization in pl111 Boris Brezillon (1): drm/panfrost: Add missing _fini() calls in panfrost_device_fini() Brian Masney (2): drm/msm: remove resv fields from msm_gem_object struct drm/msm: correct attempted NULL pointer dereference in debugfs Guenter Roeck (1): drm/pl111: Initialize clock spinlock early Matt Redfearn (1): drm/bridge: adv7511: Fix low refresh rate selection Sabyasachi Gupta (1): drm/msm/dpu: Remove duplicate header Sean Paul (1): drm/msm: Upgrade gxpd checks to IS_ERR_OR_NULL Tomeu Vizoso (1): drm/panfrost: Only put sync_out if non-NULL drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 6 +++--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c| 6 +++--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c| 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c| 4 +--- drivers/gpu/drm/msm/msm_atomic.c | 4 +--- drivers/gpu/drm/msm/msm_gem.c| 3 ++- drivers/gpu/drm/msm/msm_gem.h| 4 drivers/gpu/drm/panfrost/panfrost_device.c | 4 drivers/gpu/drm/panfrost/panfrost_drv.c | 3 ++- drivers/gpu/drm/pl111/pl111_display.c| 5 +++-- 10 files changed, 19 insertions(+), 21 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next-fixes
Hi Da.*, So last week when I said we were ready for merge window... I lied. Lots of stuff to sneak in this week including 6 patches that came from -misc-next. Fortunately they _just_ missed the feature freeze so I was able to tag and merge them here. Most of what is here is panfrost fixes, which is understandable given its age, I expect this trend will continue this release as it becomes more mature. The sole msm patch is here b/c that's all Rob and I have for -fixes in msm atm and it was easier to just stuff it in here. drm-misc-next-fixes-2019-05-08: - A handful of fixes from -next that just missed feature freeze - More panfrost fixes that went directly in -misc-next-fixes (various) - Fix searchpaths during build (Masahiro) - msm patch to fix the driver for chips without zap shader (Rob) - Fix freeing imported buffers in drm_gem_cma_free_object() (Noralf) Cc: Masahiro Yamada Cc: Rob Clark Cc: Noralf Trønnes Cheers, Sean The following changes since commit 761e473f6b23f206862d904a1a5fcbc012656b47: drm/gem: Fix sphinx warnings (2019-04-25 10:02:10 -0400) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2019-05-08 for you to fetch changes up to 15273ffd7efdf6e9f21c4e4beef6539229167343: drm/msm/a6xx: No zap shader is not an error (2019-05-08 16:00:54 -0400) - A handful of fixes from -next that just missed feature freeze - More panfrost fixes that went directly in -misc-next-fixes (various) - Fix searchpaths during build (Masahiro) - msm patch to fix the driver for chips without zap shader (Rob) - Fix freeing imported buffers in drm_gem_cma_free_object() (Noralf) Cc: Masahiro Yamada Cc: Rob Clark Cc: Noralf Trønnes Mario Kleiner (1): drm: Fix timestamp docs for variable refresh properties. Masahiro Yamada (1): drm: prefix header search paths with $(srctree)/ Noralf Trønnes (1): drm/cma-helper: Fix drm_gem_cma_free_object() Rob Clark (1): drm/msm/a6xx: No zap shader is not an error Robin Murphy (4): drm/panfrost: Set DMA masks earlier drm/panfrost: Disable PM on probe failure drm/panfrost: Don't scream about deferred probe drm/panfrost: Show stored feature registers Sean Paul (1): Merge panfrost-fixes into drm-misc-next-fixes Steven Price (2): drm/panfrost: Add missing include drm/panfrost: depend on !GENERIC_ATOMIC64 when using COMPILE_TEST Tomeu Vizoso (2): drm/panfrost: Prevent concurrent resets drm/panfrost: Add sanity checks to submit IOCTL Vicente Bergas (1): drm/rockchip: shutdown drm subsystem on shutdown YueHaibing (1): drm/panfrost: Make panfrost_gem_free_object() static drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/arm/display/komeda/Makefile | 4 +-- drivers/gpu/drm/drm_connector.c | 6 drivers/gpu/drm/drm_gem_cma_helper.c| 8 ++--- drivers/gpu/drm/i915/gvt/Makefile | 2 +- drivers/gpu/drm/msm/Makefile| 6 ++-- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 1 + drivers/gpu/drm/nouveau/Kbuild | 8 ++--- drivers/gpu/drm/panfrost/Kconfig| 2 +- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 1 + drivers/gpu/drm/panfrost/panfrost_device.c | 1 + drivers/gpu/drm/panfrost/panfrost_device.h | 1 + drivers/gpu/drm/panfrost/panfrost_drv.c | 47 ++--- drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +- drivers/gpu/drm/panfrost/panfrost_gpu.c | 19 +++- drivers/gpu/drm/panfrost/panfrost_job.c | 4 +++ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 9 ++ 17 files changed, 75 insertions(+), 48 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next-fixes
Hi Da.*, Quiet week since the last PR, I'd say we're ready for the merge window! drm-misc-next-fixes-2019-05-01: core: restore drm mmap_range size back to 1TB (Philip) sphinx: squash warning (Sean) Cc: Philip Yang Cc: Sean Paul Cheers, Sean The following changes since commit 1de7259275ca4ebc66459de6620558d3e38d4142: drm/fb-helper: Fix drm_fb_helper_firmware_config() NULL pointer deref (2019-04-24 15:57:43 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2019-05-01 for you to fetch changes up to 761e473f6b23f206862d904a1a5fcbc012656b47: drm/gem: Fix sphinx warnings (2019-04-25 10:02:10 -0400) core: restore drm mmap_range size back to 1TB (Philip) sphinx: squash warning (Sean) Cc: Philip Yang Cc: Sean Paul Philip Yang (1): drm: increase drm mmap_range size to 1TB Sean Paul (1): drm/gem: Fix sphinx warnings drivers/gpu/drm/drm_gem.c | 10 +- include/drm/drm_vma_manager.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next-fixes
Hi Da.*, First pull from -next-fixes for 5.2. Mostly lease fixes from Daniel with a NULL deref from Noralf. Please pull! drm-misc-next-fixes-2019-04-24: - fb_helper: Fix NULL deref in legacy drivers (Noralf) - leases: Ensure lessees can't connect to objects outside their perview (Daniel) - leases: Enforce that lessees hold the lease for implicitly set planes (Daniel) - leases: A few non-functional cleanups (Daniel) Cc: Daniel Vetter Cc: Noralf Trønnes Cheers, Sean The following changes since commit abbc0697d5fbf53f74ce0bcbe936670199764cfa: drm/fb: revert the i915 Actually configure untiled displays from master (2019-04-24 16:41:03 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2019-04-24 for you to fetch changes up to 1de7259275ca4ebc66459de6620558d3e38d4142: drm/fb-helper: Fix drm_fb_helper_firmware_config() NULL pointer deref (2019-04-24 15:57:43 +0200) - fb_helper: Fix NULL deref in legacy drivers (Noralf) - leases: Ensure lessees can't connect to objects outside their perview (Daniel) - leases: Enforce that lessees hold the lease for implicitly set planes (Daniel) - leases: A few non-functional cleanups (Daniel) Cc: Daniel Vetter Cc: Noralf Trønnes Daniel Vetter (7): drm/leases: Drop object_id validation for negative ids drm/lease: Drop recursive leads checks drm/leases: Don't init to 0 in drm_master_create drm/lease: Check for lessor outside of locks drm/lease: Make sure implicit planes are leased drm/atomic: Wire file_priv through for property changes drm/atomic: -EACCESS for lease-denied crtc lookup Noralf Trønnes (1): drm/fb-helper: Fix drm_fb_helper_firmware_config() NULL pointer deref drivers/gpu/drm/drm_atomic_uapi.c | 36 +++- drivers/gpu/drm/drm_auth.c | 2 -- drivers/gpu/drm/drm_crtc.c | 4 drivers/gpu/drm/drm_crtc_internal.h | 1 + drivers/gpu/drm/drm_fb_helper.c | 3 +++ drivers/gpu/drm/drm_lease.c | 13 +++-- drivers/gpu/drm/drm_mode_object.c | 5 +++-- drivers/gpu/drm/drm_plane.c | 8 8 files changed, 45 insertions(+), 27 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PATCH v2] arm-defconfig: Include DRM_ASPEED_GFX as module
From: Sean Paul New driver, add it to the defconfig for compilation testing Changes in v2: - Move from arm64 to arm (Joel) Cc: Joel Stanley Signed-off-by: Sean Paul --- drm-misc-arm_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drm-misc-arm_defconfig b/drm-misc-arm_defconfig index 58ee2c1798cb..2a0b8167f0db 100644 --- a/drm-misc-arm_defconfig +++ b/drm-misc-arm_defconfig @@ -4316,6 +4316,7 @@ CONFIG_DRM_MALI_DISPLAY=m CONFIG_DRM_KOMEDA=m # CONFIG_DRM_RADEON is not set # CONFIG_DRM_AMDGPU is not set +CONFIG_DRM_ASPEED_GFX=m # # ACP (Audio CoProcessor) Configuration -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PATCH] arm64-defconfig: Include DRM_ASPEED_GFX as module
From: Sean Paul New driver, add it to the defconfig for compilation testing Signed-off-by: Sean Paul --- drm-misc-arm64_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drm-misc-arm64_defconfig b/drm-misc-arm64_defconfig index adc87bfdbd7a..b92c2b96915b 100644 --- a/drm-misc-arm64_defconfig +++ b/drm-misc-arm64_defconfig @@ -3221,6 +3221,7 @@ CONFIG_DRM_MALI_DISPLAY=m CONFIG_DRM_KOMEDA=m # CONFIG_DRM_RADEON is not set # CONFIG_DRM_AMDGPU is not set +CONFIG_DRM_ASPEED_GFX=m # # ACP (Audio CoProcessor) Configuration -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next
ode 100644 drivers/gpu/drm/lima/lima_device.h create mode 100644 drivers/gpu/drm/lima/lima_dlbu.c create mode 100644 drivers/gpu/drm/lima/lima_dlbu.h create mode 100644 drivers/gpu/drm/lima/lima_drv.c create mode 100644 drivers/gpu/drm/lima/lima_drv.h create mode 100644 drivers/gpu/drm/lima/lima_gem.c create mode 100644 drivers/gpu/drm/lima/lima_gem.h create mode 100644 drivers/gpu/drm/lima/lima_gem_prime.c create mode 100644 drivers/gpu/drm/lima/lima_gem_prime.h create mode 100644 drivers/gpu/drm/lima/lima_gp.c create mode 100644 drivers/gpu/drm/lima/lima_gp.h create mode 100644 drivers/gpu/drm/lima/lima_l2_cache.c create mode 100644 drivers/gpu/drm/lima/lima_l2_cache.h create mode 100644 drivers/gpu/drm/lima/lima_mmu.c create mode 100644 drivers/gpu/drm/lima/lima_mmu.h create mode 100644 drivers/gpu/drm/lima/lima_object.c create mode 100644 drivers/gpu/drm/lima/lima_object.h create mode 100644 drivers/gpu/drm/lima/lima_pmu.c create mode 100644 drivers/gpu/drm/lima/lima_pmu.h create mode 100644 drivers/gpu/drm/lima/lima_pp.c create mode 100644 drivers/gpu/drm/lima/lima_pp.h create mode 100644 drivers/gpu/drm/lima/lima_regs.h create mode 100644 drivers/gpu/drm/lima/lima_sched.c create mode 100644 drivers/gpu/drm/lima/lima_sched.h create mode 100644 drivers/gpu/drm/lima/lima_vm.c create mode 100644 drivers/gpu/drm/lima/lima_vm.h create mode 100644 drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c create mode 100644 drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c create mode 100644 drivers/gpu/drm/rockchip/rk3066_hdmi.c create mode 100644 drivers/gpu/drm/rockchip/rk3066_hdmi.h create mode 100644 include/linux/dma-fence-chain.h create mode 100644 include/uapi/drm/lima_drm.h -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[RESEND PULL] drm-misc-next
| 2 +- drivers/gpu/drm/mgag200/mgag200_fb.c | 8 +- drivers/gpu/drm/msm/msm_fbdev.c| 6 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c| 8 +- drivers/gpu/drm/nouveau/nouveau_fbcon.h| 2 +- drivers/gpu/drm/omapdrm/omap_fbdev.c | 6 +- drivers/gpu/drm/panel/panel-arm-versatile.c| 2 - drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 2 - drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 1 - drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 3 - drivers/gpu/drm/panel/panel-tpo-tpg110.c | 2 - drivers/gpu/drm/radeon/radeon_fb.c | 11 +-- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 6 +- drivers/gpu/drm/tegra/fb.c | 4 +- drivers/gpu/drm/udl/udl_fb.c | 8 +- drivers/gpu/drm/vboxvideo/vbox_fb.c| 8 +- drivers/gpu/drm/virtio/virtgpu_debugfs.c | 27 +- drivers/gpu/drm/virtio/virtgpu_drv.h | 43 +++-- drivers/gpu/drm/virtio/virtgpu_fence.c | 4 +- drivers/gpu/drm/virtio/virtgpu_gem.c | 35 +++ drivers/gpu/drm/virtio/virtgpu_ioctl.c | 107 + drivers/gpu/drm/virtio/virtgpu_object.c| 74 ++ drivers/gpu/drm/virtio/virtgpu_ttm.c | 98 +-- drivers/gpu/drm/virtio/virtgpu_vq.c| 36 --- drivers/gpu/drm/vkms/vkms_crtc.c | 2 + include/drm/drm_connector.h| 14 +-- include/drm/drm_drv.h | 6 +- include/drm/drm_fb_helper.h| 25 ++--- include/uapi/drm/drm_mode.h| 1 - 46 files changed, 292 insertions(+), 442 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next
tinydrm/mipi-dbi: Use dma-safe buffers for all SPI transfers Paul Kocialkowski (1): drm/vc4: Add a debugfs entry to disable/enable the load tracker Qiang Yu (1): drm: export drm_timeout_abs_to_jiffies Rob Herring (6): drm: Add reservation_object to drm_gem_object drm: etnaviv: Switch to use drm_gem_object reservation_object drm: msm: Switch to use drm_gem_object reservation_object drm: v3d: Switch to use drm_gem_object reservation_object drm: vc4: Switch to use drm_gem_object reservation_object drm: imx: Use of_node_name_eq for node name comparisons Ryan Pavlik (1): drm: add non-desktop quirks to Sensics and OSVR headsets. Sean Paul (3): Merge drm/drm-next into drm-misc-next Merge tag 'topic/hdr-formats-2019-03-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-misc-next Merge tag 'topic/hdr-formats-2019-03-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-misc-next Swati Sharma (3): drm: Add Y2xx and Y4xx (xx:10/12/16) format definitions and fourcc drm/i915/icl: Add Y2xx and Y4xx (xx:10/12/16) plane control definitions drm/i915/icl: Enabling Y2xx and Y4xx (xx:10/12/16) formats for universal planes Uma Shankar (3): drm: Add HDMI colorspace property drm: Add colorspace info to AVI Infoframe drm/i915: Attach colorspace property and enable modeset YueHaibing (3): drm: Remove set but not used variable 'gem' drm/qxl: remove set but not used variable 'bo_old' drm/vboxvideo: Remove unused including .../bindings/display/amlogic,meson-vpu.txt | 5 +- .../bindings/display/panel/ronbo,rb070d30.yaml | 51 ++ .../devicetree/bindings/gpu/brcm,bcm-v3d.txt | 11 +- .../devicetree/bindings/vendor-prefixes.txt| 1 + Documentation/driver-api/component.rst | 19 + Documentation/driver-api/device_link.rst | 3 + Documentation/driver-api/index.rst | 1 + Documentation/driver-model/devres.txt | 3 + Documentation/gpu/drm-internals.rst| 5 + Documentation/gpu/drm-kms-helpers.rst | 12 + Documentation/gpu/tinydrm.rst | 30 +- Documentation/gpu/todo.rst | 12 +- MAINTAINERS| 7 + drivers/base/component.c | 206 ++- drivers/dma-buf/reservation.c | 8 + drivers/gpu/drm/Kconfig| 8 + drivers/gpu/drm/Makefile | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c| 1 + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- drivers/gpu/drm/arm/malidp_drv.c | 48 +- drivers/gpu/drm/arm/malidp_drv.h | 6 + drivers/gpu/drm/arm/malidp_hw.c| 249 +++- drivers/gpu/drm/arm/malidp_hw.h| 31 +- drivers/gpu/drm/arm/malidp_mw.c| 7 +- drivers/gpu/drm/arm/malidp_planes.c| 271 - drivers/gpu/drm/arm/malidp_regs.h | 20 + drivers/gpu/drm/bochs/bochs_kms.c | 11 - drivers/gpu/drm/drm_atomic_helper.c| 4 +- drivers/gpu/drm/drm_atomic_uapi.c | 4 + drivers/gpu/drm/drm_connector.c| 91 ++- drivers/gpu/drm/drm_dp_mst_topology.c | 1 - drivers/gpu/drm/drm_drv.c | 206 ++- drivers/gpu/drm/drm_dsc.c | 269 +++-- drivers/gpu/drm/drm_edid.c | 76 +++ drivers/gpu/drm/drm_fb_helper.c| 6 +- drivers/gpu/drm/drm_file.c | 7 +- drivers/gpu/drm/drm_fourcc.c | 27 + drivers/gpu/drm/drm_gem.c | 121 drivers/gpu/drm/drm_gem_shmem_helper.c | 625 + drivers/gpu/drm/drm_kms_helper_common.c| 2 +- drivers/gpu/drm/drm_memory.c | 19 +- drivers/gpu/drm/drm_panel_orientation_quirks.c | 13 + drivers/gpu/drm/drm_prime.c| 1 + drivers/gpu/drm/drm_syncobj.c | 3 +- drivers/gpu/drm/drm_vm.c | 4 +- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 - drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 - drivers/gpu/drm/etnaviv/etnaviv_gem.c | 16 +- drivers/gpu/drm/etnaviv/etnaviv_gem.h | 4 - drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c| 7 - drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 22 +- drivers/gpu/drm/i915/i915_reg.h| 9 + drivers/gpu/drm/i915/intel_atomic.c
Re: [PULL] topic/hdr-formats
On Wed, Mar 13, 2019 at 12:21:46PM +0100, Maarten Lankhorst wrote: > Hey Sean and Joonas, > > One more pull request for the hdr-formats topic branch. FP16 support > is now also implemented. > > Can this be pulled to drm-misc-next and dinq? Merged in drm-misc-next. Sean > > ~Maarten > > topic/hdr-formats-2019-03-13: > Add support for floating point half-width formats. > The following changes since commit 296e9b19eff6157e1e4f130fa436e105c45725e9: > > drm/i915/icl: Enabling Y2xx and Y4xx (xx:10/12/16) formats for universal > planes (2019-03-05 12:49:00 +0100) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/topic/hdr-formats-2019-03-13 > > for you to fetch changes up to a94bed60cb73962f344ead14b2ee7613280432c6: > > drm/i915/icl: Implement half float formats (2019-03-13 11:23:12 +0100) > > > Add support for floating point half-width formats. > > > Kevin Strasser (3): > drm/fourcc: Add 64 bpp half float formats > drm/i915: Refactor icl_is_hdr_plane > drm/i915/icl: Implement half float formats > > drivers/gpu/drm/drm_fourcc.c | 4 ++ > drivers/gpu/drm/i915/intel_atomic.c | 3 +- > drivers/gpu/drm/i915/intel_display.c | 29 +- > drivers/gpu/drm/i915/intel_drv.h | 7 ++-- > drivers/gpu/drm/i915/intel_sprite.c | 78 > +++++--- > include/uapi/drm/drm_fourcc.h| 11 + > 6 files changed, 120 insertions(+), 12 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] topic/hdr-formats
On Thu, Mar 07, 2019 at 10:48:24AM +0100, Maarten Lankhorst wrote: > Hi Sean and Joonas, > > Here's a pull request for HDR format enabling in i915. Can this be pulled to > drm-misc-next and dinq? > Applied to drm-misc-next, thanks for sending this out. Sean > Cheers, > Maarten > > topic/hdr-formats-2019-03-07: > Add support for Y21x and Y41x to drm core and i915, and P01x support to i915. > The following changes since commit 4b057e73f28f1df13b77b77a52094238ffdf8abd: > > Merge tag 'drm-misc-fixes-2019-02-22' of > git://anongit.freedesktop.org/drm/drm-misc into drm-next (2019-03-05 08:14:22 > +1000) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/topic/hdr-formats-2019-03-07 > > for you to fetch changes up to 296e9b19eff6157e1e4f130fa436e105c45725e9: > > drm/i915/icl: Enabling Y2xx and Y4xx (xx:10/12/16) formats for universal > planes (2019-03-05 12:49:00 +0100) > > > Add support for Y21x and Y41x to drm core and i915, and P01x support to i915. > > > Juha-Pekka Heikkila (3): > drm/i915: Add P010, P012, P016 plane control definitions > drm/i915: Preparations for enabling P010, P012, P016 formats > drm/i915: Enable P010, P012, P016 formats for primary and sprite planes > > Swati Sharma (3): > drm: Add Y2xx and Y4xx (xx:10/12/16) format definitions and fourcc > drm/i915/icl: Add Y2xx and Y4xx (xx:10/12/16) plane control definitions > drm/i915/icl: Enabling Y2xx and Y4xx (xx:10/12/16) formats for > universal planes > > drivers/gpu/drm/drm_fourcc.c | 6 ++ > drivers/gpu/drm/i915/i915_reg.h | 9 +++ > drivers/gpu/drm/i915/intel_atomic_plane.c | 2 +- > drivers/gpu/drm/i915/intel_display.c | 57 ++-- > drivers/gpu/drm/i915/intel_drv.h | 1 + > drivers/gpu/drm/i915/intel_pm.c | 14 ++-- > drivers/gpu/drm/i915/intel_sprite.c | 108 > ++++-- > include/uapi/drm/drm_fourcc.h | 16 + > 8 files changed, 194 insertions(+), 19 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hi Dave and Daniel, A late spectre fix for you to pull for 4.20 final. drm-misc-fixes-2018-12-20: Fix spectre v1 vuln in drm_ioctl Cheers, Sean The following changes since commit 7566ec393f4161572ba6f11ad5171fd5d59b0fbd: Linux 4.20-rc7 (2018-12-16 15:46:55 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2018-12-20 for you to fetch changes up to 505b5240329b922f21f91d5b5d1e535c805eca6d: drm/ioctl: Fix Spectre v1 vulnerabilities (2018-12-20 08:13:29 +0100) Fix spectre v1 vuln in drm_ioctl Gustavo A. R. Silva (1): drm/ioctl: Fix Spectre v1 vulnerabilities drivers/gpu/drm/drm_ioctl.c | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hi Dave, One lonely patch to fix a new WARN on rockchip rk3399 chromebooks. drm-misc-fixes-2018-12-12: - rockchip: Revert change causing WARN on shutdown (Brian) Cc: Brian Norris Cheers, Sean The following changes since commit b31a3ca745a4a47ba63208d37cd50abffe58280f: drm/fb-helper: Fix typo in parameter description (2018-12-04 14:22:20 +0100) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2018-12-12 for you to fetch changes up to 63238173b2faf3d6b85a416f1c69af6c7be2413f: Revert "drm/rockchip: Allow driver to be shutdown on reboot/kexec" (2018-12-11 15:15:57 +0100) - rockchip: Revert change causing WARN on shutdown (Brian) Cc: Brian Norris Brian Norris (1): Revert "drm/rockchip: Allow driver to be shutdown on reboot/kexec" drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 6 -- 1 file changed, 6 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hi Dave, drm-misc fixes for this week. Big item is the lease uevent change. It seems like there's a high degree of confidence that existing userspaces will be happy with any uevent, so it should be a non-issue. Nevertheless, it hasn't soaked for very long, so something to keep an eye on. drm-misc-fixes-2018-12-05: UAPI: - Distinguish lease events from hotplug (Daniel) Other: - omap: Restore panel-dpi bus flags (Tomi) - omap: Fix a couple of dsi issues (Sebastian) Cc: Sebastian Reichel Cc: Tomi Valkeinen Cc: Daniel Vetter Cheers, Sean The following changes since commit 9765635b30756eb74e05e260ac812659c296cd28: Revert "drm/dp_mst: Skip validating ports during destruction, just ref" (2018-11-28 16:22:17 -0500) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2018-12-05 for you to fetch changes up to b31a3ca745a4a47ba63208d37cd50abffe58280f: drm/fb-helper: Fix typo in parameter description (2018-12-04 14:22:20 +0100) UAPI: - Distinguish lease events from hotplug (Daniel) Other: - omap: Restore panel-dpi bus flags (Tomi) - omap: Fix a couple of dsi issues (Sebastian) Cc: Sebastian Reichel Cc: Tomi Valkeinen Cc: Daniel Vetter Daniel Vetter (1): drm/lease: Send a distinct uevent Sandeep Panda (1): drm/bridge: fix AUX_CMD_SEND bit value for ti, sn65dsi86 bridge Sebastian Reichel (2): drm/omap: populate DSI platform bus earlier drm/omap: fix incorrect union usage Tomi Valkeinen (1): drm/omap: fix bus_flags for panel-dpi Wei Yongjun (1): drm/fb-helper: Fix typo in parameter description drivers/gpu/drm/bridge/ti-sn65dsi86.c| 2 +- drivers/gpu/drm/drm_fb_helper.c | 2 +- drivers/gpu/drm/drm_internal.h | 2 + drivers/gpu/drm/drm_lease.c | 2 +- drivers/gpu/drm/drm_sysfs.c | 10 + drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 1 + drivers/gpu/drm/omapdrm/dss/dsi.c| 20 +- drivers/gpu/drm/omapdrm/dss/omapdss.h| 2 +- drivers/gpu/drm/omapdrm/omap_encoder.c | 58 9 files changed, 60 insertions(+), 39 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL v2] drm-misc-fixes
Hi Dave, Here's the updated PR with the mst destroy patch reverted. drm-misc-fixes-2018-11-28-1: - mst: Don't try to validate ports while destroying them (Lyude) - Revert: Don't try to validate ports while destroying them (Lyude) - core: Don't set device to master unless set_master succeeds (Sergio) - meson: Do vblank_on/off on enable/disable (Neil) - meson: Use fast_io regmap option to avoid sleeping in irq ctx (Lyude) - meson: Don't walk off the end of the OSD EOTF LUTs (Lyude) Cc: Lyude Paul Cc: Sergio Correia Cc: Neil Armstrong Cheers, Sean For completeness, here's my summary from the v1: --- Hi Dave, Happy meson week! A bunch of stellar fixes coming in this week from Lyude, and a couple others plugging holes in meson and core. drm-misc-fixes-2018-11-28: - mst: Don't try to validate ports while destroying them (Lyude) - core: Don't set device to master unless set_master succeeds (Sergio) - meson: Do vblank_on/off on enable/disable (Neil) - meson: Use fast_io regmap option to avoid sleeping in irq ctx (Lyude) - meson: Don't walk off the end of the OSD EOTF LUTs (Lyude) Cc: Lyude Paul Cc: Sergio Correia Cc: Neil Armstrong Cheers, Sean --- The following changes since commit 2e6e902d185027f8e3cb8b7305238f7e35d6a436: Linux 4.20-rc4 (2018-11-25 14:19:31 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2018-11-28-1 for you to fetch changes up to 9765635b30756eb74e05e260ac812659c296cd28: Revert "drm/dp_mst: Skip validating ports during destruction, just ref" (2018-11-28 16:22:17 -0500) - mst: Don't try to validate ports while destroying them (Lyude) - Revert: Don't try to validate ports while destroying them (Lyude) - core: Don't set device to master unless set_master succeeds (Sergio) - meson: Do vblank_on/off on enable/disable (Neil) - meson: Use fast_io regmap option to avoid sleeping in irq ctx (Lyude) - meson: Don't walk off the end of the OSD EOTF LUTs (Lyude) Cc: Lyude Paul Cc: Sergio Correia Cc: Neil Armstrong Christian Hewitt (1): drm/meson: add support for 1080p25 mode Lyude Paul (4): drm/dp_mst: Skip validating ports during destruction, just ref drm/meson: Enable fast_io in meson_dw_hdmi_regmap_config drm/meson: Fix OOB memory accesses in meson_viu_set_osd_lut() Revert "drm/dp_mst: Skip validating ports during destruction, just ref" Neil Armstrong (1): drm/meson: Fixes for drm_crtc_vblank_on/off support Sergio Correia (1): drm: set is_master to 0 upon drm_new_set_master() failure drivers/gpu/drm/drm_auth.c| 2 ++ drivers/gpu/drm/meson/meson_crtc.c| 27 +-- drivers/gpu/drm/meson/meson_dw_hdmi.c | 1 + drivers/gpu/drm/meson/meson_venc.c| 4 drivers/gpu/drm/meson/meson_viu.c | 12 ++-- 5 files changed, 38 insertions(+), 8 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] drm-misc-fixes
On Wed, Nov 28, 2018 at 3:04 PM Sean Paul wrote: > > > Hi Dave, > Happy meson week! A bunch of stellar fixes coming in this week from Lyude, > and a > couple others plugging holes in meson and core. > > > drm-misc-fixes-2018-11-28: > - mst: Don't try to validate ports while destroying them (Lyude) ICYMIRC, Lyude noticed a new issue with this patch, so we're going to revert and re-send. Please drop for now, Sean > - core: Don't set device to master unless set_master succeeds (Sergio) > - meson: Do vblank_on/off on enable/disable (Neil) > - meson: Use fast_io regmap option to avoid sleeping in irq ctx (Lyude) > - meson: Don't walk off the end of the OSD EOTF LUTs (Lyude) > > Cc: Lyude Paul > Cc: Sergio Correia > Cc: Neil Armstrong > > Cheers, Sean > > > The following changes since commit 2e6e902d185027f8e3cb8b7305238f7e35d6a436: > > Linux 4.20-rc4 (2018-11-25 14:19:31 -0800) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2018-11-28 > > for you to fetch changes up to 31e1ab494559fb46de304cc6c2aed1528f94b298: > > drm/meson: add support for 1080p25 mode (2018-11-26 16:14:28 -0500) > > > - mst: Don't try to validate ports while destroying them (Lyude) > - core: Don't set device to master unless set_master succeeds (Sergio) > - meson: Do vblank_on/off on enable/disable (Neil) > - meson: Use fast_io regmap option to avoid sleeping in irq ctx (Lyude) > - meson: Don't walk off the end of the OSD EOTF LUTs (Lyude) > > Cc: Lyude Paul > Cc: Sergio Correia > Cc: Neil Armstrong > > > Christian Hewitt (1): > drm/meson: add support for 1080p25 mode > > Lyude Paul (3): > drm/dp_mst: Skip validating ports during destruction, just ref > drm/meson: Enable fast_io in meson_dw_hdmi_regmap_config > drm/meson: Fix OOB memory accesses in meson_viu_set_osd_lut() > > Neil Armstrong (1): > drm/meson: Fixes for drm_crtc_vblank_on/off support > > Sergio Correia (1): > drm: set is_master to 0 upon drm_new_set_master() failure > > drivers/gpu/drm/drm_auth.c| 2 ++ > drivers/gpu/drm/drm_dp_mst_topology.c | 15 +-- > drivers/gpu/drm/meson/meson_crtc.c| 27 +-- > drivers/gpu/drm/meson/meson_dw_hdmi.c | 1 + > drivers/gpu/drm/meson/meson_venc.c| 4 > drivers/gpu/drm/meson/meson_viu.c | 12 ++-- > 6 files changed, 51 insertions(+), 10 deletions(-) > > -- > Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hi Dave, Happy meson week! A bunch of stellar fixes coming in this week from Lyude, and a couple others plugging holes in meson and core. drm-misc-fixes-2018-11-28: - mst: Don't try to validate ports while destroying them (Lyude) - core: Don't set device to master unless set_master succeeds (Sergio) - meson: Do vblank_on/off on enable/disable (Neil) - meson: Use fast_io regmap option to avoid sleeping in irq ctx (Lyude) - meson: Don't walk off the end of the OSD EOTF LUTs (Lyude) Cc: Lyude Paul Cc: Sergio Correia Cc: Neil Armstrong Cheers, Sean The following changes since commit 2e6e902d185027f8e3cb8b7305238f7e35d6a436: Linux 4.20-rc4 (2018-11-25 14:19:31 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2018-11-28 for you to fetch changes up to 31e1ab494559fb46de304cc6c2aed1528f94b298: drm/meson: add support for 1080p25 mode (2018-11-26 16:14:28 -0500) - mst: Don't try to validate ports while destroying them (Lyude) - core: Don't set device to master unless set_master succeeds (Sergio) - meson: Do vblank_on/off on enable/disable (Neil) - meson: Use fast_io regmap option to avoid sleeping in irq ctx (Lyude) - meson: Don't walk off the end of the OSD EOTF LUTs (Lyude) Cc: Lyude Paul Cc: Sergio Correia Cc: Neil Armstrong Christian Hewitt (1): drm/meson: add support for 1080p25 mode Lyude Paul (3): drm/dp_mst: Skip validating ports during destruction, just ref drm/meson: Enable fast_io in meson_dw_hdmi_regmap_config drm/meson: Fix OOB memory accesses in meson_viu_set_osd_lut() Neil Armstrong (1): drm/meson: Fixes for drm_crtc_vblank_on/off support Sergio Correia (1): drm: set is_master to 0 upon drm_new_set_master() failure drivers/gpu/drm/drm_auth.c| 2 ++ drivers/gpu/drm/drm_dp_mst_topology.c | 15 +-- drivers/gpu/drm/meson/meson_crtc.c| 27 +-- drivers/gpu/drm/meson/meson_dw_hdmi.c | 1 + drivers/gpu/drm/meson/meson_venc.c| 4 drivers/gpu/drm/meson/meson_viu.c | 12 ++-- 6 files changed, 51 insertions(+), 10 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] drm-misc-next
On Wed, Nov 07, 2018 at 09:31:51PM +0100, Daniel Vetter wrote: > On Wed, Nov 7, 2018 at 9:29 PM Sean Paul wrote: > > > > On Wed, Nov 07, 2018 at 09:18:16PM +0100, Daniel Vetter wrote: > > > On Wed, Nov 07, 2018 at 12:58:56PM +0100, Maarten Lankhorst wrote: > > > > Hey Dave, > > > > > > > > First pull for drm-next this cycle. There's been a lot of changes, so I > > > > hope I recorded everything from the changelog correctly. > > > > > > > > drm-misc-next-2018-11-07: > > > > drm-misc-next for v4.21, part 1: > > > > > > > > UAPI Changes: > > > > - Add syncobj timeline support to drm. > > > > > > With all the CI breakage this caused I kinda missed that it didn't get > > > reverted. But afaict this didn't have the ack from anv/radv folks (which I > > > explicitly asked for as part of what I think should be the merge > > > criteria), and I'm not sure where the userspace is, and this here isn't > > > just prep, but already adds new uapi. > > > > > > > +Christian > > > > Can you please land the revert while we get this sorted out? > > The revert was for the CI breakage, which is sorted out differently > already. That was kinda just my excuse for not being in the loop. For > just the uapi disallowing timeline obj creation and moving the #define > away from the uapi include is all that's really needed. Yeah, the uapi #define looked simple enough to back out. Whatever unblocks us from moving forward is good with me. That said, reading through the review thread, this doesn't seem like something that should have been applied in the first place. Sean > > Assuming of course that I'm not again having my stuff all mixed up :-) > -Daniel > > > > > Sean > > > > > The prep work is imo totally ok to keep, but the uapi side seems rather > > > questionable. > > > -Daniel > > > > > > > > > > > Cross-subsystem Changes: > > > > - Remove shared fence staging in dma-buf's fence object, and allow > > > > reserving more than 1 fence and add more paranoia when debugging. > > > > - Constify infoframe functions in video/hdmi. > > > > > > > > Core Changes: > > > > - Add vkms todo, and a lot of assorted doc fixes. > > > > - Drop transitional helpers and convert drivers to use > > > > drm_atomic_helper_shutdown(). > > > > - Move atomic state helper functions to drm_atomic_state_helper.[ch] > > > > - Refactor drm selftests, and add new tests. > > > > - DP MST atomic state cleanups. > > > > - Drop EXPORT_SYMBOL from drm leases. > > > > - Lease cleanups and fixes. > > > > - Create render node for vgem. > > > > > > > > Driver Changes: > > > > - Fix build failure in imx without fbdev emulation. > > > > - Add rotation quirk for GPD win2 panel. > > > > - Add support for various CDTech panels, Banana Pi Panel, DLC1010GIG, > > > > Olimex LCD-O-LinuXino, Samsung S6D16D0, Truly NT35597 WQXGA, > > > > Himax HX8357D, simulated RTSM AEMv8. > > > > - Add dw_hdmi support to rockchip driver. > > > > - Fix YUV support in vc4. > > > > - Fix resource id handling in virtio. > > > > - Make rockchip use dw-mipi-dsi bridge driver, and add dual dsi support. > > > > - Advertise that tinydrm only supports DRM_FORMAT_MOD_LINEAR. > > > > - Convert many drivers to use atomic helpers, and > > > > drm_fbdev_generic_setup(). > > > > - Add Mali linear tiled formats, and enable them in the Mali-DP driver. > > > > - Add support for H6 DE3 mixer 0, DW HDMI, HDMI PHY and TCON TOP. > > > > - Assorted driver cleanups and fixes. > > > > > > > > The following changes since commit > > > > f2bfc71aee75feff33ca659322b72ffeed5a243d: > > > > > > > > Merge tag 'drm-intel-next-fixes-2018-10-18' of > > > > git://anongit.freedesktop.org/drm/drm-intel into drm-next (2018-10-19 > > > > 14:28:11 +1000) > > > > > > > > are available in the Git repository at: > > > > > > > > git://anongit.freedesktop.org/drm/drm-misc > > > > tags/drm-misc-next-2018-11-07 > > > > > > > > for you to fetch changes up to e7afb623b4fb82089c9a50c733c740522b8220bc: > > > > > > > > drm: Add drm_any_plane_has_format() (2018-11-06 21:34:22 +0200) > > > > > > > >
Re: [PULL] drm-misc-next
15): > > dt-bindings: display: sun4i-drm: Add H6 display engine compatibles > > drm/sun4i: Rework DE2 register defines > > drm/sun4i: Fix DE2 mixer size > > drm/sun4i: Disable unused DE2 sub-engines > > drm/sun4i: Add basic support for DE3 > > drm/sun4i: Add support for H6 DE3 mixer 0 > > drm/bridge/synopsys: dw-hdmi: Enable workaround for v2.12a > > drm/sun4i: Not all DW HDMI controllers has scrambled addresses > > drm/sun4i: dw-hdmi: Make mode_valid function configurable > > drm/sun4i: dw-hdmi: Add quirk for setting TMDS clock > > drm/sun4i: Add support for H6 DW HDMI controller > > drm/sun4i: dw-hdmi-phy: Reorder quirks by family > > drm/sun4i: Add support for Synopsys HDMI PHY > > drm/sun4i: Add support for H6 HDMI PHY > > drm/sun4i: Initialize registers in tcon-top driver > > > > José Roberto de Souza (1): > > drm: Do not call drm_dp_cec_set_edid() while registering DP connectors > > > > Linus Walleij (4): > > drm: dsi: Add lane clock rate fields to DSI device > > drm/panel: Add DT bindings for Samsung S6D16D0 > > drm/panel: Add driver for Samsung S6D16D0 panel > > drm/panel: Add simple panel mode for the ARM RTSM > > > > Lyude Paul (2): > > drm/dp_mst: Deprecate drm_dp_find_vcpi_slots() > > drm/dp_mst: Remove all evil duplicate state pointers > > > > Mamta Shukla (2): > > drm: Shift * to be adjacent to pointer name > > drm: msm: adreno: Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) > > +PTR_ERR > > > > Manasi Navare (2): > > drm: Fix kernel doc for DRM_MODE_PROP_IMMUTABLE > > drm/dp: Add definitions for eDP Rev 1.4a and 1.4b > > > > Marco Felsch (1): > > drm/panel: simple: Add DLC1010GIG panel > > > > Matthew Wilcox (2): > > drm/virtio: Replace IDRs with IDAs > > drm/virtio: Handle context ID allocation errors > > > > Maxime Ripard (2): > > drm/sun4i: hdmi: Fix unitialized variable > > drm/sun4i: hdmi: Fix double flag assignation > > > > Nickey Yang (2): > > drm/rockchip: dsi: migrate to use dw-mipi-dsi bridge driver > > drm/bridge/synopsys: dsi: add dual-dsi support > > > > Noralf Trønnes (7): > > drm/meson: Use drm_fbdev_generic_setup() > > drm/stm: Use drm_fbdev_generic_setup() > > drm/arc: Use drm_fbdev_generic_setup() > > drm/fsl-dcu: Use drm_fbdev_generic_setup() > > drm/atmel-hlcdc: Use drm_fbdev_generic_setup() > > drm/sun4i: Use drm_fbdev_generic_setup() > > drm/tilcdc: Use drm_fbdev_generic_setup() > > > > Rob Herring (1): > > drm: Convert to using %pOFn instead of device_node.name > > > > Sabyasachi Gupta (1): > > gpu/drm/virtio/virtgpu_vq.c: Use kmem_cache_zalloc > > > > Satendra Singh Thakur (1): > > drm/fsl-dcu: use drm_display_mode_to_videomode to calculate timing > > parameters > > > > Sean Paul (2): > > Merge drm/drm-next into drm-misc-next > > drm: Fix doc warning in drm_connector_attach_edid_property() > > > > Shayenne da Luz Moura (7): > > drm/qxl: Remove trailing whitespace > > drm/qxl: Add line after variable declarations > > drm/qxl: Remove exceding whiteline > > drm/qxl: Use 'unsigned int' instead of 'usigned' > > drm/qxl: Add space before open parentheses > > drm/qxl: Use 'unsigned int' instead of 'bool' > > drm: Remove 80-column line in drm_mode_object.c > > > > Souptick Joarder (2): > > drm/rcar-du: Convert drm_atomic_helper_suspend/resume() > > drm/drm_pci.c: Use dma_zalloc_coherent > > > > Stefan Agner (1): > > drm/fsl-dcu: drop unused drm_crtc_index() > > > > Stefan Mavrodiev (1): > > drm/panel: Add support for Olimex LCD-OLinuXino panel > > > > Thomas Hellstrom (1): > > drm/vmwgfx: Fix vmw_du_cursor_plane_atomic_check > > > > Thomas Zimmermann (3): > > drm/atmel-hlcdc: Replace drm_dev_unref with drm_dev_put > > drm/zte: Replace drm_dev_unref with drm_dev_put > > drm/bochs: Replace drm_gem_object_unreference_unlocked with put > > function > > > > Ville Syrjälä (5): > > video/hdmi: Constify 'buffer' to the unpack functions > > video/hdmi: Pass buffer size to infoframe unpack functions > > video/hdmi: Constify infoframe passed to the log functions
[PULL] drm-misc-next-fixes
Hi Dave,
A few patches to round out the merge window. 6/7 are from one series fixing up
things around bridge/panel.
drm-misc-next-fixes-2018-10-31:
- Properly label Innolux TV123WAM as P120ZDG-BF1 (Doug)
- Add optional delay for panels without hpd hooked up (which solves the
mystery delay for TI SN65DSI86 bridge) (Doug)
- Another 6bpc quirk for BOE panel 0x0771 (Shawn)
Cc: Doug Anderson
Cc: Lee, Shawn C
Cheers, Sean
The following changes since commit f2bfc71aee75feff33ca659322b72ffeed5a243d:
Merge tag 'drm-intel-next-fixes-2018-10-18' of
git://anongit.freedesktop.org/drm/drm-intel into drm-next (2018-10-19 14:28:11
+1000)
are available in the Git repository at:
git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2018-10-31
for you to fetch changes up to 8f054b6f53ff34fb787bde4c5940f86a9c175177:
drm/panel: simple: Innolux TV123WAM is actually P120ZDG-BF1 (2018-10-29
11:53:28 -0400)
- Properly label Innolux TV123WAM as P120ZDG-BF1 (Doug)
- Add optional delay for panels without hpd hooked up (which solves the
mystery delay for TI SN65DSI86 bridge) (Doug)
- Another 6bpc quirk for BOE panel 0x0771 (Shawn)
Cc: Doug Anderson
Cc: Lee, Shawn C
Douglas Anderson (6):
dt-bindings: drm/panel: simple: Add no-hpd property
drm/panel: simple: Support panels with HPD where HPD isn't connected
drm/panel: simple: Add "no-hpd" delay for Innolux TV123WAM
drm/bridge: ti-sn65dsi86: Remove the mystery delay
dt-bindings: drm/panel: simple: Innolux TV123WAM is actually P120ZDG-BF1
drm/panel: simple: Innolux TV123WAM is actually P120ZDG-BF1
Lee, Shawn C (1):
drm/edid: Add 6 bpc quirk for BOE panel.
...nnolux,tv123wam.txt => innolux,p120zdg-bf1.txt} | 8 +++---
.../bindings/display/panel/simple-panel.txt| 3 +++
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 29 --
drivers/gpu/drm/drm_edid.c | 3 +++
drivers/gpu/drm/panel/panel-simple.c | 29 +++---
5 files changed, 47 insertions(+), 25 deletions(-)
rename Documentation/devicetree/bindings/display/panel/{innolux,tv123wam.txt
=> innolux,p120zdg-bf1.txt} (70%)
--
Sean Paul, Software Engineer, Google / Chromium OS
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PATCH v2] doc: move drm-misc committer guidelines
On Wed, Oct 31, 2018 at 09:52:27AM +0200, Jani Nikula wrote: > Move drm-misc under the common committer guidelines. > > v2: s/drm-intel/drm-misc/ under tooling (Emil) > > Acked-by: Daniel Stone > Reviewed-by: Emil Velikov > Signed-off-by: Jani Nikula > --- > committer-drm-misc.rst | 101 > +++ > committer-guidelines.rst | 1 + > drm-misc.rst | 95 > 3 files changed, 102 insertions(+), 95 deletions(-) > create mode 100644 committer-drm-misc.rst > > diff --git a/committer-drm-misc.rst b/committer-drm-misc.rst > new file mode 100644 > index ..53cffea548ff > --- /dev/null > +++ b/committer-drm-misc.rst > @@ -0,0 +1,101 @@ > +.. _committer-drm-misc: > + > +=== > + drm-misc Committer Guidelines > +=== > + > +This document describes the detailed merge criteria and committer guidelines > for > +drm-misc. The same criteria and guidelines apply equally to both committers > and > +maintainers. > + > +Where Do I Apply My Patch? > +== > + > +Consult this handy flowchart to determine the best branch for your patch. If > in > +doubt, apply to drm-misc-next or ask your favorite maintainer on IRC. > + > +.. image:: drm-misc-commit-flow.svg > + > +Merge Criteria > +== > + > +Right now the only hard merge criteria are: > + > +* 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 > + caught. > + > +* drm-misc is for drm core (non-driver) patches, subsystem-wide refactorings, > + and small trivial patches all over (including drivers). For a detailed > list of > + what's all maintained in drm-misc grep for "drm-misc" in MAINTAINERS. > + > +* Larger features can be merged through drm-misc too, but in some cases > + (especially when there are cross-subsystem conflicts) it might make sense > to > + merge patches through a dedicated topic tree. The dim_ tooling has full > + support for them, if needed. > + > +* Any non-linear actions (backmerges, merging topic branches and sending out > + pull requests) are only done by the official drm-misc maintainers (see > + MAINTAINERS, or ask #dri-devel), and not by committers. See the > + `examples section in dim `_ for more info > + > +* All the x86, arm and arm64 DRM drivers need to still compile. To simplify > this > + we track defconfigs for all three platforms in the `drm-intel-rerere` > branch. s/drm-intel-rerere/rerere-cache/ ? > + > +* The goal is to also pre-check everything with CI. Unfortunately neither the > + arm side (using kernelci.org and generic i-g-t tests) nor the Intel side > + (using Intel CI infrastructure and the full i-g-t suite) isn't yet fully > ready s/isn't yet/is/ > + for production. > + > +* No rebasing out mistakes, because this is a shared tree. > + > +* See also the extensive :ref:`committer-drm-intel`. > + > +Small Drivers > += > + > +Small drivers, where a full tree is overkill, can be maintained in drm-misc. > For > +now there are just a few drivers maintained in drm-misc, but we can slowly > add We're beyond "just a few" at this point. Can you just remove this sentence? With those, Reviewed-by: Sean Paul > +more to figure out how to make this scale. Slightly different rules apply: > + > +* Small is measured in patches merged per kernel release. The occasional big > + patch series is still acceptable if it's not a common thing (e.g. new hw > + enabling once a year), and if the series is really big (more than 20 > patches) > + it should probably be managed through a topic branch in drm-misc and with a > + separate pull request to drm maintainer. dim_ supports this with the > + create-branch command. Everything that doesn't justify a topic branch goes > + into the normal drm-misc branches directly. > + > +* Group maintainership is assumed, i.e. all regular contributors (not just > + the primary maintainer) will get commit rights. > + > +* Since even a broken driver is more useful than no driver minimal review > + standards are a lot lower. The default should be some notes about what > could > + be improved in follow-up work and accepting patches by default. Maintainer > + group for drivers can agree on stricter rules, especially when they have a > + bigger user base that shouldn't suffer from regressions. > + > +* Minimal peer-review is also expected fo
Re: [PATCH 11/11] doc: move drm-misc maintainer guidelines
On Thu, Oct 25, 2018 at 06:22:11PM +0300, Jani Nikula wrote: > Move drm-misc under the common maintainer guidelines. > > Signed-off-by: Jani Nikula Reviewed-by: Sean Paul > --- > drm-misc.rst | 44 > maintainer-drm-misc.rst | 51 > +++ > maintainer-guidelines.rst | 1 + > 3 files changed, 52 insertions(+), 44 deletions(-) > create mode 100644 maintainer-drm-misc.rst > > diff --git a/drm-misc.rst b/drm-misc.rst > index 832aeb33ffe9..b55a5f49e5a8 100644 > --- a/drm-misc.rst > +++ b/drm-misc.rst > @@ -43,47 +43,3 @@ releases at the same time. Big features take a long time > to hit a kernel > release. There are no fast paths. > > .. include:: drm-misc-timeline.rst > - > -Maintainer's Duties > -=== > - > -Maintainers mostly provide services to keep drm-misc running smoothly: > - > -* Coordinate cross-subsystem dependencies and handle topic branches, sending > out > - pull request and merging topic pull requests from other subsystems. > - > -* At least once per week check for pending bugfixes (using ``dim status``) > and > - if there are any (either in `-fixes` or `-next-fixes`), send out the pull > - request. > - > -* Fast-forward (when possible) `-fixes` to each released -rc kernel tag, to > - keep it current. We try to avoid backmerges for bugfix branches, and > rebasing > - isn't an option with multiple committers. > - > -* Pull requests become noisy if `-fixes` has been fast-forwarded to Linus' > - latest -rc tag but drm-upstream hasn't done the same yet: The shortlog > - will contain not just the queued fixes but also anything else that has > - landed in Linus' tree in the meantime. The best practice is then to base > - the pull request on Linus' master branch (rather than drm-upstream) by > - setting the `upstream` argument for ``dim pull-request`` accordingly. > - Upstream should be warned that they haven't fast-forwarded yet. > - > -* During the merge-window blackout, i.e. from -rc6 on until the merge window > - closes with the release of -rc1, try to track `drm-next` with the > - `-next-fixes` branch. Do not advance past -rc1, otherwise the automagic in > - the scripts will push the wrong patches to the linux-next tree. > - > -* Between -rc1 and -rc6 send pull requests for the `-next` branch every 1-2 > - weeks, depending upon how much is queued up. > - > -* Backmerge `drm-next` into the `-next` branch when needed, properly > recording > - that reason in the merge commit message. Do a backmerge at least once per > - month to avoid conflict chaos, and specifically merge in the main drm > feature > - pull request, to resync with all the late driver submissions during the > merge > - window. > - > -* Last resort fallback for applying patches, in case all area expert > committers > - are somehow unavailable. > - > -* Take the blame when something goes wrong. Maintainers interface and > represent > - the entire group of committers to the wider kernel community. > diff --git a/maintainer-drm-misc.rst b/maintainer-drm-misc.rst > new file mode 100644 > index ..462deff5b04c > --- /dev/null > +++ b/maintainer-drm-misc.rst > @@ -0,0 +1,51 @@ > +.. _maintainer-drm-misc: > + > + > + drm-misc Maintainer Guidelines > + > + > +This document describes the detailed maintainer tasks for drm-misc. > + > +Maintainer's Duties > +=== > + > +Maintainers mostly provide services to keep drm-misc running smoothly: > + > +* Coordinate cross-subsystem dependencies and handle topic branches, sending > out > + pull request and merging topic pull requests from other subsystems. > + > +* At least once per week check for pending bugfixes (using ``dim status``) > and > + if there are any (either in `-fixes` or `-next-fixes`), send out the pull > + request. > + > +* Fast-forward (when possible) `-fixes` to each released -rc kernel tag, to > + keep it current. We try to avoid backmerges for bugfix branches, and > rebasing > + isn't an option with multiple committers. > + > +* Pull requests become noisy if `-fixes` has been fast-forwarded to Linus' > + latest -rc tag but drm-upstream hasn't done the same yet: The shortlog > + will contain not just the queued fixes but also anything else that has > + landed in Linus' tree in the meantime. The best practice is then to base > + the pull request on Linus' master branch (rather than drm-upstream) by > + setting the `upstream` argument for ``dim pull-request`` accordingly. > + Upstream should be warned
Re: [PATCH 07/11] doc: make adherence to CoC an explicit requirement for commit access
On Thu, Oct 25, 2018 at 06:22:07PM +0300, Jani Nikula wrote: > This was implied before, but better make it explicit. > > Signed-off-by: Jani Nikula Reviewed-by: Sean Paul > --- > commit-access.rst | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/commit-access.rst b/commit-access.rst > index 923eaf359f71..0366134b9f16 100644 > --- a/commit-access.rst > +++ b/commit-access.rst > @@ -29,7 +29,7 @@ below criteria: >stack who only do the oddball rare patch within drm-misc itself. > > - Agrees to use their commit rights in accordance with the documented merge > - criteria, tools, and processes. > + criteria, tools, processes, and :ref:`code-of-conduct`. > > Apply for an account (and any other account change requests) through > > @@ -73,7 +73,7 @@ following criteria: >occasional patch within i915 itself. > > - Agrees to use their commit rights in accordance with the documented merge > - criteria, tools, and processes. > + criteria, tools, processes, and :ref:`code-of-conduct`. > > The above criteria are in place to encourage and require committers are > actively > and broadly engaged upstream, and that they are acquainted and comfortable > with > -- > 2.11.0 > > ___ > dim-tools mailing list > dim-tools@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PATCH 06/11] doc: consolidate code of conduct note to one place
On Thu, Oct 25, 2018 at 06:22:06PM +0300, Jani Nikula wrote: > Add new code of conduct file, also reference the kernel code of conduct. > > Signed-off-by: Jani Nikula Reviewed-by: Sean Paul > --- > code-of-conduct.rst | 23 +++ > commit-access.rst | 15 --- > drm-misc.rst| 13 - > index.rst | 1 + > 4 files changed, 24 insertions(+), 28 deletions(-) > create mode 100644 code-of-conduct.rst > > diff --git a/code-of-conduct.rst b/code-of-conduct.rst > new file mode 100644 > index ..75ce12ba86c1 > --- /dev/null > +++ b/code-of-conduct.rst > @@ -0,0 +1,23 @@ > +.. _code-of-conduct: > + > += > + Code of Conduct > += > + > +Please be aware the freedesktop.org Code of Conduct applies to projects it > +hosts, including the drm subsystem, igt, maintainer tools, etc: > + > +https://www.freedesktop.org/wiki/CodeOfConduct/ > + > +Please be aware also the kernel.org Code of Conduct applies to kernel > +development: > + > +https://www.kernel.org/code-of-conduct.html > + > +See the kernel MAINTAINERS file for contact details of the drm maintainers. > + > +Abuse of commit rights, like engaging in commit fights or willfully pushing > +patches that violate the documented merge criteria or process, will also be > +handled through the Code of Conduct enforcement process. Violations may lead > to > +temporary or permanent account or commit rights suspension according to > +freedesktop.org umbrella rules. > diff --git a/commit-access.rst b/commit-access.rst > index 0bb9ec912535..923eaf359f71 100644 > --- a/commit-access.rst > +++ b/commit-access.rst > @@ -104,18 +104,3 @@ reinstated when they come back to the project. > > Maintainers and committers should encourage contributors to request commit > rights. > - > -Code of Conduct > -~~~ > - > -Please be aware the freedesktop.org Code of Conduct also applies to i915: > - > -https://www.freedesktop.org/wiki/CodeOfConduct/ > - > -See the MAINTAINERS file for contact details of the i915 maintainers. > - > -Abuse of commit rights, like engaging in commit fights or willfully pushing > -patches that violate the documented merge criteria or process, will also be > -handled through the Code of Conduct enforcement process. Violations may lead > to > -temporary or permanent account or commit rights suspension according to > -freedesktop.org umbrella rules. > diff --git a/drm-misc.rst b/drm-misc.rst > index 8cd350596597..a0217bc78f1d 100644 > --- a/drm-misc.rst > +++ b/drm-misc.rst > @@ -175,19 +175,6 @@ Maintainers mostly provide services to keep drm-misc > running smoothly: > * Take the blame when something goes wrong. Maintainers interface and > represent >the entire group of committers to the wider kernel community. > > -Code of Conduct > -=== > - > -Please be aware the fd.o Code of Conduct also applies to drm-misc: > - > -https://www.freedesktop.org/wiki/CodeOfConduct/ > - > -See the MAINTAINERS file for contact details of the drm-misc maintainers. > - > -Abuse of commit rights, like engaging in commit fights or willfully pushing > -patches that violate the documented merge criteria, will also be handled > through > -the Code of Conduct enforcement process. > - > Tooling > === > > diff --git a/index.rst b/index.rst > index 0a9841f532b0..2a73f5de5bed 100644 > --- a/index.rst > +++ b/index.rst > @@ -30,6 +30,7 @@ Contents: > getting-started > dim > qf > + code-of-conduct > CONTRIBUTING > MAINTAINERS > COPYING > -- > 2.11.0 > > ___ > dim-tools mailing list > dim-tools@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PATCH 05/11] doc: move commit rights criteria to shared doc
On Thu, Oct 25, 2018 at 06:22:05PM +0300, Jani Nikula wrote: > No changes in criteria, just rearrangement. > > Signed-off-by: Jani Nikula Reviewed-by: Sean Paul > --- > commit-access.rst | 32 +++- > drm-misc.rst | 35 --- > 2 files changed, 31 insertions(+), 36 deletions(-) > > diff --git a/commit-access.rst b/commit-access.rst > index 54a7402714cd..0bb9ec912535 100644 > --- a/commit-access.rst > +++ b/commit-access.rst > @@ -12,7 +12,37 @@ This document outlines the requirements for becoming a > committer. > drm-misc > > > -See :ref:`drm-misc`. > +Commit rights will be granted to anyone who requests them and fulfills the > +below criteria: > + > +- Submitted a few (5-10 as a rule of thumb) non-trivial (not just simple > + spelling fixes and whitespace adjustment) patches that have been merged > + already. > + > +- Are actively participating on discussions about their work (on the mailing > + list or IRC). This should not be interpreted as a requirement to review > other > + peoples patches but just make sure that patch submission isn't one-way > + communication. Cross-review is still highly encouraged. > + > +- Will be regularly contributing further patches. This includes regular > + contributors to other parts of the linux kernel or the open source graphics > + stack who only do the oddball rare patch within drm-misc itself. > + > +- Agrees to use their commit rights in accordance with the documented merge > + criteria, tools, and processes. > + > +Apply for an account (and any other account change requests) through > + > +https://www.freedesktop.org/wiki/AccountRequests/ > + > +and please ping the maintainers if your request is stuck. > + > +Committers are encouraged to request their commit rights get removed when > they > +no longer contribute to the project. Commit rights will be reinstated when > they > +come back to the project. > + > +Maintainers and committers should encourage contributors to request commit > +rights, especially junior contributors tend to underestimate their skills. > > drm-intel > - > diff --git a/drm-misc.rst b/drm-misc.rst > index d5f56c3df337..8cd350596597 100644 > --- a/drm-misc.rst > +++ b/drm-misc.rst > @@ -175,41 +175,6 @@ Maintainers mostly provide services to keep drm-misc > running smoothly: > * Take the blame when something goes wrong. Maintainers interface and > represent >the entire group of committers to the wider kernel community. > > -Commit Rights > -= > - > -Commit rights will be granted to anyone who requests them and fulfills the > -below criteria: > - > -- Submitted a few (5-10 as a rule of thumb) non-trivial (not just simple > - spelling fixes and whitespace adjustment) patches that have been merged > - already. > - > -- Are actively participating on discussions about their work (on the mailing > - list or IRC). This should not be interpreted as a requirement to review > other > - peoples patches but just make sure that patch submission isn't one-way > - communication. Cross-review is still highly encouraged. > - > -- Will be regularly contributing further patches. This includes regular > - contributors to other parts of the linux kernel or the open source graphics > - stack who only do the oddball rare patch within drm-misc itself. > - > -- Agrees to use their commit rights in accordance with the documented merge > - criteria, tools, and processes. > - > -Apply for an account (and any other account change requests) through > - > -https://www.freedesktop.org/wiki/AccountRequests/ > - > -and please ping the maintainers if your request is stuck. > - > -Committers are encouraged to request their commit rights get removed when > they > -no longer contribute to the project. Commit rights will be reinstated when > they > -come back to the project. > - > -Maintainers and committers should encourage contributors to request commit > -rights, especially junior contributors tend to underestimate their skills. > - > Code of Conduct > === > > -- > 2.11.0 > > ___ > dim-tools mailing list > dim-tools@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PATCH 02/11] doc: update CONTRIBUTING and add MAINTAINERS file
On Thu, Oct 25, 2018 at 06:54:26PM +0300, Jani Nikula wrote: > On Thu, 25 Oct 2018, Sean Paul wrote: > > On Thu, Oct 25, 2018 at 06:22:02PM +0300, Jani Nikula wrote: > >> Refresh contributing, accept issues at fdo gitlab, and add separate > >> maintainers file for clarity. > >> > >> Signed-off-by: Jani Nikula > >> --- > >> CONTRIBUTING.rst | 20 +++- > >> MAINTAINERS.rst | 10 ++ > >> index.rst| 1 + > >> 3 files changed, 26 insertions(+), 5 deletions(-) > >> create mode 100644 MAINTAINERS.rst > >> > >> diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst > >> index c7846e318b7e..2a83590e0442 100644 > >> --- a/CONTRIBUTING.rst > >> +++ b/CONTRIBUTING.rst > >> @@ -1,11 +1,21 @@ > >> -CONTRIBUTING > >> - > >> +.. _contributing: > >> > >> -Submit patches, bug reports, and questions for any of the maintainer > >> tools and > >> -documentation to the dim-tools@lists.freedesktop.org mailing list. > >> +== > >> + Contributing and Contact > >> +== > >> + > >> +Please use the `dim-tools@lists.freedesktop.org`_ mailing list for > >> +contributions, bug reports, and discussion about the tooling and > >> +documentation. You may also file `issues`_ at the `project home page`_. > >> > >> Please make sure your patches pass the build and self tests by running:: > >> > >>$ make check > >> > >> -Push the patches once you have an ack from maintainers (Jani/Daniel). > >> +Push the patches once you have an ack from :ref:`maintainers`. > >> + > >> +.. _dim-to...@lists.freedesktop.org: > >> https://lists.freedesktop.org/mailman/listinfo/dim-tools > >> + > >> +.. _issues: https://gitlab.freedesktop.org/drm/maintainer-tools/issues > >> + > >> +.. _project home page: > >> https://gitlab.freedesktop.org/drm/maintainer-tools/ > >> diff --git a/MAINTAINERS.rst b/MAINTAINERS.rst > >> new file mode 100644 > >> index ..794ab99ae0e4 > >> --- /dev/null > >> +++ b/MAINTAINERS.rst > >> @@ -0,0 +1,10 @@ > >> +.. _maintainers: > >> + > >> += > >> + Maintainers > >> += > >> + > >> +The maintainer tools and documentation is maintained by: > >> + > >> +* Daniel Vetter > >> +* Jani Nikula > > > > I wonder if you'd be better off just pointing to [1] instead of trying to > > keep > > this up-to-date. Unfortunately that page also shows airlied and I as owners > > (which I guess is inherited from the group?). > > I think I'd probably like to add the MAINTAINERS.rst file anyway, so > this patch is a step in that direction. Looking at [1], the names I'm > adding are already stale, just copy-pasting the status quo... and I > don't even know the difference between owner and maintainer in gitlab > speak. Can you do everything that a maintainer can do? Owner is a superset of Maintainer, iiuc. Sean > > BR, > Jani. > > > > > Sean > > > > [1]- https://gitlab.freedesktop.org/drm/maintainer-tools/project_members > > > > > > > >> diff --git a/index.rst b/index.rst > >> index 46ba235514c8..228ca8790f59 100644 > >> --- a/index.rst > >> +++ b/index.rst > >> @@ -17,6 +17,7 @@ Contents: > >> dim > >> qf > >> CONTRIBUTING > >> + MAINTAINERS > >> TODO > >> > >> Indices and tables > >> -- > >> 2.11.0 > >> > >> ___ > >> dim-tools mailing list > >> dim-tools@lists.freedesktop.org > >> https://lists.freedesktop.org/mailman/listinfo/dim-tools > > -- > Jani Nikula, Intel Open Source Graphics Center -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PATCH 02/11] doc: update CONTRIBUTING and add MAINTAINERS file
On Thu, Oct 25, 2018 at 06:22:02PM +0300, Jani Nikula wrote: > Refresh contributing, accept issues at fdo gitlab, and add separate > maintainers file for clarity. > > Signed-off-by: Jani Nikula > --- > CONTRIBUTING.rst | 20 +++- > MAINTAINERS.rst | 10 ++ > index.rst| 1 + > 3 files changed, 26 insertions(+), 5 deletions(-) > create mode 100644 MAINTAINERS.rst > > diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst > index c7846e318b7e..2a83590e0442 100644 > --- a/CONTRIBUTING.rst > +++ b/CONTRIBUTING.rst > @@ -1,11 +1,21 @@ > -CONTRIBUTING > - > +.. _contributing: > > -Submit patches, bug reports, and questions for any of the maintainer tools > and > -documentation to the dim-tools@lists.freedesktop.org mailing list. > +== > + Contributing and Contact > +== > + > +Please use the `dim-tools@lists.freedesktop.org`_ mailing list for > +contributions, bug reports, and discussion about the tooling and > +documentation. You may also file `issues`_ at the `project home page`_. > > Please make sure your patches pass the build and self tests by running:: > >$ make check > > -Push the patches once you have an ack from maintainers (Jani/Daniel). > +Push the patches once you have an ack from :ref:`maintainers`. > + > +.. _dim-to...@lists.freedesktop.org: > https://lists.freedesktop.org/mailman/listinfo/dim-tools > + > +.. _issues: https://gitlab.freedesktop.org/drm/maintainer-tools/issues > + > +.. _project home page: https://gitlab.freedesktop.org/drm/maintainer-tools/ > diff --git a/MAINTAINERS.rst b/MAINTAINERS.rst > new file mode 100644 > index ..794ab99ae0e4 > --- /dev/null > +++ b/MAINTAINERS.rst > @@ -0,0 +1,10 @@ > +.. _maintainers: > + > += > + Maintainers > += > + > +The maintainer tools and documentation is maintained by: > + > +* Daniel Vetter > +* Jani Nikula I wonder if you'd be better off just pointing to [1] instead of trying to keep this up-to-date. Unfortunately that page also shows airlied and I as owners (which I guess is inherited from the group?). Sean [1]- https://gitlab.freedesktop.org/drm/maintainer-tools/project_members > diff --git a/index.rst b/index.rst > index 46ba235514c8..228ca8790f59 100644 > --- a/index.rst > +++ b/index.rst > @@ -17,6 +17,7 @@ Contents: > dim > qf > CONTRIBUTING > + MAINTAINERS > TODO > > Indices and tables > -- > 2.11.0 > > ___ > dim-tools mailing list > dim-tools@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next-fixes
Hi Dave, Just one quirk this week, things are shaping up nicely for the upcoming merge window! drm-misc-next-fixes-2018-10-17: - Add quirk to fix orientation of Acer One 10 (S1003) panel (Hans) Cc: Hans de Goede Cheers, Sean The following changes since commit 7372fd049aa8836310f84da5f82dc9eb146915c8: MAINTAINERS: Add Maxime Ripard as drm-misc maintainer (2018-10-09 16:16:54 -0400) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2018-10-17 for you to fetch changes up to 0e8afefd5da4875ddea9aa4ad17a2540a2bf9736: drm: panel-orientation-quirks: Add quirk for Acer One 10 (S1003) (2018-10-17 14:17:38 +0200) - Add quirk to fix orientation of Acer One 10 (S1003) panel (Hans) Cc: Hans de Goede Hans de Goede (1): drm: panel-orientation-quirks: Add quirk for Acer One 10 (S1003) drivers/gpu/drm/drm_panel_orientation_quirks.c | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PATCH 2/2] dim: TODO: Add dim managing dim to the TODO
From: Sean Paul dim mostly works with the maintainer-tools branch, so add a TODO to cleanup the remaining issues so dim can manage dim. Signed-off-by: Sean Paul --- TODO.rst | 4 1 file changed, 4 insertions(+) diff --git a/TODO.rst b/TODO.rst index ab4a43f2b3b6..84d5ca95999f 100644 --- a/TODO.rst +++ b/TODO.rst @@ -20,6 +20,10 @@ dim - Harvest and add Cc labels to all authors when tagging a branch (ex: https://cgit.freedesktop.org/drm-misc/tag/?h=drm-misc-next-2018-03-21) - Parse Cc labels from tag body and add as email headers when sending pull requests +- Add support to manage maintainer-tools branch in dim. It mostly works with the + exception of push-branch which pushes to remote:maintainer-tools instead of + remote:master (or w/e the destination branch is). We should also skip + rebuild-tip if the branch being pushed is not in the integration target. qf -- -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PATCH 1/2] dim: TODO: Remove extract-tags item
From: Sean Paul It has been merged Signed-off-by: Sean Paul --- TODO.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/TODO.rst b/TODO.rst index 028bfcf7dead..ab4a43f2b3b6 100644 --- a/TODO.rst +++ b/TODO.rst @@ -11,7 +11,6 @@ dim https://lists.linuxfoundation.org/pipermail/ksummit-discuss/2014-May/000554.html - add patchwork Link: also after manually resolving conflicts in drm apply-resolved -- pull in dim extract-tags tool from Ville - allow dim rebuild-nightly to pull branches from local trees in dry-run mode. This is useful to confirm a backmerge is indeed correct, by comparing the resulting -nightly with the old one. Current the branch must be pushed out -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PATCH] doc: Fix link to drm repository
From: Sean Paul Still pointed at ~airlied/linux. Reported-by: Eric Engestrom Signed-off-by: Sean Paul --- repositories.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repositories.rst b/repositories.rst index 44009656d5b2..b39ac26da7f9 100644 --- a/repositories.rst +++ b/repositories.rst @@ -35,7 +35,7 @@ The Upstream DRM Subsystem Repository See `drm upstream`_ for repository details. Maintained by Dave Airlie of Red Hat. Consists mostly of ``drivers/gpu/drm`` and ``include/drm``. -.. _drm upstream: https://cgit.freedesktop.org/~airlied/linux/ +.. _drm upstream: https://cgit.freedesktop.org/drm/drm drm-next -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next
c_helper.h|1 + include/drm/drm_atomic_uapi.h | 58 + include/drm/drm_color_mgmt.h |1 + include/drm/drm_connector.h|1 + include/drm/drm_drv.h |1 - include/drm/drm_encoder.h |1 + include/drm/drm_fb_helper.h| 22 + include/drm/drm_fourcc.h | 22 + include/drm/drm_mode_config.h | 15 + include/drm/drm_plane.h|3 + include/drm/drm_property.h |2 + include/drm/drm_syncobj.h |4 +- include/drm/drm_util.h | 32 + include/linux/console_struct.h |1 - include/linux/fb.h |9 +- include/linux/vt_kern.h|7 - include/uapi/drm/drm_fourcc.h |3 + include/uapi/drm/drm_mode.h|3 +- 85 files changed, 2327 insertions(+), 2261 deletions(-) create mode 100644 Documentation/gpu/vkms.rst create mode 100644 drivers/gpu/drm/drm_atomic_uapi.c create mode 100644 include/drm/drm_atomic_uapi.h create mode 100644 include/drm/drm_util.h -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next for 4.20
Hi Dave, Here's the first PR for 4.20 (Seth Rogan edition). It's super light compared to most PRs after feature freeze. Perhaps we were all enjoying summer a bit too much! Anyways, nothing controversial, tag description says it all. drm-misc-next-2018-08-30: drm-misc-next for 4.20: UAPI Changes: - Add per-plane blend mode property (Lowry) - Change in drm_fourcc.h is documentation only (Brian) Cross-subsystem Changes: - None Core Changes: - Add get/verify_crc_source for improved crc source selection (Mahesh) - Add __drm_atomic_helper_plane_reset to reduce copypasta (Alexandru) Driver Changes: - various: Replance ref/unref calls with drm_dev_get/put (Thomas) - bridge: Add driver for TI SN65DSI86 chip (Sandeep) - rockchip: Add PX30 support (Sandy) - sun4i: Add support for R40 TCON (Jernej) - vkms: Continued building out vkms, added gem support (Haneen) Cc: Thomas Zimmermann Cc: Sandeep Panda Cc: Sean Paul Cc: Sandy Huang Cc: Lowry Li Cc: Brian Starkey Cc: Jernej Skrabec Cc: Haneen Mohammed Cc: Alexandru Gheorghe Cheers, Sean The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3: Linux 4.19-rc1 (2018-08-26 14:11:59 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2018-08-30 for you to fetch changes up to 09c4b49457434fa74749ad6194ef28464d9f5df9: drm/virtio: fix bounds check in virtio_gpu_cmd_get_capset() (2018-08-30 09:41:03 +0200) drm-misc-next for 4.20: UAPI Changes: - Add per-plane blend mode property (Lowry) - Change in drm_fourcc.h is documentation only (Brian) Cross-subsystem Changes: - None Core Changes: - Add get/verify_crc_source for improved crc source selection (Mahesh) - Add __drm_atomic_helper_plane_reset to reduce copypasta (Alexandru) Driver Changes: - various: Replance ref/unref calls with drm_dev_get/put (Thomas) - bridge: Add driver for TI SN65DSI86 chip (Sandeep) - rockchip: Add PX30 support (Sandy) - sun4i: Add support for R40 TCON (Jernej) - vkms: Continued building out vkms, added gem support (Haneen) Cc: Thomas Zimmermann Cc: Sandeep Panda Cc: Sean Paul Cc: Sandy Huang Cc: Lowry Li Cc: Brian Starkey Cc: Jernej Skrabec Cc: Haneen Mohammed Cc: Alexandru Gheorghe Alexandru Gheorghe (8): drm/atomic: Add __drm_atomic_helper_plane_reset drm: mali-dp: Use __drm_atomic_helper_plane_reset instead of copying the logic drm: atmel-hlcdc: Use __drm_atomic_helper_plane_reset instead of copying the logic drm/imx: Use __drm_atomic_helper_plane_reset instead of copying the logic drm/sun4i: Use __drm_atomic_helper_plane_reset instead of copying the logic drm: rcar-du: Use __drm_atomic_helper_plane_reset instead of copying the logic drm/vc4: Use __drm_atomic_helper_plane_reset instead of copying the logic drm/vmwgfx: Use __drm_atomic_helper_plane_reset instead of copying the logic Andrzej Hajda (3): dt-bindings: tc358754: add DT bindings drm/bridge: tc358764: Add DSI to LVDS bridge driver drm/bridge/tc358764: fix drm helper name Anton Vasilyev (2): drm: qxl: Fix error handling at qxl_device_init drm: qxl: Fix NULL pointer dereference at qxl_alloc_client_monitors_config Archit Taneja (2): dt-bindings: mipi-dsi: Add info about peripherals with non-DSI control bus dt-bindings: mipi-dsi: Add dual-channel DSI related info Ayan Kumar Halder (2): drm/sun4i: Use (struct drm_format_info) fields to determine if a format is yuv and multi planar or not. drm: Use horizontal and vertical chroma subsampling factor while calculating offsets in the physical address of framebuffer Brian Starkey (1): drm/fourcc: Add DOC: overview comment Chris Wilson (1): dma-buf: Remove requirement for ops->map() from dma_buf_export Dan Carpenter (1): drm/virtio: fix bounds check in virtio_gpu_cmd_get_capset() Daniel Vetter (5): drm/i915: Remove unecessary dma_fence_ops drm/msm: Remove unecessary dma_fence_ops drm/nouveau: Remove unecessary dma_fence_ops drm/vgem: Remove unecessary dma_fence_ops drm/syncobj: Drop add/remove_callback from driver interface Gerd Hoffmann (1): drm/cirrus: flip default from 24bpp to 16bpp Giulio Benetti (1): drm/sun4i: Handle DRM_BUS_FLAG_PIXDATA_*EDGE checking if panel is used. Guenter Roeck (1): drm/bridge: ti-sn65dsi86: Fix 0-day build error Gustavo A. R. Silva (2): drm/sun4i: tcon-top: Use struct_size() in devm_kzalloc() drm/rockchip: Use struct_size() in devm_kzalloc() Haneen Mohammed (8): drm/vkms: Add functions to map/unmap GEM backing storage drm/vkms: map/unmap buffers in [prepare/cleanup]_fb hooks drm/vkms: Add atomic_helper_check_plane_state drm/vkms: subclass CRTC state drm/vkms: Subclass plane state drm/v
Re: [PATCH 1/2] dim: Migrate to Gitlab
On Wed, Aug 29, 2018 at 08:18:20PM +0200, Daniel Vetter wrote:
> On Wed, Aug 29, 2018 at 7:42 PM, Sean Paul wrote:
> > On Wed, Aug 29, 2018 at 01:40:26PM -0400, Sean Paul wrote:
> >> On Wed, Aug 29, 2018 at 07:32:26PM +0200, Daniel Vetter wrote:
> >> > On Wed, Aug 29, 2018 at 7:10 PM, Sean Paul wrote:
> >> > > On Wed, Aug 29, 2018 at 05:25:24PM +0200, Daniel Vetter wrote:
> >> > >> - Use the https url so we don't require everyone to have their gitlab
> >> > >> accounts ready already. Otherwise we'd need to gate migrating
> >> > >> maintainer-tools on migrating all the drm kernel repos, and I'd
> >> > >> really like to partition the migration. Also, we want to reduce
> >> > >> maintainer-tools committers anyway, to shrink the attack surface a
> >> > >> lot.
> >> > >>
> >> > >> Committers need to either set up the http access tokens, or set up
> >> > >> ssh certificates and change their remote for the maintainer-tools
> >> > >> repo.
> >> > >>
> >> > >> - For testing, you can undo this auto-update using
> >> > >>
> >> > >> $ git remote remove maintainer-tools ; git branch -u
> >> > >> drm-tip/maintainer-tools
> >> > >>
> >> > >> - My plan is that we push an immediate revert of this code to the
> >> > >> gitlab repo (and only there) so it doesn't stick around.
> >> > >>
> >> > >> - fd.o admins recommended that we don't do a read-only copy of
> >> > >> maintaienr-tools at the old-place, since it's not a 1:1 match. For
> >> > >> everything else we're going to migrate there will be a read-only
> >> > >> copy with all urls working nicely, maintainer-tools is the only
> >> > >> exception here.
> >> > >>
> >> > >> v2: Don't forget about dim_setup.
> >> > >>
> >> > >> v3: Update all the urls in docs!
> >> > >>
> >> > >> Cc: Rodrigo Vivi
> >> > >> Cc: Daniel Stone
> >> > >> Acked-by: Rodrigo Vivi (v2)
> >> > >> Reviewed-by: Daniel Stone (v2)
> >> > >> Signed-off-by: Daniel Vetter
> >> > >> ---
> >> > >> dim | 12 +++-
> >> > >> dim.rst | 3 +--
> >> > >> getting-started.rst | 4 ++--
> >> > >> 3 files changed, 14 insertions(+), 5 deletions(-)
> >> > >>
> >> > >> diff --git a/dim b/dim
> >> > >> index 3f5fdb9233f7..3612cc66d1c4 100755
> >> > >> --- a/dim
> >> > >> +++ b/dim
> >> > >> @@ -76,6 +76,8 @@ dim=$(basename $0)
> >> > >> dim_today=$(date +%Y-%m-%d)
> >> > >> dim_timestamp="$(date --utc +%Yy-%mm-%dd-%Hh-%Mm-%Ss) UTC"
> >> > >>
> >> > >> +maintainer_tools_https=https://gitlab.freedesktop.org/drm/maintainer-tools.git
> >> > >> +
> >> > >> # Recipients for all dim based pull requests.
> >> > >> # Add To: lines to the end, Cc: lines in the beginning with -c.
> >> > >> dim_pull_request_recipients=(
> >> > >> @@ -2028,6 +2030,14 @@ function dim_update_branches
> >> > >> fi
> >> > >>
> >> > >> cd $DIM_PREFIX/maintainer-tools
> >> > >> + if ! git remote | grep -q '^maintainer-tools$' ; then
> >> > >
> >> > > It'd be safer if checked the upstream of the the local
> >> > > maintainer-tools branch.
> >> > > It's possible that folks have the maintainer-tools remote, but don't
> >> > > have the
> >> > > branches properly linked (I fall into this category).
> >> >
> >> > I think you are the only two people with this problem. Just run the
> >> > oneline in the commit message before you run dim update-branches. I
> >> > think we should be fine ...
> >>
> >> Well, sure, but we could also avoid that quite easily:
> >>
> >> git branch -vv | grep ' maintainer-tools' | awk '{ print $3 }' | grep -q
> >> 'drm-tip/maintainer-tools'
> >
> > Even better:
> >
> > git branch -l maintainer-tools -vv | awk '{ print $3 }' | grep -q
> >
Re: [PATCH 1/2] dim: Migrate to Gitlab
On Wed, Aug 29, 2018 at 01:40:26PM -0400, Sean Paul wrote:
> On Wed, Aug 29, 2018 at 07:32:26PM +0200, Daniel Vetter wrote:
> > On Wed, Aug 29, 2018 at 7:10 PM, Sean Paul wrote:
> > > On Wed, Aug 29, 2018 at 05:25:24PM +0200, Daniel Vetter wrote:
> > >> - Use the https url so we don't require everyone to have their gitlab
> > >> accounts ready already. Otherwise we'd need to gate migrating
> > >> maintainer-tools on migrating all the drm kernel repos, and I'd
> > >> really like to partition the migration. Also, we want to reduce
> > >> maintainer-tools committers anyway, to shrink the attack surface a
> > >> lot.
> > >>
> > >> Committers need to either set up the http access tokens, or set up
> > >> ssh certificates and change their remote for the maintainer-tools
> > >> repo.
> > >>
> > >> - For testing, you can undo this auto-update using
> > >>
> > >> $ git remote remove maintainer-tools ; git branch -u
> > >> drm-tip/maintainer-tools
> > >>
> > >> - My plan is that we push an immediate revert of this code to the
> > >> gitlab repo (and only there) so it doesn't stick around.
> > >>
> > >> - fd.o admins recommended that we don't do a read-only copy of
> > >> maintaienr-tools at the old-place, since it's not a 1:1 match. For
> > >> everything else we're going to migrate there will be a read-only
> > >> copy with all urls working nicely, maintainer-tools is the only
> > >> exception here.
> > >>
> > >> v2: Don't forget about dim_setup.
> > >>
> > >> v3: Update all the urls in docs!
> > >>
> > >> Cc: Rodrigo Vivi
> > >> Cc: Daniel Stone
> > >> Acked-by: Rodrigo Vivi (v2)
> > >> Reviewed-by: Daniel Stone (v2)
> > >> Signed-off-by: Daniel Vetter
> > >> ---
> > >> dim | 12 +++-
> > >> dim.rst | 3 +--
> > >> getting-started.rst | 4 ++--
> > >> 3 files changed, 14 insertions(+), 5 deletions(-)
> > >>
> > >> diff --git a/dim b/dim
> > >> index 3f5fdb9233f7..3612cc66d1c4 100755
> > >> --- a/dim
> > >> +++ b/dim
> > >> @@ -76,6 +76,8 @@ dim=$(basename $0)
> > >> dim_today=$(date +%Y-%m-%d)
> > >> dim_timestamp="$(date --utc +%Yy-%mm-%dd-%Hh-%Mm-%Ss) UTC"
> > >>
> > >> +maintainer_tools_https=https://gitlab.freedesktop.org/drm/maintainer-tools.git
> > >> +
> > >> # Recipients for all dim based pull requests.
> > >> # Add To: lines to the end, Cc: lines in the beginning with -c.
> > >> dim_pull_request_recipients=(
> > >> @@ -2028,6 +2030,14 @@ function dim_update_branches
> > >> fi
> > >>
> > >> cd $DIM_PREFIX/maintainer-tools
> > >> + if ! git remote | grep -q '^maintainer-tools$' ; then
> > >
> > > It'd be safer if checked the upstream of the the local maintainer-tools
> > > branch.
> > > It's possible that folks have the maintainer-tools remote, but don't have
> > > the
> > > branches properly linked (I fall into this category).
> >
> > I think you are the only two people with this problem. Just run the
> > oneline in the commit message before you run dim update-branches. I
> > think we should be fine ...
>
> Well, sure, but we could also avoid that quite easily:
>
> git branch -vv | grep ' maintainer-tools' | awk '{ print $3 }' | grep -q
> 'drm-tip/maintainer-tools'
Even better:
git branch -l maintainer-tools -vv | awk '{ print $3 }' | grep -q
'drm-tip/maintainer-tools
Sean
>
> Sean
>
> > -Daniel
> >
> > >
> > > Sean
> > >
> > >> + git remote add maintainer-tools $maintainer_tools_https
> > >> + git fetch maintainer-tools
> > >> + git branch --set-upstream-to=maintainer-tools/master
> > >> + else
> > >> + echo "Maintainer tools already migrated."
> > >> + fi
> > >> +
> > >> if git_is_current_branch maintainer-tools ; then
> > >> echo "Updating maintainer-tools ..."
> > >> git pull --rebase
> > >> @@ -2124,7 +2134,7 @@ function dim_setup
> > >>
> > >> cd $DIM_PREFIX
> > >&g
Re: [PATCH 1/2] dim: Migrate to Gitlab
On Wed, Aug 29, 2018 at 07:32:26PM +0200, Daniel Vetter wrote:
> On Wed, Aug 29, 2018 at 7:10 PM, Sean Paul wrote:
> > On Wed, Aug 29, 2018 at 05:25:24PM +0200, Daniel Vetter wrote:
> >> - Use the https url so we don't require everyone to have their gitlab
> >> accounts ready already. Otherwise we'd need to gate migrating
> >> maintainer-tools on migrating all the drm kernel repos, and I'd
> >> really like to partition the migration. Also, we want to reduce
> >> maintainer-tools committers anyway, to shrink the attack surface a
> >> lot.
> >>
> >> Committers need to either set up the http access tokens, or set up
> >> ssh certificates and change their remote for the maintainer-tools
> >> repo.
> >>
> >> - For testing, you can undo this auto-update using
> >>
> >> $ git remote remove maintainer-tools ; git branch -u
> >> drm-tip/maintainer-tools
> >>
> >> - My plan is that we push an immediate revert of this code to the
> >> gitlab repo (and only there) so it doesn't stick around.
> >>
> >> - fd.o admins recommended that we don't do a read-only copy of
> >> maintaienr-tools at the old-place, since it's not a 1:1 match. For
> >> everything else we're going to migrate there will be a read-only
> >> copy with all urls working nicely, maintainer-tools is the only
> >> exception here.
> >>
> >> v2: Don't forget about dim_setup.
> >>
> >> v3: Update all the urls in docs!
> >>
> >> Cc: Rodrigo Vivi
> >> Cc: Daniel Stone
> >> Acked-by: Rodrigo Vivi (v2)
> >> Reviewed-by: Daniel Stone (v2)
> >> Signed-off-by: Daniel Vetter
> >> ---
> >> dim | 12 +++-
> >> dim.rst | 3 +--
> >> getting-started.rst | 4 ++--
> >> 3 files changed, 14 insertions(+), 5 deletions(-)
> >>
> >> diff --git a/dim b/dim
> >> index 3f5fdb9233f7..3612cc66d1c4 100755
> >> --- a/dim
> >> +++ b/dim
> >> @@ -76,6 +76,8 @@ dim=$(basename $0)
> >> dim_today=$(date +%Y-%m-%d)
> >> dim_timestamp="$(date --utc +%Yy-%mm-%dd-%Hh-%Mm-%Ss) UTC"
> >>
> >> +maintainer_tools_https=https://gitlab.freedesktop.org/drm/maintainer-tools.git
> >> +
> >> # Recipients for all dim based pull requests.
> >> # Add To: lines to the end, Cc: lines in the beginning with -c.
> >> dim_pull_request_recipients=(
> >> @@ -2028,6 +2030,14 @@ function dim_update_branches
> >> fi
> >>
> >> cd $DIM_PREFIX/maintainer-tools
> >> + if ! git remote | grep -q '^maintainer-tools$' ; then
> >
> > It'd be safer if checked the upstream of the the local maintainer-tools
> > branch.
> > It's possible that folks have the maintainer-tools remote, but don't have
> > the
> > branches properly linked (I fall into this category).
>
> I think you are the only two people with this problem. Just run the
> oneline in the commit message before you run dim update-branches. I
> think we should be fine ...
Well, sure, but we could also avoid that quite easily:
git branch -vv | grep ' maintainer-tools' | awk '{ print $3 }' | grep -q
'drm-tip/maintainer-tools'
Sean
> -Daniel
>
> >
> > Sean
> >
> >> + git remote add maintainer-tools $maintainer_tools_https
> >> + git fetch maintainer-tools
> >> + git branch --set-upstream-to=maintainer-tools/master
> >> + else
> >> + echo "Maintainer tools already migrated."
> >> + fi
> >> +
> >> if git_is_current_branch maintainer-tools ; then
> >> echo "Updating maintainer-tools ..."
> >> git pull --rebase
> >> @@ -2124,7 +2134,7 @@ function dim_setup
> >>
> >> cd $DIM_PREFIX
> >>
> >> - setup_aux_checkout maintainer-tools $drm_tip_ssh maintainer-tools
> >> + setup_aux_checkout maintainer-tools $maintainer_tools_https
> >> maintainer-tools
> >>
> >> setup_aux_checkout rerere-cache $drm_tip_ssh drm-rerere
> >>
> >> diff --git a/dim.rst b/dim.rst
> >> index f33fa57e4cb3..e47337783b49 100644
> >> --- a/dim.rst
> >> +++ b/dim.rst
> >> @@ -29,8 +29,7 @@ the drm-intel_ and drm-misc_ git repositories.
> >> This man page is a command-line reference for the tool only; for more
> >> comprehensive documentation
Re: [PATCH 1/2] dim: Migrate to Gitlab
On Wed, Aug 29, 2018 at 05:25:24PM +0200, Daniel Vetter wrote: > - Use the https url so we don't require everyone to have their gitlab > accounts ready already. Otherwise we'd need to gate migrating > maintainer-tools on migrating all the drm kernel repos, and I'd > really like to partition the migration. Also, we want to reduce > maintainer-tools committers anyway, to shrink the attack surface a > lot. > > Committers need to either set up the http access tokens, or set up > ssh certificates and change their remote for the maintainer-tools > repo. > > - For testing, you can undo this auto-update using > > $ git remote remove maintainer-tools ; git branch -u drm-tip/maintainer-tools > > - My plan is that we push an immediate revert of this code to the > gitlab repo (and only there) so it doesn't stick around. > > - fd.o admins recommended that we don't do a read-only copy of > maintaienr-tools at the old-place, since it's not a 1:1 match. For > everything else we're going to migrate there will be a read-only > copy with all urls working nicely, maintainer-tools is the only > exception here. > > v2: Don't forget about dim_setup. > > v3: Update all the urls in docs! > > Cc: Rodrigo Vivi > Cc: Daniel Stone > Acked-by: Rodrigo Vivi (v2) > Reviewed-by: Daniel Stone (v2) > Signed-off-by: Daniel Vetter > --- > dim | 12 +++- > dim.rst | 3 +-- > getting-started.rst | 4 ++-- > 3 files changed, 14 insertions(+), 5 deletions(-) > > diff --git a/dim b/dim > index 3f5fdb9233f7..3612cc66d1c4 100755 > --- a/dim > +++ b/dim > @@ -76,6 +76,8 @@ dim=$(basename $0) > dim_today=$(date +%Y-%m-%d) > dim_timestamp="$(date --utc +%Yy-%mm-%dd-%Hh-%Mm-%Ss) UTC" > > +maintainer_tools_https=https://gitlab.freedesktop.org/drm/maintainer-tools.git > + > # Recipients for all dim based pull requests. > # Add To: lines to the end, Cc: lines in the beginning with -c. > dim_pull_request_recipients=( > @@ -2028,6 +2030,14 @@ function dim_update_branches > fi > > cd $DIM_PREFIX/maintainer-tools > + if ! git remote | grep -q '^maintainer-tools$' ; then It'd be safer if checked the upstream of the the local maintainer-tools branch. It's possible that folks have the maintainer-tools remote, but don't have the branches properly linked (I fall into this category). Sean > + git remote add maintainer-tools $maintainer_tools_https > + git fetch maintainer-tools > + git branch --set-upstream-to=maintainer-tools/master > + else > + echo "Maintainer tools already migrated." > + fi > + > if git_is_current_branch maintainer-tools ; then > echo "Updating maintainer-tools ..." > git pull --rebase > @@ -2124,7 +2134,7 @@ function dim_setup > > cd $DIM_PREFIX > > - setup_aux_checkout maintainer-tools $drm_tip_ssh maintainer-tools > + setup_aux_checkout maintainer-tools $maintainer_tools_https > maintainer-tools > > setup_aux_checkout rerere-cache $drm_tip_ssh drm-rerere > > diff --git a/dim.rst b/dim.rst > index f33fa57e4cb3..e47337783b49 100644 > --- a/dim.rst > +++ b/dim.rst > @@ -29,8 +29,7 @@ the drm-intel_ and drm-misc_ git repositories. > This man page is a command-line reference for the tool only; for more > comprehensive documentation, including a getting started guide, see > https://01.org/linuxgraphics/gfx-docs/maintainer-tools/index.html, or the > same > -in source form in the maintainer-tools branch of the drm-tip repository at > -https://cgit.freedesktop.org/drm/drm-tip/log/?h=maintainer-tools. > +in source form at https://gitlab.freedesktop.org/drm/maintainer-tools. > > .. _drm-intel: drm-intel.html > .. _drm-misc: drm-misc.html > diff --git a/getting-started.rst b/getting-started.rst > index d035862e3970..5d4ce9c1991e 100644 > --- a/getting-started.rst > +++ b/getting-started.rst > @@ -6,11 +6,11 @@ > > For getting started grab the latest dim (drm-intel-maintainer) script from:: > > -http://cgit.freedesktop.org/drm-tip/tree/dim?h=maintainer-tools > +https://gitlab.freedesktop.org/drm/maintainer-tools/raw/master/dim > > There's also a sample config file for ~/.dimrc:: > > -http://cgit.freedesktop.org/drm-tip/tree/dimrc.sample?h=maintainer-tools > + > https://gitlab.freedesktop.org/drm/maintainer-tools/raw/master/dimrc.sample > > Plus, there's bash completion in the same directory if you feel like using > that. > Run:: > -- > 2.18.0 > > ___ > dim-tools mailing list > dim-tools@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PATCH 2/2] doc: First attempt at CD
On Wed, Aug 29, 2018 at 05:25:25PM +0200, Daniel Vetter wrote: > This gives us a nice > > https://drm.pages.freedesktop.org/maintainer-tools > > Which means we can simply change the old place to a web redirect, and > it'll all work out with the new location. Plus disable the > intel-gfx-ci job for maintainer-tools ofc. > > v2: Update url in documentation. I really shouldn't start reading mail from the bottom of my inbox. v2 is also Reviewed-by: Sean Paul > > Cc: Arkadiusz Hiler > Cc: Daniel Stone > Signed-off-by: Daniel Vetter > --- > .gitlab-ci.yml | 12 > dim.rst| 2 +- > 2 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 9050d3eaf4e8..a23c324e1967 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -7,3 +7,15 @@ check: > stage: build > script: >- make check > + > +pages: > +stage: deploy > +script: > + - make html > + - cp -r _build/html public > +artifacts: > +paths: > + - public > +only: > +refs: > + - master > diff --git a/dim.rst b/dim.rst > index e47337783b49..b149fa39445e 100644 > --- a/dim.rst > +++ b/dim.rst > @@ -28,7 +28,7 @@ the drm-intel_ and drm-misc_ git repositories. > > This man page is a command-line reference for the tool only; for more > comprehensive documentation, including a getting started guide, see > -https://01.org/linuxgraphics/gfx-docs/maintainer-tools/index.html, or the > same > +https://drm.pages.freedesktop.org/maintainer-tools/, or the same > in source form at https://gitlab.freedesktop.org/drm/maintainer-tools. > > .. _drm-intel: drm-intel.html > -- > 2.18.0 > > _______ > dim-tools mailing list > dim-tools@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PATCH] doc: First attempt at CD
On Wed, Aug 29, 2018 at 05:01:17PM +0200, Daniel Vetter wrote: > This gives us a nice > > https://drm.pages.freedesktop.org/maintainer-tools > > Which means we can simply change the old place to a web redirect, and > it'll all work out with the new location. Plus disable the > intel-gfx-ci job for maintainer-tools ofc. > > Cc: Arkadiusz Hiler > Cc: Daniel Stone Reviewed-by: Sean Paul > Signed-off-by: Daniel Vetter > --- > .gitlab-ci.yml | 12 > 1 file changed, 12 insertions(+) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 9050d3eaf4e8..a23c324e1967 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -7,3 +7,15 @@ check: > stage: build > script: >- make check > + > +pages: > +stage: deploy > +script: > + - make html > + - cp -r _build/html public > +artifacts: > +paths: > + - public > +only: > +refs: > + - master > -- > 2.18.0 > > ___ > dim-tools mailing list > dim-tools@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PATCH v2] dim: Add dim rebase command
On Tue, Aug 28, 2018 at 08:36:44PM +0200, Daniel Vetter wrote:
> On Tue, Aug 28, 2018 at 02:31:00PM -0400, Sean Paul wrote:
> > From: Sean Paul
> >
> > Since -fixes and -fixes-next (to a lesser extent) are rebasing trees in
> > drm-misc, add a dim rebase command that sanity checks the upstream and
> > adds SoB for the committer.
> >
> > Changes in v2:
> > - s/validate_upstream_branch/validate_upstream_baseline/ (Daniel)
> > - Use check_conflicts instead of hand rolling (Daniel)
> >
> > Cc: Boris Brezillon
> > Cc: Daniel Vetter
> > Signed-off-by: Sean Paul
>
> Reviewed-by: Daniel Vetter
>
Pushed, thanks!
Sean
> > ---
> > dim | 42 +-
> > dim.rst | 8
> > 2 files changed, 45 insertions(+), 5 deletions(-)
> >
> > diff --git a/dim b/dim
> > index 5040d6b046b2..3f5fdb9233f7 100755
> > --- a/dim
> > +++ b/dim
> > @@ -1014,12 +1014,12 @@ function dim_apply_pull
> > return $rv
> > }
> >
> > -function dim_backmerge
> > +function validate_upstream_baseline
> > {
> > - local branch upstream patch_file
> > + local branch upstream
> >
> > - branch=${1:?$usage}
> > - upstream=${2:?$usage}
> > + branch=${1}
> > + upstream=${2}
> >
> > cd $DIM_PREFIX/drm-tip
> >
> > @@ -1041,6 +1041,16 @@ function dim_backmerge
> >
> > assert_branch $branch
> > assert_repo_clean
> > +}
> > +
> > +function dim_backmerge
> > +{
> > + local branch upstream patch_file
> > +
> > + branch=${1:?$usage}
> > + upstream=${2:?$usage}
> > +
> > + validate_upstream_baseline $branch $upstream
> >
> > git merge --rerere-autoupdate --no-commit $upstream >& /dev/null || true
> >
> > @@ -1059,7 +1069,7 @@ function dim_backmerge
> >
> > HERE
> >
> > - if git diff | grep -q '\(<<<<<<<\|===\|>>>>>>>\\)' ; then
> > + if ! check_conflicts "$upstream" ; then
> > echoerr "Conflicts found while merging $upstream into $branch."
> > echoerr "This should only happen when git rerere gets confused"
> > echoerr "or if there's a manual fixup patch in drm-rerere."
> > @@ -1072,6 +1082,28 @@ function dim_backmerge
> > git commit -s
> > }
> >
> > +function dim_rebase
> > +{
> > + local branch upstream patch_file
> > +
> > + branch=${1:?$usage}
> > + upstream=${2:?$usage}
> > +
> > + validate_upstream_baseline $branch $upstream
> > +
> > + git rebase --signoff $upstream >& /dev/null || true
> > + if ! check_conflicts "$upstream" ; then
> > + echoerr "Conflicts found while rebasing $branch onto $upstream."
> > + echoerr "Please proceed with extreme caution."
> > + echoerr "Resolve the conflict and test it. Once the conflict "
> > + echoerr "is resolved, commit it with: "
> > + echoerr " git commit -a"
> > + echoerr "And continue the rebase with: "
> > + echoerr " git rebase --continue"
> > + exit 1
> > + fi
> > +}
> > +
> > function dim_add_link
> > {
> > local branch file message_id
> > diff --git a/dim.rst b/dim.rst
> > index 6d7528ce497f..4137d1be6f52 100644
> > --- a/dim.rst
> > +++ b/dim.rst
> > @@ -338,6 +338,14 @@ Backmerges *upstream* into *branch*, making a few
> > sanity checks on the way. The
> > using **pull-request**. Alternatively it can also be a tag, which if
> > available
> > should be preferred.
> >
> > +rebase *branch* *upstream*
> > +-
> > +
> > +Rebases *branch* onto *upstream*, making a few sanity checks on the way.
> > The
> > +*upstream* we rebase onto should be the same as used for sending out pull
> > requests
> > +using **pull-request**. Alternatively it can also be a tag, which if
> > available
> > +should be preferred.
> > +
> > update-next
> > ---
> > Pushes out the latest dinq to drm-intel-next and tags it. Also
> > --
> > Sean Paul, Software Engineer, Google / Chromium OS
> >
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
--
Sean Paul, Software Engineer, Google / Chromium OS
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PATCH v2] dim: Add dim rebase command
From: Sean Paul
Since -fixes and -fixes-next (to a lesser extent) are rebasing trees in
drm-misc, add a dim rebase command that sanity checks the upstream and
adds SoB for the committer.
Changes in v2:
- s/validate_upstream_branch/validate_upstream_baseline/ (Daniel)
- Use check_conflicts instead of hand rolling (Daniel)
Cc: Boris Brezillon
Cc: Daniel Vetter
Signed-off-by: Sean Paul
---
dim | 42 +-
dim.rst | 8
2 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/dim b/dim
index 5040d6b046b2..3f5fdb9233f7 100755
--- a/dim
+++ b/dim
@@ -1014,12 +1014,12 @@ function dim_apply_pull
return $rv
}
-function dim_backmerge
+function validate_upstream_baseline
{
- local branch upstream patch_file
+ local branch upstream
- branch=${1:?$usage}
- upstream=${2:?$usage}
+ branch=${1}
+ upstream=${2}
cd $DIM_PREFIX/drm-tip
@@ -1041,6 +1041,16 @@ function dim_backmerge
assert_branch $branch
assert_repo_clean
+}
+
+function dim_backmerge
+{
+ local branch upstream patch_file
+
+ branch=${1:?$usage}
+ upstream=${2:?$usage}
+
+ validate_upstream_baseline $branch $upstream
git merge --rerere-autoupdate --no-commit $upstream >& /dev/null || true
@@ -1059,7 +1069,7 @@ function dim_backmerge
HERE
- if git diff | grep -q '\(<<<<<<<\|===\|>>>>>>>\\)' ; then
+ if ! check_conflicts "$upstream" ; then
echoerr "Conflicts found while merging $upstream into $branch."
echoerr "This should only happen when git rerere gets confused"
echoerr "or if there's a manual fixup patch in drm-rerere."
@@ -1072,6 +1082,28 @@ function dim_backmerge
git commit -s
}
+function dim_rebase
+{
+ local branch upstream patch_file
+
+ branch=${1:?$usage}
+ upstream=${2:?$usage}
+
+ validate_upstream_baseline $branch $upstream
+
+ git rebase --signoff $upstream >& /dev/null || true
+ if ! check_conflicts "$upstream" ; then
+ echoerr "Conflicts found while rebasing $branch onto $upstream."
+ echoerr "Please proceed with extreme caution."
+ echoerr "Resolve the conflict and test it. Once the conflict "
+ echoerr "is resolved, commit it with: "
+ echoerr " git commit -a"
+ echoerr "And continue the rebase with: "
+ echoerr " git rebase --continue"
+ exit 1
+ fi
+}
+
function dim_add_link
{
local branch file message_id
diff --git a/dim.rst b/dim.rst
index 6d7528ce497f..4137d1be6f52 100644
--- a/dim.rst
+++ b/dim.rst
@@ -338,6 +338,14 @@ Backmerges *upstream* into *branch*, making a few sanity
checks on the way. The
using **pull-request**. Alternatively it can also be a tag, which if available
should be preferred.
+rebase *branch* *upstream*
+-
+
+Rebases *branch* onto *upstream*, making a few sanity checks on the way. The
+*upstream* we rebase onto should be the same as used for sending out pull
requests
+using **pull-request**. Alternatively it can also be a tag, which if available
+should be preferred.
+
update-next
---
Pushes out the latest dinq to drm-intel-next and tags it. Also
--
Sean Paul, Software Engineer, Google / Chromium OS
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PATCH] dim: Add dim rebase command
On Tue, Aug 28, 2018 at 11:37 AM Daniel Vetter wrote:
>
> On Tue, Aug 28, 2018 at 11:03:23AM -0400, Sean Paul wrote:
> > From: Sean Paul
> >
> > Since -fixes and -fixes-next (to a lesser extent) are rebasing trees in
> > drm-misc, add a dim rebase command that sanity checks the upstream and
> > adds SoB for the committer.
> >
> > Cc: Boris Brezillon
> > Cc: Daniel Vetter
> > Signed-off-by: Sean Paul
> > ---
> > dim | 40
> > dim.rst | 8
> > 2 files changed, 44 insertions(+), 4 deletions(-)
> >
> > diff --git a/dim b/dim
> > index 5040d6b046b2..b7060216fbe5 100755
> > --- a/dim
> > +++ b/dim
> > @@ -1014,12 +1014,12 @@ function dim_apply_pull
> > return $rv
> > }
> >
> > -function dim_backmerge
> > +function validate_upstream_branch
>
> Naming nitpick: _branch here is a bit confusing, since we also accept tags
> (and even prefer those). Maybe validate_upstream_baseline?
>
> > {
> > - local branch upstream patch_file
> > + local branch upstream
> >
> > - branch=${1:?$usage}
> > - upstream=${2:?$usage}
> > + branch=${1}
> > + upstream=${2}
> >
> > cd $DIM_PREFIX/drm-tip
> >
> > @@ -1041,6 +1041,16 @@ function dim_backmerge
> >
> > assert_branch $branch
> > assert_repo_clean
> > +}
> > +
> > +function dim_backmerge
> > +{
> > + local branch upstream patch_file
> > +
> > + branch=${1:?$usage}
> > + upstream=${2:?$usage}
> > +
> > + validate_upstream_branch $branch $upstream
> >
> > git merge --rerere-autoupdate --no-commit $upstream >& /dev/null ||
> > true
> >
> > @@ -1072,6 +1082,28 @@ function dim_backmerge
> > git commit -s
> > }
> >
> > +function dim_rebase
> > +{
> > + local branch upstream patch_file
> > +
> > + branch=${1:?$usage}
> > + upstream=${2:?$usage}
> > +
> > + validate_upstream_branch $branch $upstream
> > +
> > + git rebase --signoff $upstream >& /dev/null || true
> > + if git diff | grep -q '\(<<<<<<<\|===\|>>>>>>>\\)' ; then
>
> Probably too much effort to share with the check_conflicts helper.
>
> As-is, or with my 2 nits addressed:
>
> Reviewed-by: Daniel Vetter
>
Thanks for the review, I'll send v2 in a pull request to the new repo :)
Sean
> > + echoerr "Conflicts found while rebasing $branch onto
> > $upstream."
> > + echoerr "Please proceed with extreme caution."
> > + echoerr "Resolve the conflict and test it. Once the conflict
> > "
> > + echoerr "is resolved, commit it with: "
> > + echoerr " git commit -a"
> > + echoerr "And continue the rebase with: "
> > + echoerr " git rebase --continue"
> > + exit 1
> > + fi
> > +}
> > +
> > function dim_add_link
> > {
> > local branch file message_id
> > diff --git a/dim.rst b/dim.rst
> > index 6d7528ce497f..4137d1be6f52 100644
> > --- a/dim.rst
> > +++ b/dim.rst
> > @@ -338,6 +338,14 @@ Backmerges *upstream* into *branch*, making a few
> > sanity checks on the way. The
> > using **pull-request**. Alternatively it can also be a tag, which if
> > available
> > should be preferred.
> >
> > +rebase *branch* *upstream*
> > +-
> > +
> > +Rebases *branch* onto *upstream*, making a few sanity checks on the way.
> > The
> > +*upstream* we rebase onto should be the same as used for sending out pull
> > requests
> > +using **pull-request**. Alternatively it can also be a tag, which if
> > available
> > +should be preferred.
> > +
> > update-next
> > ---
> > Pushes out the latest dinq to drm-intel-next and tags it. Also
> > --
> > Sean Paul, Software Engineer, Google / Chromium OS
> >
>
> --
> 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: Add dim rebase command
From: Sean Paul
Since -fixes and -fixes-next (to a lesser extent) are rebasing trees in
drm-misc, add a dim rebase command that sanity checks the upstream and
adds SoB for the committer.
Cc: Boris Brezillon
Cc: Daniel Vetter
Signed-off-by: Sean Paul
---
dim | 40
dim.rst | 8
2 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/dim b/dim
index 5040d6b046b2..b7060216fbe5 100755
--- a/dim
+++ b/dim
@@ -1014,12 +1014,12 @@ function dim_apply_pull
return $rv
}
-function dim_backmerge
+function validate_upstream_branch
{
- local branch upstream patch_file
+ local branch upstream
- branch=${1:?$usage}
- upstream=${2:?$usage}
+ branch=${1}
+ upstream=${2}
cd $DIM_PREFIX/drm-tip
@@ -1041,6 +1041,16 @@ function dim_backmerge
assert_branch $branch
assert_repo_clean
+}
+
+function dim_backmerge
+{
+ local branch upstream patch_file
+
+ branch=${1:?$usage}
+ upstream=${2:?$usage}
+
+ validate_upstream_branch $branch $upstream
git merge --rerere-autoupdate --no-commit $upstream >& /dev/null || true
@@ -1072,6 +1082,28 @@ function dim_backmerge
git commit -s
}
+function dim_rebase
+{
+ local branch upstream patch_file
+
+ branch=${1:?$usage}
+ upstream=${2:?$usage}
+
+ validate_upstream_branch $branch $upstream
+
+ git rebase --signoff $upstream >& /dev/null || true
+ if git diff | grep -q '\(<<<<<<<\|===\|>>>>>>>\\)' ; then
+ echoerr "Conflicts found while rebasing $branch onto $upstream."
+ echoerr "Please proceed with extreme caution."
+ echoerr "Resolve the conflict and test it. Once the conflict "
+ echoerr "is resolved, commit it with: "
+ echoerr " git commit -a"
+ echoerr "And continue the rebase with: "
+ echoerr " git rebase --continue"
+ exit 1
+ fi
+}
+
function dim_add_link
{
local branch file message_id
diff --git a/dim.rst b/dim.rst
index 6d7528ce497f..4137d1be6f52 100644
--- a/dim.rst
+++ b/dim.rst
@@ -338,6 +338,14 @@ Backmerges *upstream* into *branch*, making a few sanity
checks on the way. The
using **pull-request**. Alternatively it can also be a tag, which if available
should be preferred.
+rebase *branch* *upstream*
+-
+
+Rebases *branch* onto *upstream*, making a few sanity checks on the way. The
+*upstream* we rebase onto should be the same as used for sending out pull
requests
+using **pull-request**. Alternatively it can also be a tag, which if available
+should be preferred.
+
update-next
---
Pushes out the latest dinq to drm-intel-next and tags it. Also
--
Sean Paul, Software Engineer, Google / Chromium OS
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next-fixes
Hi Dave, A couple fixes for you that didn't quite make your -rc1 pull last week. I'm sending this since Gustavo is busy organizing linuxdev-br. drm-misc-next-fixes-2018-08-22: - Add an unprepare delay to the tv123wam panel (Sean) - Update seanpaul's email in MAINTAINERS (Sean) Cc: seanp...@chromium.org Cc: s...@poorly.run Cheers, Sean The following changes since commit 2ead1be54b22ccdc93d3030172993e363128f1b4: drm/vkms: Fix connector leak at the module removal (2018-07-28 16:09:39 -0300) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2018-08-22 for you to fetch changes up to 4acd8d01a2393f2145ad1db10b2d5c764582a98d: MAINTAINERS: drm-misc: Change seanpaul's email address (2018-08-16 11:48:24 -0400) - Add an unprepare delay to the tv123wam panel (Sean) - Update seanpaul's email in MAINTAINERS (Sean) Cc: seanp...@chromium.org Cc: s...@poorly.run Sean Paul (2): drm/panel: simple: tv123wam: Add unprepare delay MAINTAINERS: drm-misc: Change seanpaul's email address MAINTAINERS | 2 +- drivers/gpu/drm/panel/panel-simple.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [Intel-gfx] RFC: Migration to Gitlab
On Wed, Aug 22, 2018 at 01:44:56PM +0200, Daniel Vetter wrote: > Hi all, > > I think it's time to brainstorm a bit about the gitlab migration. Basic > reasons: > > - fd.o admins want to deprecate shell accounts and hand-rolled > infrastructure, because it's a pain to keep secure > > - gitlab will allow us to add committers on our own, greatly > simplifying that process (and offloading that task from fd.o admins). > > There's also some more benefits we might want to reap, like better CI > integration for basic build testing - no more "oops didn't build > drm-misc defconfigs" or "sry, forgot make check in maintainer-tools". > But that's all fully optional. > > For the full in-depth writeup of everything, see > > https://www.fooishbar.org/blog/gitlab-fdo-introduction/ > > I think now is also a good time, with mesa, xorg, wayland/weston and > others moved, to start thinking about how we'll move drm. There's a > few things to figure out though: > > - We probably want to split out maintainer-tools. That would address > the concern that there's 50+ committers to an auto-updating shell > script ... > /me laughs nervously > - We need to figure out how to handle the ACL trickery around drm-tip in > gitlab. > > - Probably good to stage the migration, with maintainer-tools, igt > leading. That will also make fd.o admins happy, who want to rework > their cloud infrastructure a bit before migrating the big kernel repos > over. > > - Figuring out the actual migration - we've been adding a pile of > committers since fd.o LDAP was converted to gitlab once back in > spring. We need to at least figure out how to move the new > accounts/committers. > > - Similar, maintainer-tools needs to move. We probably want to move > all the dim maintained kernel repos in one go, to avoid headaches with > double-accounts needed for committers. > > - CI, linux-next and everyone else should be fine, since the > cgit/non-ssh paths will keep working (they'll be read-only mirrors). > Need to double-check that with everyone. They can also pull the trees from git://gitlab.fd.o/blah as normal, just need to give them new pointers once we're stable. > > - Some organization structure would be good. > > https://cgit.freedesktop.org/drm > > libdrm won't be part of the gitlab drm group because that's already > moved under mesa (and you can't symlink/mulit-home anymore on gitlab): > > https://gitlab.freedesktop.org/mesa/drm > > But there's also drm_hwcomposer, which we might want to migrate into > drm too - gitlab requires a containing group, and > drm_hwcomposer/drm_hwcomposer is a bit silly. This seems fine to me. Our expansion plans likely aren't big enough to warrant a separate group. > > Note: Access rights can be done at any level in the hierarchy, the > organization is orthogonal to commit rights. > > - Anything else I've forgotten. > > A lot of this still needs to be figured out first. As a first step I'm > looking for volunteers who want to join the fun, besides comments and > thoughts on the overall topic of course. I'm pretty keen on getting this done, so I'll volunteer some cycles if there's something that needs doing. Sean > > Cheers, Daniel > -- > Daniel Vetter > Software Engineer, Intel Corporation > +41 (0) 79 365 57 48 - http://blog.ffwll.ch > ___ > Intel-gfx mailing list > intel-...@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes for 4.17
Hi Dave, Although we didn't have anything for you last week, we have a couple of one-liners this week. Tomi is fixing a regression introduced in 4.17, and Dhinakaran added a previously unsupported psr setup time which could be affecting displays in the wild. drm-misc-fixes-2018-05-29: core: Add 220us psr setup time (Dhinakaran) omap: Fix NULL deref (Tomi) Cc: Dhinakaran Pandiyan Cc: Tomi Valkeinen Cheers, Sean The following changes since commit 2b6207291b7b277a5df9d1aab44b56815a292dba: drm/dumb-buffers: Integer overflow in drm_mode_create_ioctl() (2018-05-16 17:56:06 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2018-05-29 for you to fetch changes up to 2bc5ff0bdc00d81d719dad74589317a260d583ed: drm/omap: fix NULL deref crash with SDI displays (2018-05-24 19:14:46 +0300) core: Add 220us psr setup time (Dhinakaran) omap: Fix NULL deref (Tomi) Cc: Dhinakaran Pandiyan Cc: Tomi Valkeinen Dhinakaran Pandiyan (1): drm/psr: Fix missed entry in PSR setup time table. Tomi Valkeinen (1): drm/omap: fix NULL deref crash with SDI displays drivers/gpu/drm/drm_dp_helper.c | 1 + drivers/gpu/drm/omapdrm/dss/sdi.c | 5 - 2 files changed, 5 insertions(+), 1 deletion(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[DIM PATCH v2 2/2] dim: Fix create-branch dry run
Using --dry-run for git push on a non-existant branch (since the command
above doesn't actually create the branch) fails with:
error: src refspec topic/dim_test does not match any.
error: failed to push some refs to
So instead of using --dry-run for git push, just echo the command.
Changes in v2:
- Added comment (Daniel)
Reviewed-by: Daniel Vetter <daniel.vet...@ffwll.ch>
Signed-off-by: Sean Paul <seanp...@chromium.org>
---
dim | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dim b/dim
index 7d8787d22c8b..71407eb034b4 100755
--- a/dim
+++ b/dim
@@ -1277,7 +1277,10 @@ function dim_create_branch
fi
$DRY git branch $branch $start
- git push $DRY_RUN $remote +$branch --set-upstream
+
+ # git push gives confusing error messages for non-existing
+ # branches, even with --dry-run, hence the even quieter $DRY
+ $DRY git push $remote +$branch --set-upstream
cd $DIM_PREFIX/drm-rerere
$DRY sed -i "s/^\() # DO NOT CHANGE THIS
LINE\)$/\t\"$repo\t\t${branch//\//\\\/}\"\n\1/" $dim_integration_config
--
Sean Paul, Software Engineer, Google / Chromium OS
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
[DIM PATCH v2] dim: Fix create-branch dry run
Using --dry-run for git push on a non-existant branch (since the command
above doesn't actually create the branch) fails with:
error: src refspec topic/dim_test does not match any.
error: failed to push some refs to
So instead of using --dry-run for git push, just echo the command.
Signed-off-by: Sean Paul <seanp...@chromium.org>
---
Changes in v2:
- Removed extra whitespace
dim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dim b/dim
index 7d8787d22c8b..4a605d78139c 100755
--- a/dim
+++ b/dim
@@ -1277,7 +1277,7 @@ function dim_create_branch
fi
$DRY git branch $branch $start
- git push $DRY_RUN $remote +$branch --set-upstream
+ $DRY git push $remote +$branch --set-upstream
cd $DIM_PREFIX/drm-rerere
$DRY sed -i "s/^\() # DO NOT CHANGE THIS
LINE\)$/\t\"$repo\t\t${branch//\//\\\/}\"\n\1/" $dim_integration_config
--
Sean Paul, Software Engineer, Google / Chromium OS
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
[DIM PATCH 1/3] dim: Remove superfluous assignment
repo is re-assigned 2 lines lower
Signed-off-by: Sean Paul <seanp...@chromium.org>
---
dim | 1 -
1 file changed, 1 deletion(-)
diff --git a/dim b/dim
index 6b684ba5308c..7d8787d22c8b 100755
--- a/dim
+++ b/dim
@@ -1260,7 +1260,6 @@ function dim_create_branch
branch=${1:?$usage}
start=${2:-HEAD}
- repo="drm-intel"
cd $DIM_PREFIX/$DIM_REPO
--
Sean Paul, Software Engineer, Google / Chromium OS
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
[DIM PATCH 2/3] dim: Fix create-branch dry run
Using --dry-run for git push on a non-existant branch (since the command
above doesn't actually create the branch) fails with:
error: src refspec topic/dim_test does not match any.
error: failed to push some refs to
So instead of using --dry-run for git push, just echo the command.
Signed-off-by: Sean Paul <seanp...@chromium.org>
---
dim | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dim b/dim
index 7d8787d22c8b..171557774ea4 100755
--- a/dim
+++ b/dim
@@ -1277,7 +1277,8 @@ function dim_create_branch
fi
$DRY git branch $branch $start
- git push $DRY_RUN $remote +$branch --set-upstream
+ $DRY git push $remote +$branch --set-upstream
+
cd $DIM_PREFIX/drm-rerere
$DRY sed -i "s/^\() # DO NOT CHANGE THIS
LINE\)$/\t\"$repo\t\t${branch//\//\\\/}\"\n\1/" $dim_integration_config
--
Sean Paul, Software Engineer, Google / Chromium OS
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hi Dave, This weeks fixes is a little busier than normal, due to the omap changes. However since these aren't regressions, it shouldn't be something to be concerned about. drm-misc-fixes-2018-05-09: atomic: Clear state pointers on clear (Ville) vc4: Fix oops in dpi disable (Eric) omap: Various error-checking + uninitialized var fixes (Tomi) Cc: Ville Syrjälä <ville.syrj...@linux.intel.com> Cc: Eric Anholt <e...@anholt.net> Cc: Tomi Valkeinen <tomi.valkei...@ti.com> Cheers, Sean The following changes since commit 75bc37fefc4471e718ba8e651aa74673d4e0a9eb: Linux 4.17-rc4 (2018-05-06 16:57:38 -1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2018-05-09 for you to fetch changes up to 9a0e9802217291e54c4dd1fc5462f189a4be14ec: drm/vc4: Fix scaling of uni-planar formats (2018-05-09 09:48:23 +0200) atomic: Clear state pointers on clear (Ville) vc4: Fix oops in dpi disable (Eric) omap: Various error-checking + uninitialized var fixes (Tomi) Cc: Ville Syrjälä <ville.syrj...@linux.intel.com> Cc: Eric Anholt <e...@anholt.net> Cc: Tomi Valkeinen <tomi.valkei...@ti.com> Andrzej Hajda (1): drm/bridge/sii8620: add Kconfig dependency on extcon Boris Brezillon (1): drm/vc4: Fix scaling of uni-planar formats Dan Carpenter (1): drm/omap: silence unititialized variable warning Eric Anholt (1): drm/vc4: Fix oops dereferencing DPI's connector since panel_bridge. Tomi Valkeinen (6): drm/omap: fix uninitialized ret variable drm/omap: fix possible NULL ref issue in tiler_reserve_2d drm/omap: check return value from soc_device_match drm/omap: handle error if scale coefs are not found drm/omap: add missing linefeeds to prints drm/omap: handle alloc failures in omap_connector Ville Syrjälä (2): drm/atomic: Clean old_state/new_state in drm_atomic_state_default_clear() drm/atomic: Clean private obj old_state/new_state in drm_atomic_state_default_clear() drivers/gpu/drm/bridge/Kconfig | 1 + drivers/gpu/drm/drm_atomic.c | 8 drivers/gpu/drm/omapdrm/dss/dispc.c | 20 +--- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 +- drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 7 ++- drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 +- drivers/gpu/drm/omapdrm/omap_connector.c | 10 ++ drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 +- drivers/gpu/drm/omapdrm/tcm-sita.c | 2 +- drivers/gpu/drm/vc4/vc4_dpi.c| 25 ++--- drivers/gpu/drm/vc4/vc4_plane.c | 2 +- 11 files changed, 69 insertions(+), 16 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hi Dave,
A couple of CS 101 "Gotcha!" fixes for you this week. One for a reference count,
and one for a memory leak. Both are cc: stable.
drm-misc-fixes-2018-05-02:
vc4: Fix bo refcounts during async commits (Boris)
vga-dac: Fix edid memory leak (Sean)
Cc: Boris Brezillon <boris.brezil...@bootlin.com>
Cc: Sean Paul <seanp...@chromium.org>
Cheers, Sean
The following changes since commit 1f6b8eef11c3d097bc8a6b2bbb868eb47ec6f7d8:
drm/edid: Reset more of the display info (2018-04-25 15:03:13 -0400)
are available in the Git repository at:
git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2018-05-02
for you to fetch changes up to 49ceda9de2da4d1827941d06701f3017c27c1855:
drm/bridge: vga-dac: Fix edid memory leak (2018-05-02 15:09:21 -0400)
vc4: Fix bo refcounts during async commits (Boris)
vga-dac: Fix edid memory leak (Sean)
Cc: Boris Brezillon <boris.brezil...@bootlin.com>
Cc: Sean Paul <seanp...@chromium.org>
Boris Brezillon (1):
drm/vc4: Make sure vc4_bo_{inc,dec}_usecnt() calls are balanced
Sean Paul (1):
drm/bridge: vga-dac: Fix edid memory leak
drivers/gpu/drm/bridge/dumb-vga-dac.c | 4 ++-
drivers/gpu/drm/vc4/vc4_crtc.c| 46 ++-
2 files changed, 48 insertions(+), 2 deletions(-)
--
Sean Paul, Software Engineer, Google / Chromium OS
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PATCH] dim: handle parse failures in apply_pull better
On Mon, Apr 30, 2018 at 08:29:57AM +0200, Daniel Vetter wrote: > We're relying on get fetch failing and set -e, but that doesn't work > if we parse nothing: In that case git fetch just fetches upstream and > succeed. Dave stumbled over this by feeding a .mbox with dos linefeeds > into dim. > > Cc: Dave Airlie <airl...@gmail.com> > Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> Reviewed-by: Sean Paul <seanp...@chromium.org> > --- > dim | 7 ++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/dim b/dim > index ec51e36b1269..63163614ea17 100755 > --- a/dim > +++ b/dim > @@ -901,7 +901,12 @@ function dim_apply_pull > > pull_branch=$(sed -e '0,/[gG]it repository at:$/d' $file | head -n 2 | > tail -n 1) > > - echo $pull_branch > + if [[ "$pull_branch" == "" ]] ; then > + echoerr "no pull request found" > + exit 1 > + fi > + > + echo Pulling $pull_branch ... > > git fetch $pull_branch > for sha1 in $(git rev-list "HEAD..FETCH_HEAD" --no-merges) ; do > -- > 2.17.0 > > _______ > dim-tools mailing list > dim-tools@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: -fixes and ff-only
On Mon, Apr 30, 2018 at 12:39:22PM +0300, Jani Nikula wrote: > > Late to the party... I have been on vacation since Thursday, so this is good timing for me :-) > > On Wed, 25 Apr 2018, Sean Paul <seanp...@google.com> wrote: > > Hey maintainers, > > I'm noticing a trend which is unlikely to slow down, so I'd like to get > > your input. I send my -fixes (and other) pull requests typically on > > Wednesday afternoons (ET) to allow Dave plenty of time to pick them up and > > send them to Linus. > > > > Unfortunately this means that if anything applied to -fixes between the > > pull being sent and me getting into work on Monday morning (after the > > latest rc is cut) will result in a backmerge instead of a fast forward. In > > previous releases, volume was low enough that I won the race most weeks. > > However, now that we have (many) more contributors, I almost always expect > > to lose. > > > > So, what do? Intel has a drm-intel-next-queued where they manually sort and > > apply their patches to the various trees. This allows them to wait for the > > next rc before piling on any more fixes. I don't expect this will work for > > -misc since it likely requires more time and collaboration than we have to > > give. > > > > We could create a drm-misc-fixes-queued branch and leave drm-misc-fixes to > > be manually curated by the maintainer handling the current release. Of > > course, that same person would need to ensure that drm-misc-fixes-queued is > > maintained as well (does intel just regularly backmerge to dinq > > regularly?). Are there any other options we're missing? > > How important is it for you that drm-misc-fixes is up-to-date with the > latest -rc? If we miss an -rc, we'll just wait for the next opportunity > for the fast-forward rebase, and we don't do backmerges in the mean > time. Yeah, perhaps this release cycle has been worse than others, but this week is rc4 and there's already a fix queued. If we didn't rebase or backmerge, we would still be based on rc1. The policy was working pretty well, but now that we have more committers, it's going to become less likely that we'll win the race between PR send and rc cut. We could possibly delay sending the fixes PRs to reduce the window, but that reduces the amount of time Dave has to pull everything together. > > For us, pushing everything to drm-intel-next-queued and maintainers > cherry-picking to drm-intel-fixes or drm-intel-next-fixes is a mixed > blessing. On the one hand, it ensures dinq has all the fixes, and future > kernels won't miss a fix because of a conflict with features. We can > always resolve merge conflicts to dinq side and know it's the right > thing. On the other hand, the current -rc kernel may suffer from this if > the cherry-pick doesn't apply; the fix stays in dinq until next merge > window. And then there's the dupe commits from cherry-picks that I kind > of expect someone to start raging about at some point. I don't think a -fixes-queued branch would suffer from that since it would just be for fixes, and they would not be applied to -misc-next (as is the situation today). That said, I doubt rebasing -misc-fixes every 2 weeks is causing too much heartburn, so it seems like a good middle road until someone complains. I'll keep checking every Monday to see if I can ff -fixes, but I think we should have some [in]formal process in case it drifts too far off. Sean > > BR, > Jani. > > -- > Jani Nikula, Intel Open Source Technology Center -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: -fixes and ff-only
On Wed, Apr 25, 2018 at 2:10 PM Daniel Vetter <dan...@ffwll.ch> wrote: > On Wed, Apr 25, 2018 at 8:07 PM, Sean Paul <seanp...@chromium.org> wrote: > > On Wed, Apr 25, 2018 at 1:56 PM Daniel Vetter <dan...@ffwll.ch> wrote: > > > >> Works better with an untypoed airlied. > > > >> On Wed, Apr 25, 2018 at 7:55 PM, Daniel Vetter <dan...@ffwll.ch> wrote: > >> > On Wed, Apr 25, 2018 at 7:00 PM, Sean Paul <seanp...@google.com> wrote: > >> >> Hey maintainers, > >> >> I'm noticing a trend which is unlikely to slow down, so I'd like to get > >> >> your input. I send my -fixes (and other) pull requests typically on > >> >> Wednesday afternoons (ET) to allow Dave plenty of time to pick them up > > and > >> >> send them to Linus. > >> >> > >> >> Unfortunately this means that if anything applied to -fixes between the > >> >> pull being sent and me getting into work on Monday morning (after the > >> >> latest rc is cut) will result in a backmerge instead of a fast > > forward. In > >> >> previous releases, volume was low enough that I won the race most > > weeks. > >> >> However, now that we have (many) more contributors, I almost always > > expect > >> >> to lose. > >> >> > >> >> So, what do? Intel has a drm-intel-next-queued where they manually > > sort and > >> >> apply their patches to the various trees. This allows them to wait for > > the > >> >> next rc before piling on any more fixes. I don't expect this will work > > for > >> >> -misc since it likely requires more time and collaboration than we > > have to > >> >> give. > >> >> > >> >> We could create a drm-misc-fixes-queued branch and leave > > drm-misc-fixes to > >> >> be manually curated by the maintainer handling the current release. Of > >> >> course, that same person would need to ensure that > > drm-misc-fixes-queued is > >> >> maintained as well (does intel just regularly backmerge to dinq > >> >> regularly?). Are there any other options we're missing? > >> > > >> > Adding Dave, since in the end he's got to look cute when Linus > >> > starts rampaging. > >> > > > > > Hopefully we can get ahead of it before rampage territory! > > > >> > On the problem itself: No idea how to fix it. The issue with a > >> > drm-misc-fixes-queued is that eventually you have to rebase it, and > >> > rebasing a shared tree is not really cool (patches will get lost > >> > sooner or later). > >> > > >> > Backmerging -next trees is a lot less of an issue I think since Linus > >> > just plain doesn't look at the huge pulls we're sending him. As long > >> > as there's not too many merges in there (and seriously some subsystems > >> > do merges per individual patch, so we're far away from anything that > >> > looks funny). But with -fixes he's probably looking at stuff more > >> > because less pull request flood. > > > > Yeah, that's why I'm not too worried about -misc-next or -next-fixes. > > > >> > > >> > Since -fixes-queued still requires rebased, what if we just try to at > >> > least rebase every 2nd week or so (instead of backmerging all the > >> > time), and see how that works? Rebase ofc needs to be really, really > >> > careful and make sure that upstream hasn't moved while we've rebased. > >> > Could/should probably script that. > > > > We could presumably have the same dim function both ff -fixes and then > > rebase -fixes-queued, doing the requisite checks along the way. Presumably > > the drm-tip integration is cool with a rebase once in a while? How about > > rerere? > drm-tip is totally fine with constant rebasing. It's developers > concurrently pushing patches while rebasing creating a mess. But if we > go with rebasing anyway then I'd still suggest we just rebase -fixes > for now and see what happens. Retraining everyone to push patches to > -fixes-queued, just for an experiment, is going to be a lot of effort. Yeah, I was thinking -fixes would be the queue and there would be a -fixes-for-dave or somesuch. Anyways, this will at least solve my problem, and avoid having my name on all of the ugly backmerges going to Linus ;-). So, unless anyone objects, I'll rebase -fixes before sending Dave my PR in an hour or so. Sean > -Daniel > -- > Daniel Vetter > Software Engineer, Intel Corporation > +41 (0) 79 365 57 48 - http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: -fixes and ff-only
On Wed, Apr 25, 2018 at 1:36 PM Rodrigo Vivi <rodrigo.v...@intel.com> wrote: > On Wed, Apr 25, 2018 at 05:00:56PM +0000, Sean Paul wrote: > > Hey maintainers, > > I'm noticing a trend which is unlikely to slow down, so I'd like to get > > your input. I send my -fixes (and other) pull requests typically on > > Wednesday afternoons (ET) to allow Dave plenty of time to pick them up and > > send them to Linus. > > > > Unfortunately this means that if anything applied to -fixes between the > > pull being sent and me getting into work on Monday morning (after the > > latest rc is cut) will result in a backmerge instead of a fast forward. In > > previous releases, volume was low enough that I won the race most weeks. > > However, now that we have (many) more contributors, I almost always expect > > to lose. > > > > So, what do? Intel has a drm-intel-next-queued where they manually sort and > > apply their patches to the various trees. This allows them to wait for the > > next rc before piling on any more fixes. I don't expect this will work for > > -misc since it likely requires more time and collaboration than we have to > > give. > > > > We could create a drm-misc-fixes-queued branch and leave drm-misc-fixes to > > be manually curated by the maintainer handling the current release. Of > > course, that same person would need to ensure that drm-misc-fixes-queued is > > maintained as well (does intel just regularly backmerge to dinq > > regularly?). Are there any other options we're missing? > We don't do that regularly, but only on need basis. For instance when there was > some define coming from drm-misc that is already on drm-next that we need > to continue to develop on i915. Ok, that's what we do for -misc-next. > People maintaining the -queued and -fixes are different. Our rotation is on > the target version. > For instance Jani is maintaining the drm-intel-next-queued targeting it for 4.18 > While Joonas is maintaining drm-intel-fixes for 4.17 > On next round: > I will take drm-intel-next-queued and drm-intel-next-fixes for 4.19 > Jani will then take the drm-intel-fixes for 4.18. > Rotation is one version from begin to end. Also the same for -misc. I'm doing -fixes atm, Maarten is handling -next, and Gustavo is enjoying life until rc6 :) > I believe this could work on drm-misc as well. Another advantage of the manual > cherry picking for fixes is that most of developers don't need to worry about > conflict fixing. Presumably you need to coordinate which patches from -queued go into -next vs -fixes? That's my primary concern. Since drm-misc is a little more distributed than drm-intel, I think that might become a bottleneck. That's why I'm partial to just doing -queued for drm-misc-fixes. -misc-next-fixes is low enough volume that we should still win the race most weeks. Sean > Thanks, > Rodrigo. > > > > Sean > > ___ > > dim-tools mailing list > > dim-tools@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dim-tools ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
-fixes and ff-only
Hey maintainers, I'm noticing a trend which is unlikely to slow down, so I'd like to get your input. I send my -fixes (and other) pull requests typically on Wednesday afternoons (ET) to allow Dave plenty of time to pick them up and send them to Linus. Unfortunately this means that if anything applied to -fixes between the pull being sent and me getting into work on Monday morning (after the latest rc is cut) will result in a backmerge instead of a fast forward. In previous releases, volume was low enough that I won the race most weeks. However, now that we have (many) more contributors, I almost always expect to lose. So, what do? Intel has a drm-intel-next-queued where they manually sort and apply their patches to the various trees. This allows them to wait for the next rc before piling on any more fixes. I don't expect this will work for -misc since it likely requires more time and collaboration than we have to give. We could create a drm-misc-fixes-queued branch and leave drm-misc-fixes to be manually curated by the maintainer handling the current release. Of course, that same person would need to ensure that drm-misc-fixes-queued is maintained as well (does intel just regularly backmerge to dinq regularly?). Are there any other options we're missing? Sean ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next-fixes
Hi Dave, After fixing the dim bug, I have a sane pull request for you this week :). Just one patch again, this time fixing a build warning in hda_intel. Takashi requested this go through drm-misc as the original switcheroo came through here too. drm-misc-next-fixes-2018-04-04: hda_intel: Don't declare azx PM ops if VGA_SWITCHEROO configured (Lukas) Cc: Lukas Wunner <lu...@wunner.de> Cc: Takashi Iwai <ti...@suse.de> Cheers, Sean The following changes since commit a01c47737a9ca118ab75c6fd6e75739b824de830: drm: Fix uabi regression by allowing garbage mode->type from userspace (2018-03-23 13:51:12 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2018-04-04 for you to fetch changes up to 8cd1b5bd70cccda6854088825e725a513ec919c6: ALSA: hda - Silence PM ops build warning (2018-03-29 21:47:53 +0200) hda_intel: Don't declare azx PM ops if VGA_SWITCHEROO configured (Lukas) Cc: Lukas Wunner <lu...@wunner.de> Cc: Takashi Iwai <ti...@suse.de> Lukas Wunner (1): ALSA: hda - Silence PM ops build warning sound/pci/hda/hda_intel.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [DIM PATCH] dim: Don't use "@{upstream}" when running gitk for pulls
On Thu, Mar 29, 2018 at 05:45:46PM +0300, Jani Nikula wrote:
> On Thu, 29 Mar 2018, Sean Paul <seanp...@chromium.org> wrote:
> > On Thu, Mar 29, 2018 at 9:54 AM Jani Nikula <jani.nik...@linux.intel.com>
> > wrote:
> >
> >> On Thu, 29 Mar 2018, Sean Paul <seanp...@chromium.org> wrote:
> >> > Use the local branch when launching gitk for the purpose of pull
> >> > requests. Since the pull is generated from the local branch, this gives
> >> > a view of exactly what will be sent, thus avoiding embarrassing empty
> >> > pulls (*cough* [1] *cough*) or invalid tag summaries.
> >>
> >> What's the scenario where these would be out of sync?
> >>
> >
> > If the local branch is behind the upstream branch. This could be
> > intentional or unintentional.
>
> Hmm, we seem to fetch the remote branch, but we don't then update the
> local branch on it... mmmkay.
>
> > Intentional: I sometimes will want to cut a tag at a certain point if I'm
> > sending -misc-next pulls
> > Unintentional: As was the case last night, I sometimes forget to run dim
> > update-branches
> >
> > In both of these cases, I want the gitk output to show me what I'm tagging
> > instead of what is in the upstream branch.
>
> Right, makes sense. Does tag_branch need updating too...? It does tag
> the upstream?
From the tests I've run, it tags where the local brach is at.
>
> For the intentional case, I'm wondering if we should consider switching
> to the drm-intel-next model of separating tagging and sending pull
> requests throughout. The main benefit would be letting you tag more
> often to log the changes. Then we could update the tagging to let you
> choose an older than the topmost commit to tag. And then we'd have the
> commit id to be tagged that could also be used for limiting gitk and
> tag_branch.
I added dim tag-branch a little while back to facilitate this. This is
especially useful for the layoff between -misc-next pulls between releases.
>
> Your current use of this seems like abuse of the script... ;)
Well, fwiw, the intentional cases are where I've started my summary and people
have pushed patches while I'm writing it. So it's usually a couple hours behind
at worse, and definitely a usecase we want to facilitate.
Sean
>
> BR,
> Jani.
>
>
> >
> > Sean
> >
> >
> >>
> >> BR,
> >> Jani.
> >>
> >> >
> >> > Cc: Dave Airlie <airl...@gmail.com>
> >> > Signed-off-by: Sean Paul <seanp...@chromium.org>
> >> >
> >> > [1]-
> >> https://lists.freedesktop.org/archives/dri-devel/2018-March/171055.html
> >> > ---
> >> > dim | 2 +-
> >> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >> >
> >> > diff --git a/dim b/dim
> >> > index 29647f87381e..068efb674cd3 100755
> >> > --- a/dim
> >> > +++ b/dim
> >> > @@ -1818,7 +1818,7 @@ function dim_pull_request
> >> > repo="drm-intel"
> >> > else
> >> > tag=$(tag_name "$branch")
> >> > - gitk "$branch@{upstream}" ^$upstream &
> >> > + gitk "$branch" ^$upstream &
> >> > tag_branch $tag $branch
> >> > $DRY git push $remote $tag
> >> > prep_pull_mail $req_file $tag
> >>
> >> --
> >> Jani Nikula, Intel Open Source Technology Center
> >>
>
> --
> Jani Nikula, Intel Open Source Technology Center
--
Sean Paul, Software Engineer, Google / Chromium OS
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [DIM PATCH] dim: Don't use "@{upstream}" when running gitk for pulls
On Thu, Mar 29, 2018 at 9:54 AM Jani Nikula <jani.nik...@linux.intel.com>
wrote:
> On Thu, 29 Mar 2018, Sean Paul <seanp...@chromium.org> wrote:
> > Use the local branch when launching gitk for the purpose of pull
> > requests. Since the pull is generated from the local branch, this gives
> > a view of exactly what will be sent, thus avoiding embarrassing empty
> > pulls (*cough* [1] *cough*) or invalid tag summaries.
>
> What's the scenario where these would be out of sync?
>
If the local branch is behind the upstream branch. This could be
intentional or unintentional.
Intentional: I sometimes will want to cut a tag at a certain point if I'm
sending -misc-next pulls
Unintentional: As was the case last night, I sometimes forget to run dim
update-branches
In both of these cases, I want the gitk output to show me what I'm tagging
instead of what is in the upstream branch.
Sean
>
> BR,
> Jani.
>
> >
> > Cc: Dave Airlie <airl...@gmail.com>
> > Signed-off-by: Sean Paul <seanp...@chromium.org>
> >
> > [1]-
> https://lists.freedesktop.org/archives/dri-devel/2018-March/171055.html
> > ---
> > dim | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/dim b/dim
> > index 29647f87381e..068efb674cd3 100755
> > --- a/dim
> > +++ b/dim
> > @@ -1818,7 +1818,7 @@ function dim_pull_request
> > repo="drm-intel"
> > else
> > tag=$(tag_name "$branch")
> > - gitk "$branch@{upstream}" ^$upstream &
> > + gitk "$branch" ^$upstream &
> > tag_branch $tag $branch
> > $DRY git push $remote $tag
> > prep_pull_mail $req_file $tag
>
> --
> Jani Nikula, Intel Open Source Technology Center
>
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
[DIM PATCH] dim: Don't use "@{upstream}" when running gitk for pulls
Use the local branch when launching gitk for the purpose of pull
requests. Since the pull is generated from the local branch, this gives
a view of exactly what will be sent, thus avoiding embarrassing empty
pulls (*cough* [1] *cough*) or invalid tag summaries.
Cc: Dave Airlie <airl...@gmail.com>
Signed-off-by: Sean Paul <seanp...@chromium.org>
[1]- https://lists.freedesktop.org/archives/dri-devel/2018-March/171055.html
---
dim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dim b/dim
index 29647f87381e..068efb674cd3 100755
--- a/dim
+++ b/dim
@@ -1818,7 +1818,7 @@ function dim_pull_request
repo="drm-intel"
else
tag=$(tag_name "$branch")
- gitk "$branch@{upstream}" ^$upstream &
+ gitk "$branch" ^$upstream &
tag_branch $tag $branch
$DRY git push $remote $tag
prep_pull_mail $req_file $tag
--
Sean Paul, Software Engineer, Google / Chromium OS
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next-fixes
Hi Dave, Here's a lonely fix for -next, please pull at your convenience. drm-misc-next-fixes-2018-03-28: UABI: - Mask mode type garbage from userspace (Ville) Cc: Ville Syrjälä <ville.syrj...@linux.intel.com> Cheers, Sean The following changes since commit b4eec0fa537165efc3265cdbb4bac06e6bdaf596: Merge tag 'drm-intel-next-fixes-2018-03-22' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2018-03-23 06:19:27 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2018-03-28 for you to fetch changes up to b4eec0fa537165efc3265cdbb4bac06e6bdaf596: Merge tag 'drm-intel-next-fixes-2018-03-22' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2018-03-23 06:19:27 +1000) UABI: - Mask mode type garbage from userspace (Ville) Cc: Ville Syrjälä <ville.syrj...@linux.intel.com> ---- -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [DIM PATCH 1/2] TODO: Cc patch authors when tagging and generating PRs
On Thu, Mar 22, 2018 at 10:25:04AM -0400, Harry Wentland wrote: > On 2018-03-22 09:04 AM, Sean Paul wrote: > > On Thu, Mar 22, 2018 at 11:53:29AM +0200, Jani Nikula wrote: > >> On Wed, 21 Mar 2018, Sean Paul <seanp...@chromium.org> wrote: > >> > >> Please insert rationale here... > >> > >>> Acked-by: Daniel Vetter <daniel.vet...@ffwll.ch> > >>> Signed-off-by: Sean Paul <seanp...@chromium.org> > >>> --- > >>> > >>> Pushed with danvet's IRC ack > >> > >> Sure it's "just" a documentation patch, but please let's stick to the > >> practice of sending patches out to the list and giving people a chance > >> to comment before pushing. > > > > Yeah, my apologies for jumping the gun, I had assumed TODO was more wiki > > style > > than the rest of the tree. I'll make sure it bakes on list next time. > > > > What's the generally accepted bake time on the mailing list for patches with > existing ACK or RB before merging? > > I'd usually go with a couple working days, up to a week, depending on my > assessment of the potential contentiousness of a patch. I think it depends on the strength of the Ack/Review (ie: if it comes from the driver maintainer, or a fly-by by someone else), as well as the complexity of the patch. However as discussed upthread, my model might not be the best one to follow :-) Sean > > Harry > > >> > >>> > >>> TODO.rst | 2 ++ > >>> 1 file changed, 2 insertions(+) > >>> > >>> diff --git a/TODO.rst b/TODO.rst > >>> index 76b00a1873df..154795027c27 100644 > >>> --- a/TODO.rst > >>> +++ b/TODO.rst > >>> @@ -18,6 +18,8 @@ dim > >>>first for rebuild-nightly to pick it up, which means the merge can't be > >>>fixed any more. > >>> - apply-resolved fails to add the Link: tag. > >>> +- Harvest and add Cc labels to all authors when tagging a branch > >>> +- Parse Cc labels from tag body and add as email headers when sending > >>> pull requests > >> > >> So I guess this is useful especially for people not subscribed to > >> dri-devel to see where their patches are going. drm-intel-next regularly > >> has 20-30 authors per pull request. I'm just a little bit hesitant about > >> the noise. Do you think the benefits outweight that? > > > > -misc-next is at least the same. It'll be easier for my workflow since I > > won't > > need to manually copy/paste the entries over from gitk to the tag, but I > > certainly can't speak for others. I was thinking this could be hidden > > behind a > > DIM_TEMPLATE flag for those who want it. > > > > Again, I'm sorry for the direct push, won't happen again. > > > > Sean > > > >> > >> BR, > >> Jani. > >> > >> > >> -- > >> Jani Nikula, Intel Open Source Technology Center > > -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[DIM PATCH 2/2] TODO: Add example for Cc harvesting item
Acked-by: Daniel Vetter <daniel.vet...@ffwll.ch> Signed-off-by: Sean Paul <seanp...@chromium.org> --- TODO.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO.rst b/TODO.rst index 154795027c27..a69d49c69dbd 100644 --- a/TODO.rst +++ b/TODO.rst @@ -19,6 +19,7 @@ dim fixed any more. - apply-resolved fails to add the Link: tag. - Harvest and add Cc labels to all authors when tagging a branch +(ex: https://cgit.freedesktop.org/drm-misc/tag/?h=drm-misc-next-2018-03-21) - Parse Cc labels from tag body and add as email headers when sending pull requests qf -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[DIM PATCH 1/2] TODO: Cc patch authors when tagging and generating PRs
Acked-by: Daniel Vetter <daniel.vet...@ffwll.ch> Signed-off-by: Sean Paul <seanp...@chromium.org> --- Pushed with danvet's IRC ack TODO.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TODO.rst b/TODO.rst index 76b00a1873df..154795027c27 100644 --- a/TODO.rst +++ b/TODO.rst @@ -18,6 +18,8 @@ dim first for rebuild-nightly to pick it up, which means the merge can't be fixed any more. - apply-resolved fails to add the Link: tag. +- Harvest and add Cc labels to all authors when tagging a branch +- Parse Cc labels from tag body and add as email headers when sending pull requests qf -- -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-next
up_bus() & pci_bus_set_current_state() public vga_switcheroo: Update PCI current_state on power change vga_switcheroo: Deduplicate power state tracking vga_switcheroo: Use device link for HDA controller vga_switcheroo: Let HDA autosuspend on mux change drm/nouveau: Runtime suspend despite HDA being unbound Marc Zyngier (3): drm/rockchip: Clear all interrupts before requesting the IRQ drm/rockchip: Do not use memcpy for MMIO addresses drm/rockchip: Don't use spin_lock_irqsave in interrupt context Maxime Ripard (2): drm/sun4i: backend: Check that we only have a single YUV plane drm/sun4i: backend: Support YUV planes Neil Armstrong (1): drm/meson: Add support for DMT modes on HDMI Paul McQuade (1): drm: dma_bufs: Fixed checkpatch issues Philippe CORNU (5): dt-bindings: display: panel: Add support for Raydium RM68200 DSI panel drm/panel: Add support for Raydium RM68200 panel driver dt-bindings/display/panel: otm8009a: Add optional power-supply property drm/panel: otm8009a: Add support for the optional power-supply drm/panel: otm8009a: Adopt SPDX identifiers Rafael J. Wysocki (1): PCI: Restore config space on runtime resume despite being unbound Santha Meena Ramamoorthy (1): drm/qxl: Replace drm_gem_object_reference/unreference() with _get/put() Sean Paul (5): dt-bindings: Clarify timing subnode use as panel-timing dt-bindings: Add headings to simple-panel bindings drm/panel: simple: Use display_timing for lq123p1jx31 drm/rockchip: Remove analogix psr worker Merge airlied/drm-next into drm-misc-next Stefan Schake (4): drm/vc4: Set premultiplied for alpha formats drm/vc4: Check if plane requires background fill drm/vc4: Move plane state to header drm/vc4: Enable background color fill when necessary Ville Syrjälä (9): drm: Fix some coding style issues Revert "drm: Use a flexible array member for blob property data" drm: Remove now pointelss blob->data casts drm: Verify gamma/degamma LUT size drm: Introduce drm_color_lut_size() drm/i915: Remove the blob->data casts drm/i915: Use drm_color_lut_size() drm: Nuke the useless 'ret' variable from drm_mode_convert_umode() drm: Make drm_mode_vrefresh() a bit more accurate Wei Yongjun (2): drm/panel: ili9322: Make local symbols static drm/meson: Fix potential NULL dereference in meson_drv_bind_master() Yakir Yang (1): drm/bridge: analogix_dp: detect Sink PSR state after configuring the PSR jan.tu...@emtrion.com (1): dt-bindings: Add vendor prefix for emtrion GmbH zain wang (4): drm/bridge: analogix_dp: Don't change psr while bridge is disabled drm/bridge: analogix_dp: add fast link train for eDP drm/rockchip: add mutex vop lock drm/bridge: analogix_dp: Only wait for panel ACK on PSR entry .../bindings/display/panel/auo,g104sn02.txt| 12 + .../bindings/display/panel/display-timing.txt | 5 + .../bindings/display/panel/koe,tx31d200vm0baa.txt | 25 ++ .../bindings/display/panel/orisetech,otm8009a.txt | 2 + .../bindings/display/panel/raydium,rm68200.txt | 25 ++ .../bindings/display/panel/simple-panel.txt| 4 + .../bindings/display/sunxi/sun4i-drm.txt | 39 +- .../devicetree/bindings/vendor-prefixes.txt| 1 + Documentation/gpu/drivers.rst | 21 + Documentation/gpu/drm-kms.rst | 3 + Documentation/gpu/index.rst| 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c| 2 - drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 151 +-- drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 11 +- drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 38 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 9 - drivers/gpu/drm/drm_atomic.c | 42 +- drivers/gpu/drm/drm_atomic_helper.c| 2 +- drivers/gpu/drm/drm_bufs.c | 16 +- drivers/gpu/drm/drm_edid.c | 3 +- drivers/gpu/drm/drm_fb_helper.c| 2 +- drivers/gpu/drm/drm_framebuffer.c | 5 +- drivers/gpu/drm/drm_modes.c| 34 +- drivers/gpu/drm/drm_plane.c| 2 +- drivers/gpu/drm/drm_print.c| 65 ++- drivers/gpu/drm/drm_property.c | 1 + drivers/gpu/drm/i915/intel_color.c | 32 +- drivers/gpu/drm/i915/intel_display.c | 15 +- drivers/gpu/drm/meson/meson_drv.c | 37 +- drivers/gpu/drm/meson/meson_dw_hdmi.c | 22 +- drivers/gpu/drm/meson/meson_vclk.c | 219 +- drivers/gpu/drm/meson/meson_venc.c | 347 +++- drivers/gpu/drm/meson/meson_venc.h
[PULL] drm-misc-next
m/sun4i: backend: Make zpos configurable
drm/sun4i: backend: Remove ARGB spoofing
Neil Armstrong (1):
drm: bridge: dw-hdmi: Fix overflow workaround for Amlogic Meson GX SoCs
Oleksandr Andrushchenko (5):
drm/simple_kms_helper: Fix NULL pointer dereference with no active CRTC
drm/simple_kms_helper: Add {enable|disable}_vblank callback support
drm/mxsfb: Do not use deprecated drm_driver.{enable|disable)_vblank
drm/tve200: Do not use deprecated drm_driver.{enable|disable)_vblank
drm/pl111: Do not use deprecated drm_driver.{enable|disable)_vblank
Philippe CORNU (1):
drm/bridge/synopsys: dsi: readl_poll_timeout return value clean up
Rodrigo Siqueira (7):
drm/virtio: Add tabs at the start of a line
drm/virtio: Add blank line after variable declarations
drm/virtio: Add */ in block comments to separate line
drm/virtio: Remove return from void function
drm/virtio: Replace 'unsigned' for 'unsigned int'
drm/virtio: Remove multiple blank lines
drm/virtio: Add spaces around operators
Sean Paul (1):
drm/rockchip: Don't use atomic constructs for psr
Shirish S (1):
drm/atomic: Add new reverse iterator over all plane state (V2)
Stefan Wahren (1):
drm/vc4: Replace long HDMI udelay with usleep_range
Thierry Reding (1):
drm/pl111: Remove reverse dependency on DRM_DUMB_VGA_DAC
Ville Syrjälä (22):
drm: Check that the plane supports the request format+modifier combo
drm/i915: Remove the pipe/plane ID checks from skl_check_ccs_aux_surface()
drm: Include the header with the prototype for
drm_get_panel_orientation_quirk()
drm/uapi: The ctm matrix uses sign-magnitude representation
drm/atomic: Include color encoding/range in plane state dump
drm/i915: Correctly handle limited range YCbCr data on VLV/CHV
drm/i915: Fix plane YCbCr->RGB conversion for GLK
drm/i915: Add support for the YCbCr COLOR_ENCODING property
drm/i915: Change the COLOR_ENCODING prop default value to BT.709
drm/i915: Add support for the YCbCr COLOR_RANGE property
drm/armada: Construct a temporary crtc state for plane checks
drm/armada: Use drm_mode_get_hv_timing() to populate plane clip rectangle
drm: Don't pass clip to drm_atomic_helper_check_plane_state()
drm: Don't create properties without names
drm: Check property/enum name length
drm: Reject replacing property enum values
drm: WARN when trying add enum values to non-enum/bitmask properties
drm: WARN when trying to add enum value > 63 to a bitmask property
drm/uapi: Deprecate DRM_MODE_PROP_PENDING
drm: Make property flags u32
drm: Reject bad property flag combinations
drm/nouveau: Replace the iturbt_709 prop with the standard COLOR_ENCODING
prop
zain wang (2):
drm/bridge: analogix_dp: Don't power bridge in analogix_dp_bind
drm/rockchip: analogix_dp: set psr activate/deactivate when
enable/disable bridge
.../bindings/display/sunxi/sun4i-drm.txt | 6 +
drivers/gpu/drm/arm/hdlcd_crtc.c | 7 +-
drivers/gpu/drm/arm/malidp_planes.c| 7 +-
drivers/gpu/drm/armada/armada_crtc.c | 9 +-
drivers/gpu/drm/armada/armada_overlay.c| 9 +-
drivers/gpu/drm/bridge/Kconfig | 3 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 97 +++---
drivers/gpu/drm/bridge/sii902x.c | 20 +-
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 3 +
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 10 +-
drivers/gpu/drm/drm_atomic.c | 22 +-
drivers/gpu/drm/drm_atomic_helper.c| 12 +-
drivers/gpu/drm/drm_color_mgmt.c | 133
drivers/gpu/drm/drm_crtc.c | 10 +-
drivers/gpu/drm/drm_crtc_internal.h| 6 +-
drivers/gpu/drm/drm_drv.c | 2 +-
drivers/gpu/drm/drm_memory.c | 2 +-
drivers/gpu/drm/drm_mm.c | 9 +-
drivers/gpu/drm/drm_modeset_lock.c | 1 +
drivers/gpu/drm/drm_of.c | 8 +-
drivers/gpu/drm/drm_panel_orientation_quirks.c | 1 +
drivers/gpu/drm/drm_plane.c| 33 +-
drivers/gpu/drm/drm_plane_helper.c | 11 +-
drivers/gpu/drm/drm_prime.c| 52 +--
drivers/gpu/drm/drm_property.c | 101 +++---
drivers/gpu/drm/drm_simple_kms_helper.c| 34 +-
drivers/gpu/drm/drm_vblank.c | 9 +
drivers/gpu/drm/exynos/exynos_dp.c | 30 +-
drivers/gpu/drm/i915/i915_reg.h| 24 +-
drivers/gpu/drm/i915/intel_display.c | 45 +--
drivers/gpu/drm/i915/intel_drv.h | 2 +
drivers/gpu/drm/i915/intel_sprite.c| 134 ++--
driver
Re: [PULL] drm-misc-next
On Tue, Mar 06, 2018 at 09:07:52PM +0200, Ville Syrjälä wrote: > On Tue, Mar 06, 2018 at 02:01:21PM -0500, Sean Paul wrote: > > On Tue, Mar 06, 2018 at 07:42:53AM +0100, Daniel Vetter wrote: > > > On Tue, Mar 6, 2018 at 12:20 AM, Sean Paul <seanp...@chromium.org> wrote: > > > > On Mon, Mar 5, 2018 at 12:10 AM, Daniel Vetter <dan...@ffwll.ch> wrote: > > > >> On Fri, Mar 02, 2018 at 04:22:15PM -0500, Sean Paul wrote: > > > >>> On Wed, Feb 28, 2018 at 3:34 PM, Sean Paul <seanp...@chromium.org> > > > >>> wrote: > > > >>> > > > > >>> > Hi Dave, > > > >>> > Here's this weeks pull, relatively small when you pull out the > > > >>> > trivial fixes. > > > >>> > > > > >>> > drm-misc-next-2018-02-28: > > > >>> > drm-misc-next for 4.17: > > > >>> > > > > >>> > UAPI Changes: > > > >>> > Fix drm_color_ctm matrix docs to match usage and change the type to > > > >>> > __u64 make it obvious (Ville) > > > >>> > > > >>> Hi Dave, > > > >>> Could you please hold off on pulling this? I'd like to sort out this > > > >>> change a bit more. We're already using the __s64 in chrome, and not > > > >>> explicitly sign-magnitude. I think it would be prudent to hash this > > > >>> out a little more. > > > >>> > > > >>> https://cs.chromium.org/chromium/src/ui/ozone/platform/drm/gpu/drm_device.cc?l=161 > > > >> > > > >> That code seems to be doing the exact same fun s.u63 math. This all > > > >> looks > > > >> consistent to me. > > > > > > > > Hmm, yeah, I skimmed too quickly last week. > > > > > > > >> > > > >> Now in hindsight ofc we've screwed up the uapi, but well can't fix that > > > >> now again ... > > > > > > > > Yeah, I'm not convinced we should be changing the type. It's great to > > > > clarify the documentation to let userspace know it's sign-magnitude, > > > > but changing the type in-flight with users seems wrong. > > > > > > But everyone must do unsigned bit ops to get this right, the s64 is > > > completely meaningless at best, and very likely will confuse someone. > > > > It's definitely a good change to clarify the usage of the field, I'm not > > arguing > > against that. > > > > > What do we benefit by not changing it? > > > > In the kernel, nothing. However changing uapi structs out from under > > userspace > > requires userspace updates. In order for that to happen, they need to be > > aware of the change and coordinate its rollout kernel/libdrm/compositor. At > > least in CrOS, Chrome people don't follow kernel changes, so they'll > > discover > > this with a compiler warning (hopefully) and have to backtrack what > > happened. > > > > Given that everybody seems to be using this struct correctly, what do we > > benefit > > from changing it? Wouldn't a comment be sufficient? Perhaps a union of > > __s64/__u64 would be less disruptive. > > Umm. What exactly broke? The code behind your link even casts the final > value to unsigned. So now the struct actually matches the code. We haven't pulled the change back, so nothing has changed in cros. You're right that the code already does the right thing. So perhaps I'm just tilting at windmills here, but this type of churn seemed unsettling to me. Sean > > -- > Ville Syrjälä > Intel OTC -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
Re: [PULL] drm-misc-next
On Tue, Mar 06, 2018 at 07:42:53AM +0100, Daniel Vetter wrote: > On Tue, Mar 6, 2018 at 12:20 AM, Sean Paul <seanp...@chromium.org> wrote: > > On Mon, Mar 5, 2018 at 12:10 AM, Daniel Vetter <dan...@ffwll.ch> wrote: > >> On Fri, Mar 02, 2018 at 04:22:15PM -0500, Sean Paul wrote: > >>> On Wed, Feb 28, 2018 at 3:34 PM, Sean Paul <seanp...@chromium.org> wrote: > >>> > > >>> > Hi Dave, > >>> > Here's this weeks pull, relatively small when you pull out the trivial > >>> > fixes. > >>> > > >>> > drm-misc-next-2018-02-28: > >>> > drm-misc-next for 4.17: > >>> > > >>> > UAPI Changes: > >>> > Fix drm_color_ctm matrix docs to match usage and change the type to > >>> > __u64 make it obvious (Ville) > >>> > >>> Hi Dave, > >>> Could you please hold off on pulling this? I'd like to sort out this > >>> change a bit more. We're already using the __s64 in chrome, and not > >>> explicitly sign-magnitude. I think it would be prudent to hash this > >>> out a little more. > >>> > >>> https://cs.chromium.org/chromium/src/ui/ozone/platform/drm/gpu/drm_device.cc?l=161 > >> > >> That code seems to be doing the exact same fun s.u63 math. This all looks > >> consistent to me. > > > > Hmm, yeah, I skimmed too quickly last week. > > > >> > >> Now in hindsight ofc we've screwed up the uapi, but well can't fix that > >> now again ... > > > > Yeah, I'm not convinced we should be changing the type. It's great to > > clarify the documentation to let userspace know it's sign-magnitude, > > but changing the type in-flight with users seems wrong. > > But everyone must do unsigned bit ops to get this right, the s64 is > completely meaningless at best, and very likely will confuse someone. It's definitely a good change to clarify the usage of the field, I'm not arguing against that. > What do we benefit by not changing it? In the kernel, nothing. However changing uapi structs out from under userspace requires userspace updates. In order for that to happen, they need to be aware of the change and coordinate its rollout kernel/libdrm/compositor. At least in CrOS, Chrome people don't follow kernel changes, so they'll discover this with a compiler warning (hopefully) and have to backtrack what happened. Given that everybody seems to be using this struct correctly, what do we benefit from changing it? Wouldn't a comment be sufficient? Perhaps a union of __s64/__u64 would be less disruptive. Sean > We know all the users and have > the source, so we know that we won't hit another undefined corner of > C, which is about the only real issue I can even imagine. UAPI isn't > cast in stone, we simply have to make sure nothing breaks when we > clarify/update/remove/whatever it. > -Daniel > > > > > Sean > > > >> -Daniel > >> > >>> > >>> Sean > >>> > >>> > > >>> > Core Changes: > >>> > Check modifier with format when checking if a plane state is supported > >>> > (Ville) > >>> > > >>> > Driver Changes: > >>> > sun4i: Improve hw plane utilization (Maxime) > >>> > simple: Add per-pipe enable/disable vblank functions (Oleksandr) > >>> > virtio: Whitespace + checkpatch changes (Rodrigo) > >>> > > >>> > Cc: Maxime Ripard <maxime.rip...@bootlin.com> > >>> > Cc: Oleksandr Andrushchenko <oleksandr_andrushche...@epam.com> > >>> > Cc: Ville Syrjälä <ville.syrj...@linux.intel.com> > >>> > Cc: Rodrigo Siqueira <rodrigosiqueiram...@gmail.com> > >>> > > >>> > Cheers, Sean > >>> > > >>> > > >>> > The following changes since commit > >>> > 2b91e3c43b4f3d3cd4d84a31cfbe6b165d89b70e: > >>> > > >>> > drm/omapdrm: Use of_find_backlight helper (2018-02-20 11:07:22 -0500) > >>> > > >>> > are available in the Git repository at: > >>> > > >>> > git://anongit.freedesktop.org/drm/drm-misc > >>> > tags/drm-misc-next-2018-02-28 > >>> > > >>> > for you to fetch changes up to 7628166d5e2883e4cdd142b99863d29d411a81b2: > >>> > > >>> > tinydrm: add backlight dependency (2018-02-28 15:08:56 -0500) > >>> > > >>> > --
Re: [PULL] drm-misc-next
On Mon, Mar 5, 2018 at 12:10 AM, Daniel Vetter <dan...@ffwll.ch> wrote: > On Fri, Mar 02, 2018 at 04:22:15PM -0500, Sean Paul wrote: >> On Wed, Feb 28, 2018 at 3:34 PM, Sean Paul <seanp...@chromium.org> wrote: >> > >> > Hi Dave, >> > Here's this weeks pull, relatively small when you pull out the trivial >> > fixes. >> > >> > drm-misc-next-2018-02-28: >> > drm-misc-next for 4.17: >> > >> > UAPI Changes: >> > Fix drm_color_ctm matrix docs to match usage and change the type to >> > __u64 make it obvious (Ville) >> >> Hi Dave, >> Could you please hold off on pulling this? I'd like to sort out this >> change a bit more. We're already using the __s64 in chrome, and not >> explicitly sign-magnitude. I think it would be prudent to hash this >> out a little more. >> >> https://cs.chromium.org/chromium/src/ui/ozone/platform/drm/gpu/drm_device.cc?l=161 > > That code seems to be doing the exact same fun s.u63 math. This all looks > consistent to me. Hmm, yeah, I skimmed too quickly last week. > > Now in hindsight ofc we've screwed up the uapi, but well can't fix that > now again ... Yeah, I'm not convinced we should be changing the type. It's great to clarify the documentation to let userspace know it's sign-magnitude, but changing the type in-flight with users seems wrong. Sean > -Daniel > >> >> Sean >> >> > >> > Core Changes: >> > Check modifier with format when checking if a plane state is supported >> > (Ville) >> > >> > Driver Changes: >> > sun4i: Improve hw plane utilization (Maxime) >> > simple: Add per-pipe enable/disable vblank functions (Oleksandr) >> > virtio: Whitespace + checkpatch changes (Rodrigo) >> > >> > Cc: Maxime Ripard <maxime.rip...@bootlin.com> >> > Cc: Oleksandr Andrushchenko <oleksandr_andrushche...@epam.com> >> > Cc: Ville Syrjälä <ville.syrj...@linux.intel.com> >> > Cc: Rodrigo Siqueira <rodrigosiqueiram...@gmail.com> >> > >> > Cheers, Sean >> > >> > >> > The following changes since commit >> > 2b91e3c43b4f3d3cd4d84a31cfbe6b165d89b70e: >> > >> > drm/omapdrm: Use of_find_backlight helper (2018-02-20 11:07:22 -0500) >> > >> > are available in the Git repository at: >> > >> > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2018-02-28 >> > >> > for you to fetch changes up to 7628166d5e2883e4cdd142b99863d29d411a81b2: >> > >> > tinydrm: add backlight dependency (2018-02-28 15:08:56 -0500) >> > >> > >> > drm-misc-next for 4.17: >> > >> > UAPI Changes: >> > Fix drm_color_ctm matrix docs to match usage and change the type to >> > __u64 make it obvious (Ville) >> > >> > Core Changes: >> > Check modifier with format when checking if a plane state is supported >> > (Ville) >> > >> > Driver Changes: >> > sun4i: Improve hw plane utilization (Maxime) >> > simple: Add per-pipe enable/disable vblank functions (Oleksandr) >> > virtio: Whitespace + checkpatch changes (Rodrigo) >> > >> > Cc: Maxime Ripard <maxime.rip...@bootlin.com> >> > Cc: Oleksandr Andrushchenko <oleksandr_andrushche...@epam.com> >> > Cc: Ville Syrjälä <ville.syrj...@linux.intel.com> >> > Cc: Rodrigo Siqueira <rodrigosiqueiram...@gmail.com> >> > >> > >> > Arnd Bergmann (2): >> > drm: fix drm_get_max_iomem type mismatch >> > tinydrm: add backlight dependency >> > >> > Benjamin Gaignard (1): >> > drm/stm: check pitch and size calculations even if !CONFIG_MMU >> > >> > Chris Wilson (1): >> > drm/mm: Fix caching of leftmost node in the interval tree >> > >> > Linus Walleij (1): >> > drm/panel: Fix ARM Versatile panel clocks >> > >> > Maxime Ripard (4): >> > drm/sun4i: backend: Assign the pipes automatically >> > drm/sun4i: Remove the plane description structure >> > drm/sun4i: backend: Make zpos configurable >> > drm/sun4i: backend: Remove ARGB spoofing >> > >> > Oleksandr Andrushchenko (5): >> > drm/simple_kms_helper: Fix NULL pointer dereference with no active >> > CRTC >> > drm/sim
