1. 21 May, 2021 31 commits
  2. 20 May, 2021 9 commits
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2021-05-19-1' of... · 2ba04785
      Dave Airlie authored
      Merge tag 'drm-intel-next-2021-05-19-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
      
      Core Changes:
      
      - drm: Rename DP_PSR_SELECTIVE_UPDATE to better mach eDP spec (Jose).
      
      Driver Changes:
      
      - Display plane clock rates fixes and improvements (Ville).
      - Uninint DMC FW loader state during shutdown (Imre).
      - Convert snprintf to sysfs_emit (Xuezhi).
      - Fix invalid access to ACPI _DSM objects (Takashi).
      - A big refactor around how i915 addresses the graphics
        and display IP versions. (Matt, Lucas).
      - Backlight fix (Lyude).
      - Display watermark and DBUF fixes (Ville).
      - HDCP fix (Anshuman).
      - Improve cases where display is not available (Jose).
      - Defeature PSR2 for RKL and ALD-S (Jose).
      - VLV DSI panel power fixes and improvements (Hans).
      - display-12 workaround (Jose).
      - Fix modesetting (Imre).
      - Drop redundant address-of op before lttpr_common_caps array (Imre).
      - Fix compiler checks (Jose, Jason).
      - GLK display fixes (Ville).
      - Fix error code returns (Dan).
      - eDP novel: back again to slow and wide link training everywhere (Kai-Heng).
      - Abstract DMC FW path (Rodrigo).
      - Preparation and changes for upcoming
        XeLPD display IP (Jose, Matt, Ville, Juha-Pekka, Animesh).
      - Fix comment typo in DSI code (zuoqilin).
      - Simplify CCS and UV plane alignment handling (Imre).
      - PSR Fixes on TGL (Gwan-gyeong, Jose).
      - Add intel_dp_hdcp.h and rename init (Jani).
      - Move crtc and dpll declarations around (Jani).
      - Fix pre-skl DP AUX precharge length (Ville).
      - Remove stray newlines from random files (Ville).
      - crtc->index and intel_crtc+drm_crtc pointer clean-up (Ville).
      - Add frontbuffer tracking tracepoints (Ville).
      - ADL-S PCI ID updates (Anand).
      - Use unique backlight device names (Jani).
      - A few clean-ups on i915/audio (Jani).
      - Use intel_framebuffer instead of drm one on intel_fb functions (Imre).
      - Add the missing MC CCS/XYUV8888 format support on display >= 12 (Imre).
      - Nuke display error state (Ville).
      - ADL-P initial enablement patches
        starting to land (Clint, Imre, Jose, Umesh, Vandita, Mika).
      - Display clean-up around VBT and the strap bits (Lucas).
      - Try YCbCr420 color when RGB fails (Werner).
      - More PSR fixes and improvements (Jose).
      - Other generic display code clean-up (Jose, Ville).
      - Use correct downstream caps for check Src-Ctl mode for PCON (Ankit).
      - Disable HiZ Raw Stall Optimization on broken gen7 (Simon).
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      
      From: Rodrigo Vivi <rodrigo.vivi@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/YKVioeu0JkUAlR7y@intel.com
      2ba04785
    • Dave Airlie's avatar
      Merge tag 'drm-misc-next-2021-05-17' of git://anongit.freedesktop.org/drm/drm-misc into drm-next · ae25ec2f
      Dave Airlie authored
      drm-misc-next for 5.14:
      
      UAPI Changes:
      
      Cross-subsystem Changes:
      
      Core Changes:
      
       * aperture: Fix unlocking on errors
      
       * legacy: Fix some doc comments
      
      Driver Changes:
      
       * drm/amdgpu: Free resource on fence usage query; Fix fence calculation;
      
       * drm/bridge: Lt9611: Add missing MODULE_DEVICE_TABLE
      
       * drm/i915: Print formats with %p4cc
      
       * drm/ingenic: IPU planes are now always of type OVERLAY
      
       * drm/nouveau: Remove left-over reference to struct drm_device.pdev
      
       * drm/panfrost: Disable devfreq if num_supplies > 1; Add Mediatek MT8183 +
         DT bindings; Cleanups
      
       * drm/simpledrm: Print resources with %pr; Fix use-after-free errors;
         Fix NULL deref; Fix MAINTAINERS entry
      
       * drm/vmwgfx: Fix memory allocation and leak in FIFO allocation; Fix
         return value in PCI resource setup
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      
      From: Thomas Zimmermann <tzimmermann@suse.de>
      Link: https://patchwork.freedesktop.org/patch/msgid/YKJs2IfwSYvuGPU7@linux-uq9g.fritz.box
      ae25ec2f
    • Christian König's avatar
      drm/amdgpu: stop touching sched.ready in the backend · 81db370c
      Christian König authored
      This unfortunately comes up in regular intervals and breaks
      GPU reset for the engine in question.
      
      The sched.ready flag controls if an engine can't get working
      during hw_init, but should never be set to false during hw_fini.
      
      v2: squash in unused variable fix (Alex)
      Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      81db370c
    • Lang Yu's avatar
      drm/amd/amdgpu: fix a potential deadlock in gpu reset · 6e8bcdd6
      Lang Yu authored
      When amdgpu_ib_ring_tests failed, the reset logic called
      amdgpu_device_ip_suspend twice, then deadlock occurred.
      Deadlock log:
      
      [  805.655192] amdgpu 0000:04:00.0: amdgpu: ib ring test failed (-110).
      [  806.290952] [drm] free PSP TMR buffer
      
      [  806.319406] ============================================
      [  806.320315] WARNING: possible recursive locking detected
      [  806.321225] 5.11.0-custom #1 Tainted: G        W  OEL
      [  806.322135] --------------------------------------------
      [  806.323043] cat/2593 is trying to acquire lock:
      [  806.323825] ffff888136b1cdc8 (&adev->dm.dc_lock){+.+.}-{3:3}, at: dm_suspend+0xb8/0x1d0 [amdgpu]
      [  806.325668]
                     but task is already holding lock:
      [  806.326664] ffff888136b1cdc8 (&adev->dm.dc_lock){+.+.}-{3:3}, at: dm_suspend+0xb8/0x1d0 [amdgpu]
      [  806.328430]
                     other info that might help us debug this:
      [  806.329539]  Possible unsafe locking scenario:
      
      [  806.330549]        CPU0
      [  806.330983]        ----
      [  806.331416]   lock(&adev->dm.dc_lock);
      [  806.332086]   lock(&adev->dm.dc_lock);
      [  806.332738]
                      *** DEADLOCK ***
      
      [  806.333747]  May be due to missing lock nesting notation
      
      [  806.334899] 3 locks held by cat/2593:
      [  806.335537]  #0: ffff888100d3f1b8 (&attr->mutex){+.+.}-{3:3}, at: simple_attr_read+0x4e/0x110
      [  806.337009]  #1: ffff888136b1fd78 (&adev->reset_sem){++++}-{3:3}, at: amdgpu_device_lock_adev+0x42/0x94 [amdgpu]
      [  806.339018]  #2: ffff888136b1cdc8 (&adev->dm.dc_lock){+.+.}-{3:3}, at: dm_suspend+0xb8/0x1d0 [amdgpu]
      [  806.340869]
                     stack backtrace:
      [  806.341621] CPU: 6 PID: 2593 Comm: cat Tainted: G        W  OEL    5.11.0-custom #1
      [  806.342921] Hardware name: AMD Celadon-CZN/Celadon-CZN, BIOS WLD0C23N_Weekly_20_12_2 12/23/2020
      [  806.344413] Call Trace:
      [  806.344849]  dump_stack+0x93/0xbd
      [  806.345435]  __lock_acquire.cold+0x18a/0x2cf
      [  806.346179]  lock_acquire+0xca/0x390
      [  806.346807]  ? dm_suspend+0xb8/0x1d0 [amdgpu]
      [  806.347813]  __mutex_lock+0x9b/0x930
      [  806.348454]  ? dm_suspend+0xb8/0x1d0 [amdgpu]
      [  806.349434]  ? amdgpu_device_indirect_rreg+0x58/0x70 [amdgpu]
      [  806.350581]  ? _raw_spin_unlock_irqrestore+0x47/0x50
      [  806.351437]  ? dm_suspend+0xb8/0x1d0 [amdgpu]
      [  806.352437]  ? rcu_read_lock_sched_held+0x4f/0x80
      [  806.353252]  ? rcu_read_lock_sched_held+0x4f/0x80
      [  806.354064]  mutex_lock_nested+0x1b/0x20
      [  806.354747]  ? mutex_lock_nested+0x1b/0x20
      [  806.355457]  dm_suspend+0xb8/0x1d0 [amdgpu]
      [  806.356427]  ? soc15_common_set_clockgating_state+0x17d/0x19 [amdgpu]
      [  806.357736]  amdgpu_device_ip_suspend_phase1+0x78/0xd0 [amdgpu]
      [  806.360394]  amdgpu_device_ip_suspend+0x21/0x70 [amdgpu]
      [  806.362926]  amdgpu_device_pre_asic_reset+0xb3/0x270 [amdgpu]
      [  806.365560]  amdgpu_device_gpu_recover.cold+0x679/0x8eb [amdgpu]
      Signed-off-by: default avatarLang Yu <Lang.Yu@amd.com>
      Acked-by: default avatarChristian KÃnig <christian.koenig@amd.com>
      Reviewed-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      6e8bcdd6
    • Aaron Liu's avatar
      drm/amdgpu: modify system reference clock source for navi+ (V2) · 9a530062
      Aaron Liu authored
      Starting from Navi+, the rlc reference clock is used for system clock
      from vbios gfx_info table. It is incorrect to use core_refclk_10khz of
      vbios smu_info table as system clock.
      Signed-off-by: default avatarAaron Liu <aaron.liu@amd.com>
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Acked-by: default avatarHuang Rui <ray.huang@amd.com>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      9a530062
    • Guchun Chen's avatar
      drm/amdgpu: update sdma golden setting for Navi12 · 87476d12
      Guchun Chen authored
      Current golden setting is out of date.
      Signed-off-by: default avatarGuchun Chen <guchun.chen@amd.com>
      Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      87476d12
    • Guchun Chen's avatar
      drm/amdgpu: update gc golden setting for Navi12 · 6c65d867
      Guchun Chen authored
      Current golden setting is out of date.
      Signed-off-by: default avatarGuchun Chen <guchun.chen@amd.com>
      Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      6c65d867
    • xinhui pan's avatar
      drm/amdgpu: Fix a use-after-free · a8e56b80
      xinhui pan authored
      looks like we forget to set ttm->sg to NULL.
      Hit panic below
      
      [ 1235.844104] general protection fault, probably for non-canonical address 0x6b6b6b6b6b6b7b4b: 0000 [#1] SMP DEBUG_PAGEALLOC NOPTI
      [ 1235.989074] Call Trace:
      [ 1235.991751]  sg_free_table+0x17/0x20
      [ 1235.995667]  amdgpu_ttm_backend_unbind.cold+0x4d/0xf7 [amdgpu]
      [ 1236.002288]  amdgpu_ttm_backend_destroy+0x29/0x130 [amdgpu]
      [ 1236.008464]  ttm_tt_destroy+0x1e/0x30 [ttm]
      [ 1236.013066]  ttm_bo_cleanup_memtype_use+0x51/0xa0 [ttm]
      [ 1236.018783]  ttm_bo_release+0x262/0xa50 [ttm]
      [ 1236.023547]  ttm_bo_put+0x82/0xd0 [ttm]
      [ 1236.027766]  amdgpu_bo_unref+0x26/0x50 [amdgpu]
      [ 1236.032809]  amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu+0x7aa/0xd90 [amdgpu]
      [ 1236.040400]  kfd_ioctl_alloc_memory_of_gpu+0xe2/0x330 [amdgpu]
      [ 1236.046912]  kfd_ioctl+0x463/0x690 [amdgpu]
      Signed-off-by: default avatarxinhui pan <xinhui.pan@amd.com>
      Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      a8e56b80
    • Alex Deucher's avatar
      drm/amdgpu/display: restore the backlight on modeset (v2) · 7230362c
      Alex Deucher authored
      To stay consistent with the user's setting.
      
      v2: rebase on multi-eDP support
      
      Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1337Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      7230362c