mbox series

[PULL] drm-misc-fixes

Message ID 20191002200604.gjae7xjtdaj3j3ga@gilmour (mailing list archive)
State New, archived
Headers show
Series [PULL] drm-misc-fixes | expand

Pull-request

git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2019-10-02

Message

Maxime Ripard Oct. 2, 2019, 8:06 p.m. UTC
Hi Dave, Daniel,

I hope that you enjoy XDC if you could make it this year :)

Here's the first round of fixes for drm-misc

Maxime

drm-misc-fixes-2019-10-02:
 - One include fix for tilcdc
 - A memory leak fix for Komeda
 - Some fixes for resources cleanups with writeback
The following changes since commit 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c:

  Linux 5.4-rc1 (2019-09-30 10:35:40 -0700)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2019-10-02

for you to fetch changes up to 6347ee48ab4b344ca5005e48c0e82189ef9a9614:

  Merge drm-misc-next-fixes-2019-10-02 into drm-misc-fixes (2019-10-02 21:48:02 +0200)

----------------------------------------------------------------
 - One include fix for tilcdc
 - A memory leak fix for Komeda
 - Some fixes for resources cleanups with writeback

----------------------------------------------------------------
Arnd Bergmann (1):
      drm/tilcdc: include linux/pinctrl/consumer.h again

Lowry Li (Arm Technology China) (2):
      drm: Free the writeback_job when it with an empty fb
      drm: Clear the fence pointer when writeback job signaled

Maxime Ripard (2):
      Merge drm/drm-fixes into drm-misc-fixes
      Merge drm-misc-next-fixes-2019-10-02 into drm-misc-fixes

Navid Emamdoost (1):
      drm/komeda: prevent memory leak in komeda_wb_connector_add

 .../drm/arm/display/komeda/komeda_wb_connector.c   |  7 ++++---
 drivers/gpu/drm/arm/malidp_mw.c                    |  4 ++--
 drivers/gpu/drm/drm_atomic.c                       | 13 ++++++++----
 drivers/gpu/drm/drm_writeback.c                    | 23 ++++++++++++++--------
 drivers/gpu/drm/rcar-du/rcar_du_writeback.c        |  4 ++--
 drivers/gpu/drm/tilcdc/tilcdc_tfp410.c             |  1 +
 drivers/gpu/drm/vc4/vc4_txp.c                      |  5 ++---
 7 files changed, 35 insertions(+), 22 deletions(-)

Comments

Maxime Ripard Oct. 3, 2019, 7:26 a.m. UTC | #1
Hi,

On Wed, Oct 02, 2019 at 10:06:04PM +0200, Maxime Ripard wrote:
> Hi Dave, Daniel,
>
> I hope that you enjoy XDC if you could make it this year :)
>
> Here's the first round of fixes for drm-misc
>
> Maxime
>
> drm-misc-fixes-2019-10-02:
>  - One include fix for tilcdc
>  - A memory leak fix for Komeda
>  - Some fixes for resources cleanups with writeback

So it turns out that while that tag was pushed, I forgot to push the
branch first, and now we have a conflict.

Let's drop this PR, I'll do another one.

Maxime
Daniel Vetter Oct. 7, 2019, 2:24 p.m. UTC | #2
On Thu, Oct 3, 2019 at 9:26 AM Maxime Ripard <mripard@kernel.org> wrote:
>
> Hi,
>
> On Wed, Oct 02, 2019 at 10:06:04PM +0200, Maxime Ripard wrote:
> > Hi Dave, Daniel,
> >
> > I hope that you enjoy XDC if you could make it this year :)
> >
> > Here's the first round of fixes for drm-misc
> >
> > Maxime
> >
> > drm-misc-fixes-2019-10-02:
> >  - One include fix for tilcdc
> >  - A memory leak fix for Komeda
> >  - Some fixes for resources cleanups with writeback
>
> So it turns out that while that tag was pushed, I forgot to push the
> branch first, and now we have a conflict.
>
> Let's drop this PR, I'll do another one.

Hm, does dim not check for that? Can I volunteer you for a patch?
-Daniel