]> Git Repo - linux.git/commitdiff
Merge tag 'drm-misc-next-2023-11-17' of git://anongit.freedesktop.org/drm/drm-misc...
authorDaniel Vetter <[email protected]>
Mon, 20 Nov 2023 08:50:08 +0000 (09:50 +0100)
committerDaniel Vetter <[email protected]>
Mon, 20 Nov 2023 08:50:09 +0000 (09:50 +0100)
drm-misc-next for 6.8:

UAPI Changes:
  - drm: Introduce CLOSE_FB ioctl
  - drm/dp-mst: Documentation for the PATH property
  - fdinfo: Do not align to a MB if the size is larger than 1MiB
  - virtio-gpu: add explicit virtgpu context debug name

Cross-subsystem Changes:
  - dma-buf: Add dma_fence_timestamp helper

Core Changes:
  - client: Do not acquire module reference
  - edid: split out drm_eld, add SAD helpers
  - format-helper: Cache format conversion buffers
  - sched: Move from a kthread to a workqueue, rename some internal
    functions to make it clearer, implement dynamic job-flow control
  - gpuvm: Provide more features to handle GEM objects
  - tests: Remove slow kunit tests

Driver Changes:
  - ivpu: Update FW API, new debugfs file, a new NOP job submission test
    mode, improve suspend/resume, PM improvements, MMU PT optimizations,
    firmware profiling frequency support, support for uncached buffers,
    switch to gem shmem helpers, replace kthread with threaded
    interrupts
  - panfrost: PM improvements
  - qaic: Allow to run with a single MSI, support host/device time
    synchronization, misc improvements
  - simplefb: Support memory-regions, support power-domains
  - ssd130x: Unitialized variable fixes
  - omapdrm: dma-fence lockdep annotation fix
  - tidss: dma-fence lockdep annotation fix
  - v3d: Support BCM2712 (RaspberryPi5), Support fdinfo and gputop
  - panel:
    - edp: Support AUO B116XTN02, BOE NT116WHM-N21,836X2, NV116WHM-N49
      V8.0, plus a whole bunch of panels used on Mediatek chromebooks.

Note that the one missing s-o-b for 0da611a87021 ("dma-buf: add
dma_fence_timestamp helper") has been supplied here, and rebasing the
entire tree with upsetting committers didn't seem worth the trouble:
https://lore.kernel.org/dri-devel/ce94020e-a7d4-4799-b87d-fbea7b14a268@gmail.com/

Signed-off-by: Daniel Vetter <[email protected]>
From: Maxime Ripard <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/y4awn5vcfy2lr2hpauo7rc4nfpnc6kksr7btmnwaz7zk63pwoi@gwwef5iqpzva
1  2 
MAINTAINERS
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

diff --combined MAINTAINERS
index ea790149af795155003eaacca87289e05d55454b,8a70be8f08eee182c8353c4c2fdaa806b03817a4..b9a54de830197627d73444d967ee83755072dd05
@@@ -6503,8 -6503,7 +6503,7 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    drivers/gpu/drm/sun4i/sun8i*
  
  DRM DRIVER FOR ARM PL111 CLCD
- M:    Emma Anholt <[email protected]>
- S:    Supported
+ S:    Orphan
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/pl111/
  
@@@ -6619,8 -6618,7 +6618,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/panel/panel-himax-hx8394.c
  
  DRM DRIVER FOR HX8357D PANELS
- M:    Emma Anholt <[email protected]>
- S:    Maintained
+ S:    Orphan
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/himax,hx8357d.txt
  F:    drivers/gpu/drm/tiny/hx8357d.c
@@@ -7213,8 -7211,8 +7211,8 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/omapdrm/
  
  DRM DRIVERS FOR V3D
- M:    Emma Anholt <[email protected]>
  M:    Melissa Wen <[email protected]>
+ M:    MaĆ­ra Canal <[email protected]>
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml
@@@ -7222,7 -7220,6 +7220,6 @@@ F:      drivers/gpu/drm/v3d
  F:    include/uapi/drm/v3d_drm.h
  
  DRM DRIVERS FOR VC4
- M:    Emma Anholt <[email protected]>
  M:    Maxime Ripard <[email protected]>
  S:    Supported
  T:    git git://github.com/anholt/linux
@@@ -8950,6 -8947,7 +8947,6 @@@ S:      Maintaine
  F:    scripts/get_maintainer.pl
  
  GFS2 FILE SYSTEM
 -M:    Bob Peterson <[email protected]>
  M:    Andreas Gruenbacher <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -21768,9 -21766,7 +21765,9 @@@ F:   Documentation/devicetree/bindings/co
  F:    drivers/counter/ti-eqep.c
  
  TI ETHERNET SWITCH DRIVER (CPSW)
 -R:    Grygorii Strashko <[email protected]>
 +R:    Siddharth Vadapalli <[email protected]>
 +R:    Ravi Gunasekaran <[email protected]>
 +R:    Roger Quadros <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -21794,15 -21790,6 +21791,15 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/ds90*
  F:    include/media/i2c/ds90*
  
 +TI ICSSG ETHERNET DRIVER (ICSSG)
 +R:    MD Danish Anwar <[email protected]>
 +R:    Roger Quadros <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/ti,icss*.yaml
 +F:    drivers/net/ethernet/ti/icssg/*
 +
  TI J721E CSI2RX DRIVER
  M:    Jai Luthra <[email protected]>
  L:    [email protected]
@@@ -23702,20 -23689,6 +23699,20 @@@ F: arch/x86/kernel/dumpstack.
  F:    arch/x86/kernel/stacktrace.c
  F:    arch/x86/kernel/unwind_*.c
  
 +X86 TRUST DOMAIN EXTENSIONS (TDX)
 +M:    Kirill A. Shutemov <[email protected]>
 +R:    Dave Hansen <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/tdx
 +F:    arch/x86/boot/compressed/tdx*
 +F:    arch/x86/coco/tdx/
 +F:    arch/x86/include/asm/shared/tdx.h
 +F:    arch/x86/include/asm/tdx.h
 +F:    arch/x86/virt/vmx/tdx/
 +F:    drivers/virt/coco/tdx-guest
 +
  X86 VDSO
  M:    Andy Lutomirski <[email protected]>
  L:    [email protected]
@@@ -23896,7 -23869,8 +23893,7 @@@ T:   git git://git.kernel.org/pub/scm/fs/
  P:    Documentation/filesystems/xfs-maintainer-entry-profile.rst
  F:    Documentation/ABI/testing/sysfs-fs-xfs
  F:    Documentation/admin-guide/xfs.rst
 -F:    Documentation/filesystems/xfs-delayed-logging-design.rst
 -F:    Documentation/filesystems/xfs-self-describing-metadata.rst
 +F:    Documentation/filesystems/xfs-*
  F:    fs/xfs/
  F:    include/uapi/linux/dqblk_xfs.h
  F:    include/uapi/linux/fsmap.h
index ee97814ebd994721f4cb161b0e3df40693086265,0cb934641cc8a9b491ea2db35897bdb7ced38263..1513a9c602ee16565be811185fc514cd9f811155
@@@ -87,6 -87,7 +87,7 @@@
  #include <drm/drm_blend.h>
  #include <drm/drm_fourcc.h>
  #include <drm/drm_edid.h>
+ #include <drm/drm_eld.h>
  #include <drm/drm_vblank.h>
  #include <drm/drm_audio_component.h>
  #include <drm/drm_gem_atomic_helper.h>
@@@ -2079,7 -2080,7 +2080,7 @@@ static int dm_dmub_sw_init(struct amdgp
        struct dmub_srv_create_params create_params;
        struct dmub_srv_region_params region_params;
        struct dmub_srv_region_info region_info;
 -      struct dmub_srv_fb_params fb_params;
 +      struct dmub_srv_memory_params memory_params;
        struct dmub_srv_fb_info *fb_info;
        struct dmub_srv *dmub_srv;
        const struct dmcub_firmware_header_v1_0 *hdr;
                adev->dm.dmub_fw->data +
                le32_to_cpu(hdr->header.ucode_array_offset_bytes) +
                PSP_HEADER_BYTES;
 +      region_params.is_mailbox_in_inbox = false;
  
        status = dmub_srv_calc_region_info(dmub_srv, &region_params,
                                           &region_info);
                return r;
  
        /* Rebase the regions on the framebuffer address. */
 -      memset(&fb_params, 0, sizeof(fb_params));
 -      fb_params.cpu_addr = adev->dm.dmub_bo_cpu_addr;
 -      fb_params.gpu_addr = adev->dm.dmub_bo_gpu_addr;
 -      fb_params.region_info = &region_info;
 +      memset(&memory_params, 0, sizeof(memory_params));
 +      memory_params.cpu_fb_addr = adev->dm.dmub_bo_cpu_addr;
 +      memory_params.gpu_fb_addr = adev->dm.dmub_bo_gpu_addr;
 +      memory_params.region_info = &region_info;
  
        adev->dm.dmub_fb_info =
                kzalloc(sizeof(*adev->dm.dmub_fb_info), GFP_KERNEL);
                return -ENOMEM;
        }
  
 -      status = dmub_srv_calc_fb_info(dmub_srv, &fb_params, fb_info);
 +      status = dmub_srv_calc_mem_info(dmub_srv, &memory_params, fb_info);
        if (status != DMUB_STATUS_OK) {
                DRM_ERROR("Error calculating DMUB FB info: %d\n", status);
                return -EINVAL;
@@@ -7482,9 -7482,6 +7483,9 @@@ static int amdgpu_dm_i2c_xfer(struct i2
        int i;
        int result = -EIO;
  
 +      if (!ddc_service->ddc_pin || !ddc_service->ddc_pin->hw_info.hw_supported)
 +              return result;
 +
        cmd.payloads = kcalloc(num, sizeof(struct i2c_payload), GFP_KERNEL);
  
        if (!cmd.payloads)
@@@ -9607,14 -9604,14 +9608,14 @@@ static bool should_reset_plane(struct d
        struct drm_plane *other;
        struct drm_plane_state *old_other_state, *new_other_state;
        struct drm_crtc_state *new_crtc_state;
 +      struct amdgpu_device *adev = drm_to_adev(plane->dev);
        int i;
  
        /*
 -       * TODO: Remove this hack once the checks below are sufficient
 -       * enough to determine when we need to reset all the planes on
 -       * the stream.
 +       * TODO: Remove this hack for all asics once it proves that the
 +       * fast updates works fine on DCN3.2+.
         */
 -      if (state->allow_modeset)
 +      if (adev->ip_versions[DCE_HWIP][0] < IP_VERSION(3, 2, 0) && state->allow_modeset)
                return true;
  
        /* Exit early if we know that we're adding or removing the plane. */
This page took 0.160971 seconds and 4 git commands to generate.