Re: [PULL] drm-misc-next

[Thomas Zimmermann <tzimmermann@xxxxxxx>]

Hi

Am 10.06.21 um 15:32 schrieb Daniel Vetter:
> On Thu, Jun 10, 2021 at 1:15 PM Thomas Zimmermann <tzimmermann@xxxxxxx> wrote:
> > Hi Dave and Daniel,
> >
> > here's the second PR for drm-misc-next for this week, and the final one
> > for 5.14. I backmerged drm-next for the TTM changes. As for highlights
> > nouveau now has eDP backlight support and udmabuf supports huge pages.
>
> Why did you do this backmerge? It's done now so nothing to fix, but
> I'm not really seeing the reason - the backmerge is the last patch
> right before you've done the pull request.

From what I understood, there was a TTM change (coming from intel-gt) 
that created significant conflicts between trees. I backmerged to get 
these changes into drm-misc-next. If the drm-next side was outdated, 
people shouldn't have to make patches against it.

Best regards
Thomas

> -Daniel
>
> > Best regards
> > Thomas
> >
> > drm-misc-next-2021-06-10:
> > drm-misc-next for 5.14:
> >
> > UAPI Changes:
> >
> > Cross-subsystem Changes:
> >
> >   * dma-buf: Support huge pages in udmabuf
> >
> > Core Changes:
> >
> >   * Backmerge of drm/drm-next
> >
> >   * drm/dp: Import eDP backlight code from i915
> >
> > Driver Changes:
> >
> >   * drm/bridge: TI SN65DSI83: Fix sparse warnings
> >
> >   * drm/i915: Cleanup eDP backlight code before moving it into helper
> >
> >   * drm/nouveau: Support DPCD backlights; Fix GEM init for internal BOs
> > The following changes since commit c707b73f0cfb1acc94a20389aecde65e6385349b:
> >
> >    Merge tag 'amd-drm-next-5.14-2021-06-09' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-06-10 13:47:13 +1000)
> >
> > are available in the Git repository at:
> >
> >    git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2021-06-10
> >
> > for you to fetch changes up to 86441fa29e57940eeb00f35fefb1853c1fbe67bb:
> >
> >    Merge drm/drm-next into drm-misc-next (2021-06-10 12:18:54 +0200)
> >
> > ----------------------------------------------------------------
> > drm-misc-next for 5.14:
> >
> > UAPI Changes:
> >
> > Cross-subsystem Changes:
> >
> >   * dma-buf: Support huge pages in udmabuf
> >
> > Core Changes:
> >
> >   * Backmerge of drm/drm-next
> >
> >   * drm/dp: Import eDP backlight code from i915
> >
> > Driver Changes:
> >
> >   * drm/bridge: TI SN65DSI83: Fix sparse warnings
> >
> >   * drm/i915: Cleanup eDP backlight code before moving it into helper
> >
> >   * drm/nouveau: Support DPCD backlights; Fix GEM init for internal BOs
> >
> > ----------------------------------------------------------------
> > Christian König (1):
> >        drm/nouveau: init the base GEM fields for internal BOs
> >
> > Lyude Paul (9):
> >        drm/i915/dpcd_bl: Remove redundant AUX backlight frequency calculations
> >        drm/i915/dpcd_bl: Handle drm_dpcd_read/write() return values correctly
> >        drm/i915/dpcd_bl: Cleanup intel_dp_aux_vesa_enable_backlight() a bit
> >        drm/i915/dpcd_bl: Cache some backlight capabilities in intel_panel.backlight
> >        drm/i915/dpcd_bl: Move VESA backlight enabling code closer together
> >        drm/i915/dpcd_bl: Return early in vesa_calc_max_backlight if we can't read PWMGEN_BIT_COUNT
> >        drm/i915/dpcd_bl: Print return codes for VESA backlight failures
> >        drm/dp: Extract i915's eDP backlight code into DRM helpers
> >        drm/nouveau/kms/nv50-: Add basic DPCD backlight support for nouveau
> >
> > Marek Vasut (1):
> >        drm/bridge: ti-sn65dsi83: Fix sparse warnings
> >
> > Thomas Zimmermann (1):
> >        Merge drm/drm-next into drm-misc-next
> >
> > Vivek Kasireddy (1):
> >        udmabuf: Add support for mapping hugepages (v4)
> >
> >   drivers/dma-buf/udmabuf.c                          |  50 ++-
> >   drivers/gpu/drm/bridge/ti-sn65dsi83.c              |  21 +-
> >   drivers/gpu/drm/drm_dp_helper.c                    | 347 +++++++++++++++++++++
> >   drivers/gpu/drm/i915/display/intel_display_types.h |   2 +-
> >   .../gpu/drm/i915/display/intel_dp_aux_backlight.c  | 329 +++----------------
> >   drivers/gpu/drm/nouveau/dispnv50/disp.c            |  28 ++
> >   drivers/gpu/drm/nouveau/nouveau_backlight.c        | 166 +++++++++-
> >   drivers/gpu/drm/nouveau/nouveau_bo.c               |   6 +
> >   drivers/gpu/drm/nouveau/nouveau_connector.h        |   9 +-
> >   drivers/gpu/drm/nouveau/nouveau_encoder.h          |   1 +
> >   include/drm/drm_dp_helper.h                        |  48 +++
> >   11 files changed, 682 insertions(+), 325 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

--
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

Attachment: OpenPGP_signature
Description: OpenPGP digital signature

_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx