Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp4348007rdb; Thu, 14 Sep 2023 22:02:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHkdXDxtsvg/MGvDfrBK6w61RUPZ6g69+GnN1qHg/Ajx8AuaavdvD81BNJXq5qYasc53rKh X-Received: by 2002:a17:90a:648b:b0:274:5bd1:927d with SMTP id h11-20020a17090a648b00b002745bd1927dmr494856pjj.38.1694754171217; Thu, 14 Sep 2023 22:02:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694754171; cv=none; d=google.com; s=arc-20160816; b=FUw2jFUwyJcB0VbPgQo6sCrjR0Lh6q6GBxcsuK4StCBuYCs19DWwsciW1QK4MvCRN2 lLIEHHixsMIVLfTPKm0u3w5itCLx5vh+p2AtD8D1FhQTtNDzueleeFm13rSVpgxgvqoO sz5cf1zhzQvYLvfxC5Zr2Y0B95CwY6qeNvEmTNLcagbq2VXerJutvkGTvE490mwo3NSQ TMWAjjdNG1teWhVcTCR5wgCKKVjOSiBzPPKkBCEZiC46uWF5dYMnvto50CtbrRpA6kF1 Ky49LXezk15kfY+AUfRX9X9feVYQsA3t07pZkbWoSiJu1A7YN5R8r6mGDyYftldYK+ya hTnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:mime-version:dkim-signature; bh=Q/d7yn2DC4L0fegrQpHp27LXsp/VCS7XWImBV1S1DnI=; fh=vkDv7EUSPCkuZpo4m5Hjgf+3wnv0DMsfRBmsN0DPoPY=; b=x04K1dE/oG8VlpDtWWOI3+WTx4rsBi5hTgKHVjT1URhN8o5eGZBmzlWlM94Stuo5sm +AIiZJzfeIlE9MxbIqhh6MP/auen5AmMef55qcHixn5TFsmIH8pazuwsbs6TbeZnZ/hv uOH4zVF7qKOsu7kEYrc1LcN45dCz53WZorirQO4FdFqL1fQ97U0ZJytcAWqIfdqD+qpD Ti/85m+8vpdpUB7Oze86i90ExYSoh5C9lV9F8dc4l6o3nTggAGPKjbSoDlyGFv1fUdke z5fCdu9oVgLuAAe6io5RMDdvbO9a4uf+ElJCW/0H/OOzubkYTpyQy+Fl5jZgKx54Qzoc EvLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="JMI/vszB"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id y15-20020a17090a784f00b002639394cfcdsi2814532pjl.145.2023.09.14.22.02.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 22:02:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="JMI/vszB"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 470CE82B70BA; Thu, 14 Sep 2023 19:58:11 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231485AbjIOC6J (ORCPT + 99 others); Thu, 14 Sep 2023 22:58:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229548AbjIOC6I (ORCPT ); Thu, 14 Sep 2023 22:58:08 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86D2126B7 for ; Thu, 14 Sep 2023 19:58:03 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2bcb0b973a5so25852201fa.3 for ; Thu, 14 Sep 2023 19:58:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694746682; x=1695351482; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Q/d7yn2DC4L0fegrQpHp27LXsp/VCS7XWImBV1S1DnI=; b=JMI/vszB6I7rGAJjNr0RqMM3tCktwvT1Vf+nVbF7gNFOB2fRQ9xQaYE2836GrIukFf JrjwkYsSYtKlhYfGMepuWBoatZhYs0fJ4mrAPfNA6KHOKrza9wd9Mypa5sKMCyMTKJpM d+Sm0xVh304m+/MtyjT37nArz35BHjo4dXRa/1x/U+ofoAHQpNXC+cDlaC8ueyH1prBB qG1YjvJZQcvGQpOZUccaF1CWD8moHqskbPDpbUkKJbzx5ptpVUMPDUxkEe/3FrOdd9JC ImkvZgWEyxf1fFJbJeuKwipxW5adzT0vr8l0YNenHXtPzFLGDeg26Meef772l7Rd5vKZ vSRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694746682; x=1695351482; h=content-transfer-encoding:cc:to:subject:message-id:date:from :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Q/d7yn2DC4L0fegrQpHp27LXsp/VCS7XWImBV1S1DnI=; b=qtJ8bWXvMRQWGeyRFJXAQTEQhTgcLf3xKcus9BciIqUmoMnFeCXrerZpcbTGp68DKO wek5TjLb+hlgNREGdeBEbcGyVjzIybtqnEnZkdnUuuqsqavEOfGZ4YhYKDEHlVUWj7aI IZtxu7idj4HVRTv88B3XprCGfrFI5HnIv/QOCaJ6NYyflR69FM9qBSOCLo7TpbmlsyYb bBSvY4C6BfVCn+8WIat37/Y/PeX5iZtcua1BwWUnCVyiC5GZjireTDRaaZo0RsD8HXdc ug66jUsDPhzSJnD1gKuswgc334w4PWmdRJ6ZywQYF1xsDtlY1iHh46kNl/Jc5gb1NIq2 u8pw== X-Gm-Message-State: AOJu0YwaoayYxjpuDjQjz2PSMMlCYJAaFTj60syAApLOVlowofA12P5L K9bn29zwiq6IBwQ33oiKxv7yVo1HyzN6X23dNpkuLGYAOzWe4w== X-Received: by 2002:a05:651c:149:b0:2b9:c4f6:fdd with SMTP id c9-20020a05651c014900b002b9c4f60fddmr475618ljd.14.1694746681316; Thu, 14 Sep 2023 19:58:01 -0700 (PDT) MIME-Version: 1.0 From: Dave Airlie Date: Fri, 15 Sep 2023 12:57:50 +1000 Message-ID: Subject: [git pull] drm fixes for 6.6-rc2 To: Linus Torvalds , Daniel Vetter Cc: dri-devel , LKML Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 14 Sep 2023 19:58:11 -0700 (PDT) X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Hey Linus, Regular rc2 fixes pull, mostly made up of amdgpu stuff, one i915, and a bunch of others, one vkms locking violation is reverted. Thanks, Dave. drm-fixes-2023-09-15: drm fixes for 6.6-rc2 connector: - doc fix exec: - workaround lockdep issue tests: - fix a UAF vkms: - revert hrtimer fix fbdev: - g364fb: fix build failure with mips i915: - Only check eDP HPD when AUX CH is shared. amdgpu: - GC 9.4.3 fixes - Fix white screen issues with S/G display on system with >=3D 64G of ram - Replay fixes - SMU 13.0.6 fixes - AUX backlight fix - NBIO 4.3 SR-IOV fixes for HDP - RAS fixes - DP MST resume fix - Fix segfault on systems with no vbios - DPIA fixes amdkfd: - CWSR grace period fix - Unaligned doorbell fix - CRIU fix for GFX11 - Add missing TLB flush on gfx10 and newer radeon: - make fence wait in suballocator uninterrruptable gm12u320: - Fix the timeout usage for usb_bulk_msg() The following changes since commit 0bb80ecc33a8fb5a682236443c1e740d5c917d1d= : Linux 6.6-rc1 (2023-09-10 16:28:41 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2023-09-15 for you to fetch changes up to c3c9acb8b2466ddf7f00fc11e2efb736b5252172: Merge tag 'drm-misc-fixes-2023-09-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2023-09-15 12:13:01 +1000) ---------------------------------------------------------------- drm fixes for 6.6-rc2 connector: - doc fix exec: - workaround lockdep issue tests: - fix a UAF vkms: - revert hrtimer fix fbdev: - g364fb: fix build failure with mips i915: - Only check eDP HPD when AUX CH is shared. amdgpu: - GC 9.4.3 fixes - Fix white screen issues with S/G display on system with >=3D 64G of ram - Replay fixes - SMU 13.0.6 fixes - AUX backlight fix - NBIO 4.3 SR-IOV fixes for HDP - RAS fixes - DP MST resume fix - Fix segfault on systems with no vbios - DPIA fixes amdkfd: - CWSR grace period fix - Unaligned doorbell fix - CRIU fix for GFX11 - Add missing TLB flush on gfx10 and newer radeon: - make fence wait in suballocator uninterrruptable gm12u320: - Fix the timeout usage for usb_bulk_msg() ---------------------------------------------------------------- Alex Deucher (3): drm/radeon: make fence wait in suballocator uninterrruptable drm/amdgpu/soc21: don't remap HDP registers for SR-IOV drm/amdgpu/nbio4.3: set proper rmmio_remap.reg_offset for SR-IOV Bhawanpreet Lakha (1): drm/amd/display: Add dirty rect support for Replay Dan Carpenter (1): drm/amdgpu: fix retry loop test Daniel Vetter (2): Merge tag 'drm-misc-next-fixes-2023-09-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-misc-fixes-2023-09-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Dave Airlie (3): Merge tag 'amd-drm-fixes-6.6-2023-09-13' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge tag 'drm-intel-fixes-2023-09-14' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'drm-misc-fixes-2023-09-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes David Francis (2): drm/amdkfd: Checkpoint and restore queues on GFX11 drm/amdgpu: Handle null atom context in VBIOS info ioctl Hamza Mahfooz (1): Revert "drm/amd: Disable S/G for APUs when 64GB or more host memory" Harish Kasiviswanathan (1): drm/amdkfd: Insert missing TLB flush on GFX10 and later Hawking Zhang (1): drm/amdgpu: fallback to old RAS error message for aqua_vanjaram Jinjie Ruan (1): drm: gm12u320: Fix the timeout usage for usb_bulk_msg() Lee Jones (1): drm/drm_connector: Provide short description of param 'supported_colorspaces' Ma=C3=ADra Canal (1): Revert "drm/vkms: Fix race-condition between the hrtimer and the atomic commit" Mukul Joshi (5): drm/amdkfd: Fix reg offset for setting CWSR grace period drm/amdkfd: Fix unaligned 64-bit doorbell warning drm/amdgpu: Store CU info from all XCCs for GFX v9.4.3 drm/amdkfd: Update cache info reporting for GFX v9.4.3 drm/amdkfd: Update CU masking for GFX 9.4.3 Mustapha Ghaddar (2): drm/amd/display: Add DPIA Link Encoder Assignment Fix drm/amd/display: Fix 2nd DPIA encoder Assignment Randy Dunlap (1): drm/amd/display: fix replay_mode kernel-doc warning Simon Pilkington (1): drm/amd: Make fence wait in suballocator uninterruptible Sudip Mukherjee (1): fbdev/g364fb: fix build failure with mips Swapnil Patel (1): drm/amd/display: Don't check registers, if using AUX BL control Thomas Hellstr=C3=B6m (2): drm/drm_exec: Work around a WW mutex lockdep oddity drm/tests: helpers: Avoid a driver uaf Thomas Zimmermann (1): Merge drm/drm-fixes into drm-misc-fixes Ville Syrj=C3=A4l=C3=A4 (1): drm/i915: Only check eDP HPD when AUX CH is shared Wayne Lin (1): drm/amd/display: Adjust the MST resume flow Yifan Zhang (1): drm/amd/display: fix the white screen issue when >=3D 64GB DRAM drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 ----- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 19 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 76 ++++++-------- drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 3 + drivers/gpu/drm/amd/amdgpu/soc21.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 4 + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 2 + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 34 ++++-- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 43 +++++++- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 46 ++++++--- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 77 ++++++++------ drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 115 +++++++++++++++++= ---- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +- .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 35 +++++-- drivers/gpu/drm/amd/display/dc/dc.h | 1 + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 4 +- .../drm/amd/display/dc/dcn314/dcn314_resource.c | 23 +++++ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 4 + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 9 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 2 +- drivers/gpu/drm/drm_connector.c | 2 + drivers/gpu/drm/drm_exec.c | 2 +- drivers/gpu/drm/i915/display/intel_bios.c | 21 ++++ drivers/gpu/drm/i915/display/intel_bios.h | 1 + drivers/gpu/drm/i915/display/intel_dp.c | 7 +- drivers/gpu/drm/radeon/radeon_sa.c | 2 +- drivers/gpu/drm/tiny/gm12u320.c | 10 +- drivers/gpu/drm/vkms/vkms_composer.c | 9 +- drivers/gpu/drm/vkms/vkms_crtc.c | 9 +- drivers/gpu/drm/vkms/vkms_drv.h | 4 +- include/drm/drm_exec.h | 35 ++++++- include/drm/drm_kunit_helpers.h | 4 +- 57 files changed, 464 insertions(+), 235 deletions(-)