Re: [PULL] drm-misc-fixes
On Thu, Sep 9, 2021 at 5:35 AM Dave Airlie wrote: > > On Thu, 9 Sept 2021 at 03:44, Thomas Zimmermann wrote: > > > > Hi Dave and Daniel, > > > > here's this week's PR for drm-misc-fixes. One patch is a potential deadlock > > in TTM, the other enables an additional plane in kmb. I'm slightly unhappy > > that the latter one ended up in -fixes as it's not a bugfix AFAICT. > > To avoid messy merge window, I'm not pulling this until after rc1 > unless there is some major reason? Christian misplaced a ttm fix, so we really want this. Maybe cherry-pick to drm-next and then drm-misc-fixes gets rebased instead. And yeah I dunno what do with our conflicts around merge window, maybe we're letting trees diverge a bit too much. -Daniel > > the current drm-next doesn't have v5.14 in it, and the merge is rather > ugly right now. > > (maybe I should always pull it in before sending to Linus to avoid > this in future). > > Dave. -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
[PULL] drm-misc-next-fixes
drm-misc-next-fixes-2021-09-09: drm-misc-next-fixes for v5.15: - Make some dma-buf config options depend on DMA_SHARED_BUFFER. - Handle multiplication overflow of fbdev xres/yres in the core. The following changes since commit efcefc7127290e7e9fa98dea029163ad8eda8fb3: drm/ttm: Fix ttm_bo_move_memcpy() for subclassed struct ttm_resource (2021-08-31 10:48:26 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2021-09-09 for you to fetch changes up to 8c28051cdcbe9dfcec6bd0a4709d67a09df6edae: fbmem: don't allow too huge resolutions (2021-09-08 18:52:04 +0200) drm-misc-next-fixes for v5.15: - Make some dma-buf config options depend on DMA_SHARED_BUFFER. - Handle multiplication overflow of fbdev xres/yres in the core. Geert Uytterhoeven (3): dma-buf: DMABUF_MOVE_NOTIFY should depend on DMA_SHARED_BUFFER dma-buf: DMABUF_DEBUG should depend on DMA_SHARED_BUFFER dma-buf: DMABUF_SYSFS_STATS should depend on DMA_SHARED_BUFFER Tetsuo Handa (1): fbmem: don't allow too huge resolutions drivers/dma-buf/Kconfig | 4 +++- drivers/video/fbdev/core/fbmem.c | 6 ++ 2 files changed, 9 insertions(+), 1 deletion(-)