Hi Dave and Daniel,
here's this week's PR for drm-misc-fixes. One patch is a potential deadlock in TTM, the other enables an additional plane in kmb. I'm slightly unhappy that the latter one ended up in -fixes as it's not a bugfix AFAICT.
Best regards Thomas
drm-misc-fixes-2021-09-08: Short summary of fixes pull:
* kmb: Emable second plane * ttm: Fix potential deadlock during swap
The following changes since commit fa0b1ef5f7a694f48e00804a391245f3471aa155:
drm: Copy drm_wait_vblank to user before returning (2021-08-17 13:56:03 -0400)
are available in the Git repository at:
git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2021-09-08
for you to fetch changes up to c8704b7ec182f9293e6a994310c7d4203428cdfb:
drm/kmb: Enable alpha blended second plane (2021-09-07 10:10:30 -0700)
---------------------------------------------------------------- Short summary of fixes pull:
* kmb: Emable second plane * ttm: Fix potential deadlock during swap
---------------------------------------------------------------- Edmund Dea (1): drm/kmb: Enable alpha blended second plane
xinhui pan (1): drm/ttm: Fix a deadlock if the target BO is not idle during swap
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/ttm/ttm_bo.c | 6 +-- 6 files changed, 90 insertions(+), 18 deletions(-)
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
On Thu, 9 Sept 2021 at 03:44, Thomas Zimmermann tzimmermann@suse.de wrote:
To avoid messy merge window, I'm not pulling this until after rc1 unless there is some major reason?
the current drm-next doesn't have v5.14 in it, and the merge is rather ugly right now.
(maybe I should always pull it in before sending to Linus to avoid this in future).
Dave.
On Thu, Sep 9, 2021 at 5:35 AM Dave Airlie airlied@gmail.com wrote:
Christian misplaced a ttm fix, so we really want this. Maybe cherry-pick to drm-next and then drm-misc-fixes gets rebased instead.
And yeah I dunno what do with our conflicts around merge window, maybe we're letting trees diverge a bit too much. -Daniel
On Thu, 9 Sept 2021 at 19:30, Daniel Vetter daniel.vetter@ffwll.ch wrote:
I've cherry-pick the ttm fix, the kmb fix should be somewhere else, I'm not going to pull it in from there.
Maybe once rc1 gets out it can be rebased. Please nobody push to drm-misc-fixes until post rc1 + a day or two.
Dave.
dri-devel@lists.freedesktop.org