Re: [PULL] drm-intel-fixes
On Thu, Sep 30, 2021 at 11:50:20AM +0300, Jani Nikula wrote: > > Hi Dave & Daniel - > > drm-intel-fixes-2021-09-30: > drm/i915 fixes for v5.15-rc4: > - Fix GVT scheduler ww lock usage > - Fix pdfdocs documentation build > - Fix request early tracepoints > - Fix an invalid warning from rps worker > > BR, > Jani. > > The following changes since commit 5816b3e6577eaa676ceb00a848f0fd65fe2adc29: > > Linux 5.15-rc3 (2021-09-26 14:08:19 -0700) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2021-09-30 > > for you to fetch changes up to 4b8bcaf8a6d6ab5db51e30865def5cb694eb2966: > > drm/i915: Remove warning from the rps worker (2021-09-27 12:46:40 +0300) Merged into drm-fixes, apologies for being a bit late, I was held up in a drm-misc-fixes chaos. -Daniel > > > drm/i915 fixes for v5.15-rc4: > - Fix GVT scheduler ww lock usage > - Fix pdfdocs documentation build > - Fix request early tracepoints > - Fix an invalid warning from rps worker > > > Akira Yokosawa (1): > drm/i915/guc, docs: Fix pdfdocs build error by removing nested grid > > Jani Nikula (1): > Merge tag 'gvt-fixes-2021-09-18' of https://github.com/intel/gvt-linux > into drm-intel-fixes > > Matthew Auld (1): > drm/i915/request: fix early tracepoints > > Tejas Upadhyay (1): > drm/i915: Remove warning from the rps worker > > Zhi A Wang (1): > drm/i915/gvt: fix the usage of ww lock in gvt scheduler. > > drivers/gpu/drm/i915/gt/intel_rps.c | 2 -- > drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h | 10 +- > drivers/gpu/drm/i915/gt/uc/abi/guc_communication_mmio_abi.h | 10 +- > drivers/gpu/drm/i915/gvt/scheduler.c| 4 ++-- > drivers/gpu/drm/i915/i915_request.c | 11 ++- > 5 files changed, 14 insertions(+), 23 deletions(-) > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PULL] drm-misc-fixes
On Fri, Oct 01, 2021 at 11:50:52AM +0200, Daniel Vetter wrote: > On Thu, Sep 30, 2021 at 12:06:21PM +0200, Maarten Lankhorst wrote: > > drm-misc-fixes-2021-09-30: > > drm-misc-fixes for v5.15: > > - Not sure if drm-misc-fixes-2021-09-08 tag was pulled, assuming it is. > > - Power management fixes for vc4. > > - Compiler fix for vc4. > > - Cursor fix for nouveau. > > - Fix ttm buffer moves for ampere gpu's by adding minimal acceleration > > support. > > - Small rockchip fixes. > > - Fix DT bindings indent for ili9341. > > - Fix y030xx067a init sequence to not get a yellow tint. > > - Kconfig fix for fb_simple vs simpledrm. > > The following changes since commit 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f: > > > > Linux 5.15-rc1 (2021-09-12 16:28:37 -0700) > > > > are available in the Git repository at: > > > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2021-09-30 > > > > for you to fetch changes up to fd09961dbb9ca6558d8ad318a3967c1048bdb090: > > > > fbdev: simplefb: fix Kconfig dependencies (2021-09-29 09:26:58 +0200) > > > > > > drm-misc-fixes for v5.15: > > - Not sure if drm-misc-fixes-2021-09-08 tag was pulled, assuming it is. Dave said he won't pull it and just cherry-picked the ttm fix, and asked for a rebase of the remaining bits. > > - Power management fixes for vc4. > > - Compiler fix for vc4. > > - Cursor fix for nouveau. > > - Fix ttm buffer moves for ampere gpu's by adding minimal acceleration > > support. > > - Small rockchip fixes. > > - Fix DT bindings indent for ili9341. > > - Fix y030xx067a init sequence to not get a yellow tint. > > - Kconfig fix for fb_simple vs simpledrm. > > I can't pull this, because it conflicts with vc4 reverts in -rc2. There's > a completely busted merge resolution in drm-tip, which doesn't even > compile. > > Please > - drop all vc4 patches > - rebase onto -rc3 or -rc4 if it's too late > > I'll do the pull to Linus this afternoon, would be good to get the other > fixes in. I didn't see anything, so I guess it's going to be rebase onto -rc4 next week. Please don't fumble this for another week, the kmb fix is almost a month old by now because it keeps falling through cracks. drm-misc is supposed to be worry-free, not "where is my drm-misc-fixes" pull request land ... -Daniel > -Daniel > > > > > > > Arnd Bergmann (1): > > fbdev: simplefb: fix Kconfig dependencies > > > > Ben Skeggs (3): > > drm/nouveau/kms/tu102-: delay enabling cursor until after > > assign_windows > > drm/nouveau/ga102-: support ttm buffer moves via copy engine > > drm/nouveau/fifo/ga102: initialise chid on return from channel > > creation > > > > Chris Morgan (1): > > drm/rockchip: Update crtc fixup to account for fractional clk change > > > > Christophe Branchereau (1): > > drm/panel: abt-y030xx067a: yellow tint fix > > > > Edmund Dea (1): > > drm/kmb: Enable alpha blended second plane > > > > Jernej Skrabec (1): > > drm/sun4i: dw-hdmi: Fix HDMI PHY clock setup > > > > Krzysztof Kozlowski (1): > > dt-bindings: panel: ili9341: correct indentation > > > > Maarten Lankhorst (1): > > Merge drm/drm-fixes into drm-misc-fixes > > > > Maxime Ripard (7): > > drm/vc4: select PM > > drm/vc4: hdmi: Make sure the controller is powered up during bind > > drm/vc4: hdmi: Rework the pre_crtc_configure error handling > > drm/vc4: hdmi: Split the CEC disable / enable functions in two > > drm/vc4: hdmi: Make sure the device is powered with CEC > > drm/vc4: hdmi: Warn if we access the controller while disabled > > drm/vc4: hdmi: Remove unused struct > > > > Palmer Dabbelt (1): > > drm/rockchip: cdn-dp-core: Fix cdn_dp_resume unused warning > > > > xinhui pan (1): > > drm/ttm: Fix a deadlock if the target BO is not idle during swap > > > > .../bindings/display/panel/ilitek,ili9341.yaml | 2 +- > > drivers/gpu/drm/kmb/kmb_drv.c | 8 +- > > drivers/gpu/drm/kmb/kmb_drv.h | 5 + > > drivers/gpu/drm/kmb/kmb_plane.c| 81 +- > > drivers/gpu/drm/kmb/kmb_plane.h| 5 +- > > drivers/gpu/drm/kmb/kmb_regs.h | 3 + > > drivers/gpu/drm/nouveau/dispnv50/head.c| 2 +- > > drivers/gpu/drm/nouveau/include/nvif/class.h | 2 + > > drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 1 + > > drivers/gpu/drm/nouveau/nouveau_bo.c | 1 + > > drivers/gpu/drm/nouveau/nouveau_chan.c | 6 +- > > drivers/gpu/drm/nouveau/nouveau_drm.c | 4 + > > drivers/gpu/drm/nouveau/nv84_fence.c | 2 +- > > drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 3 + > > drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild| 1 + > >
Re: [PULL] drm-misc-fixes
On Thu, Sep 30, 2021 at 12:06:21PM +0200, Maarten Lankhorst wrote: > drm-misc-fixes-2021-09-30: > drm-misc-fixes for v5.15: > - Not sure if drm-misc-fixes-2021-09-08 tag was pulled, assuming it is. > - Power management fixes for vc4. > - Compiler fix for vc4. > - Cursor fix for nouveau. > - Fix ttm buffer moves for ampere gpu's by adding minimal acceleration > support. > - Small rockchip fixes. > - Fix DT bindings indent for ili9341. > - Fix y030xx067a init sequence to not get a yellow tint. > - Kconfig fix for fb_simple vs simpledrm. > The following changes since commit 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f: > > Linux 5.15-rc1 (2021-09-12 16:28:37 -0700) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2021-09-30 > > for you to fetch changes up to fd09961dbb9ca6558d8ad318a3967c1048bdb090: > > fbdev: simplefb: fix Kconfig dependencies (2021-09-29 09:26:58 +0200) > > > drm-misc-fixes for v5.15: > - Not sure if drm-misc-fixes-2021-09-08 tag was pulled, assuming it is. > - Power management fixes for vc4. > - Compiler fix for vc4. > - Cursor fix for nouveau. > - Fix ttm buffer moves for ampere gpu's by adding minimal acceleration > support. > - Small rockchip fixes. > - Fix DT bindings indent for ili9341. > - Fix y030xx067a init sequence to not get a yellow tint. > - Kconfig fix for fb_simple vs simpledrm. I can't pull this, because it conflicts with vc4 reverts in -rc2. There's a completely busted merge resolution in drm-tip, which doesn't even compile. Please - drop all vc4 patches - rebase onto -rc3 or -rc4 if it's too late I'll do the pull to Linus this afternoon, would be good to get the other fixes in. -Daniel > > > Arnd Bergmann (1): > fbdev: simplefb: fix Kconfig dependencies > > Ben Skeggs (3): > drm/nouveau/kms/tu102-: delay enabling cursor until after assign_windows > drm/nouveau/ga102-: support ttm buffer moves via copy engine > drm/nouveau/fifo/ga102: initialise chid on return from channel creation > > Chris Morgan (1): > drm/rockchip: Update crtc fixup to account for fractional clk change > > Christophe Branchereau (1): > drm/panel: abt-y030xx067a: yellow tint fix > > Edmund Dea (1): > drm/kmb: Enable alpha blended second plane > > Jernej Skrabec (1): > drm/sun4i: dw-hdmi: Fix HDMI PHY clock setup > > Krzysztof Kozlowski (1): > dt-bindings: panel: ili9341: correct indentation > > Maarten Lankhorst (1): > Merge drm/drm-fixes into drm-misc-fixes > > Maxime Ripard (7): > drm/vc4: select PM > drm/vc4: hdmi: Make sure the controller is powered up during bind > drm/vc4: hdmi: Rework the pre_crtc_configure error handling > drm/vc4: hdmi: Split the CEC disable / enable functions in two > drm/vc4: hdmi: Make sure the device is powered with CEC > drm/vc4: hdmi: Warn if we access the controller while disabled > drm/vc4: hdmi: Remove unused struct > > Palmer Dabbelt (1): > drm/rockchip: cdn-dp-core: Fix cdn_dp_resume unused warning > > xinhui pan (1): > drm/ttm: Fix a deadlock if the target BO is not idle during swap > > .../bindings/display/panel/ilitek,ili9341.yaml | 2 +- > drivers/gpu/drm/kmb/kmb_drv.c | 8 +- > drivers/gpu/drm/kmb/kmb_drv.h | 5 + > drivers/gpu/drm/kmb/kmb_plane.c| 81 +- > drivers/gpu/drm/kmb/kmb_plane.h| 5 +- > drivers/gpu/drm/kmb/kmb_regs.h | 3 + > drivers/gpu/drm/nouveau/dispnv50/head.c| 2 +- > drivers/gpu/drm/nouveau/include/nvif/class.h | 2 + > drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 1 + > drivers/gpu/drm/nouveau/nouveau_bo.c | 1 + > drivers/gpu/drm/nouveau/nouveau_chan.c | 6 +- > drivers/gpu/drm/nouveau/nouveau_drm.c | 4 + > drivers/gpu/drm/nouveau/nv84_fence.c | 2 +- > drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 3 + > drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild| 1 + > drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga102.c | 311 > + > drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c| 7 +- > drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 4 +- > drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c| 26 +- > drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 7 +- > drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 4 +- > drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 97 --- > drivers/gpu/drm/vc4/Kconfig| 1 + > drivers/gpu/drm/vc4/vc4_hdmi.c | 133 + > drivers/gpu/drm/vc4/vc4_hdmi_regs.h| 6 + > drivers/of/base.c
