Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp1324305rwe; Thu, 25 Aug 2022 22:09:07 -0700 (PDT) X-Google-Smtp-Source: AA6agR6MVqDWH1ZkbC50id3TVJGDWAEC8yyE5a3865e4TfUxqewO4Yb0WXbnQIyideDDFyv96keC X-Received: by 2002:a17:907:6e0c:b0:73d:8b64:5c3 with SMTP id sd12-20020a1709076e0c00b0073d8b6405c3mr4289774ejc.297.1661490547314; Thu, 25 Aug 2022 22:09:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661490547; cv=none; d=google.com; s=arc-20160816; b=gziqH4cBrdJt6CdrnpH5FRvmWUhIhrnmblgGA/fni59KNpS/OyVHh7bEhOx2owrLMo 0KZCWpVNyvKiHQxYlpz/UD5kh7OaFeQz+kfRs41yAUXCQ0Cc0QeiFQSzROPa21ojjkk8 KR/bMCB92Wu8eomMIzZ/HyBAya9JO+NXxnTGm0eNu2AUVjX36vcK3F86UlzT/I+nObAQ 0N9qHYF4Vg4uGKfsYug/8nQ9N409G9gtCdyTL0gMFXlKo5T9RVoWWV7p4iTDvifPJ/C3 ubkN4V1sC6+ICMqp8+y/YdFtBpQ9AoVKN/qsLuBNJ2hTcPYroy01DDAJOm0zRbaOk0cA 6faw== 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=a9scMduDb2RgBkGFRzzrneOTBxlEZxkrBW1E8AAXHRY=; b=w/FyYmcxIbIAuiNZgIoDnAVNLMkC+Cb+GwQgPoIa5oUQdMMLe4x49eMP5ShWRrZ7DM fiqdAbmyDilN6PedexO5z0Saa/zOx3vkLkEEhu7NjjoPB2ISDFmA6+/R71vuo9ZBitpp IJOyrL4ytnE6qq7X8UIdp7hmXhPmrkzMeeA4YO8kHOe2dB98AoybGrZmO/s8yD0LewXM OEWQ3vnumX2XrmL37CUgZsyafi6Lc4V7DIudDhP4awDXjs9fMeiFZzhpoQ8ogsAe+0z9 kRmi0CtK3XnU4SbZMlx/CSI3gI1+WHjemPkuaRGoItSitzIk/cYQ+E68hyG08C+XjND2 WTxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=d0WQZrRH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hb12-20020a170907160c00b0073d847631d2si769166ejc.158.2022.08.25.22.08.41; Thu, 25 Aug 2022 22:09:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=d0WQZrRH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243938AbiHZEad (ORCPT + 99 others); Fri, 26 Aug 2022 00:30:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236285AbiHZEa2 (ORCPT ); Fri, 26 Aug 2022 00:30:28 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3E9574E38 for ; Thu, 25 Aug 2022 21:30:25 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id u5so378058wrt.11 for ; Thu, 25 Aug 2022 21:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :mime-version:from:to:cc; bh=a9scMduDb2RgBkGFRzzrneOTBxlEZxkrBW1E8AAXHRY=; b=d0WQZrRHmt/GFQCy4PQvfETraZlqA9fMH5i3s5RA2yEuURgzBdC2AU5Bwp5G0sC4pU MDLqDYtXBK4yk0juSABn8WRq1G4msR5F0zYtOnHr5P69GWOKj6f49CaCUOHkBdncvd1n Btk8/qwKXqJhiEOuTiQhTg7BpJmG6YlzGlXo4a8Ff22gsNfs1j21f95Ub7TYYTcxpPX5 e6wtvOHdUBPkOfpbI8JvClWfmYubURZc5GftNTuhxqLxB7+6A27G+epd39rRgLejdglJ G3Q5u6/AYgrH2C1jxANo9XWFGzG1FH3muJ6lv+nZ2N9g9Myvn3J2u24x/FiJGKb6V3mb Y/oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :mime-version:x-gm-message-state:from:to:cc; bh=a9scMduDb2RgBkGFRzzrneOTBxlEZxkrBW1E8AAXHRY=; b=c6Olo/m2FbHUBdy0WJmV/RC0YRCnbg3M/9V+YIBpWWvMdGvvgMuPEdu++cAKrDQNkl z8jyQaAXh3RlhUQlr5yLTwadSoPkgoHOxQZqszKVJJAWbnXVc6BwrjOrR9R/3ZsgZLt0 xvuBgjkY9eQobp5hxFvyKG02yviwtrwhToqUvMvIb5N0uX9MtnFvpNyhrzVkyTM7duK5 wV67AtjFTx8uJOqWcXWLFKbClQz91tfnHOvxyWdjPOETBUg2nxX685CXg2S6wJzCqYUW hRtb14pFp/MVWlrmdI/yeXLfaY93kngZJYfeho431bsSHcQxiVulcER+CJdh56FwHsnB H5OA== X-Gm-Message-State: ACgBeo1GZqPMOVSJh2ssAb92yLjvq6Gw0EXiESkC4nGaB0q4edWpa9xt TTyyyKPu4BduchO2aUgbM0OrN6xeXl3YBcMwHY9QyOLw7rQ= X-Received: by 2002:adf:f7ca:0:b0:225:2df0:d23 with SMTP id a10-20020adff7ca000000b002252df00d23mr3730219wrq.255.1661488224114; Thu, 25 Aug 2022 21:30:24 -0700 (PDT) MIME-Version: 1.0 From: Dave Airlie Date: Fri, 26 Aug 2022 14:30:12 +1000 Message-ID: Subject: [git pull] drm fixes for 6.0-rc3 To: Linus Torvalds , Daniel Vetter Cc: dri-devel , LKML Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Weekly fixes, lots of amdgpu fixes mostly for IP blocks introduced in 6.0-rc1, otherwise vc4, nouveau fixes. There is a backmerge in here to resync our misc-fixes tree with fixes after rc1, but it should be harmless. Regards, Dave. drm-fixes-2022-08-26-1: drm fixes for 6.0-rc3 gem: - Fixes handle release leak nouveau: - fix fencing when moving BO vc4: - HDMI fixes amdgpu: - GFX 11.0 fixes - PSP XGMI handling fixes - GFX9 fix for compute-only IPs - Drop duplicated function call - Fix warning due to missing header - NBIO 7.7 fixes - DCN 3.1.4 fixes - SDMA 6.0 fixes - SMU 13.0 fixes - Arcturus GPUVM page table fix - MMHUB 1.0 fix amdkfd: - GC 10.3.7 fix radeon: - Delayed work flush fix The following changes since commit 1c23f9e627a7b412978b4e852793c5e3c3efc555= : Linux 6.0-rc2 (2022-08-21 17:32:54 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2022-08-26-1 for you to fetch changes up to 100d0ae82b5c240a4dc17486698e67bf116bd598: Merge tag 'amd-drm-fixes-6.0-2022-08-25' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2022-08-26 09:56:53 +1000) ---------------------------------------------------------------- drm fixes for 6.0-rc3 gem: - Fixes handle release leak nouveau: - fix fencing when moving BO vc4: - HDMI fixes amdgpu: - GFX 11.0 fixes - PSP XGMI handling fixes - GFX9 fix for compute-only IPs - Drop duplicated function call - Fix warning due to missing header - NBIO 7.7 fixes - DCN 3.1.4 fixes - SDMA 6.0 fixes - SMU 13.0 fixes - Arcturus GPUVM page table fix - MMHUB 1.0 fix amdkfd: - GC 10.3.7 fix radeon: - Delayed work flush fix ---------------------------------------------------------------- Candice Li (1): drm/amdgpu: Check num_gfx_rings for gfx v9_0 rb setup. Dave Airlie (2): Merge tag 'drm-misc-fixes-2022-08-25' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'amd-drm-fixes-6.0-2022-08-25' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Evan Quan (1): drm/amd/pm: update SMU 13.0.0 driver_if header Jeffy Chen (1): drm/gem: Fix GEM handle release errors Karol Herbst (1): nouveau: explicitly wait on the fence in nouveau_bo_move_m2mf Likun Gao (1): drm/amdgpu: add MGCG perfmon setting for gfx11 Maxime Ripard (2): drm/vc4: hdmi: Depends on CONFIG_PM drm/vc4: hdmi: Rework power up Ma=C3=ADra Canal (1): drm/amd/display: Include missing header Mukul Joshi (1): drm/amdgpu: Fix page table setup on Arcturus Prike Liang (1): drm/amdkfd: Fix isa version for the GC 10.3.7 Qu Huang (1): drm/amdgpu: mmVM_L2_CNTL3 register not initialized correctly Roman Li (1): drm/amd/display: enable PCON support for dcn314 Thomas Zimmermann (1): Merge drm/drm-fixes into drm-misc-fixes Tim Huang (5): drm/amdgpu: enable GFXOFF allow control for GC IP v11.0.1 drm/amdgpu: add TX_POWER_CTRL_1 macro definitions for NBIO IP v7.7.0 drm/amdgpu: add NBIO IP v7.7.0 Clock Gating support drm/amdgpu: enable NBIO IP v7.7.0 Clock Gating drm/amdgpu: add sdma instance check for gfx11 CGCG YiPeng Chai (2): drm/amdgpu: Move psp_xgmi_terminate call from amdgpu_xgmi_remove_device to psp_hw_fini drm/amdgpu: fix hive reference leak when adding xgmi device Zhenneng Li (1): drm/radeon: add a force flush to delay work when radeon shaoyunl (1): drm/amdgpu: Remove the additional kfd pre reset call for sriov drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 24 ++++--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 1 + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 12 +++- drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 78 ++++++++++++++++++= ++++ drivers/gpu/drm/amd/amdgpu/soc21.c | 22 ++++-- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 5 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 8 --- .../drm/amd/display/dc/dcn314/dcn314_resource.c | 1 + .../amd/include/asic_reg/nbio/nbio_7_7_0_offset.h | 2 + .../amd/include/asic_reg/nbio/nbio_7_7_0_sh_mask.h | 13 ++++ .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 31 +++++---- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +- drivers/gpu/drm/drm_gem.c | 17 +---- drivers/gpu/drm/drm_internal.h | 4 +- drivers/gpu/drm/drm_prime.c | 20 +++--- drivers/gpu/drm/nouveau/nouveau_bo.c | 9 +++ drivers/gpu/drm/radeon/radeon_device.c | 3 + drivers/gpu/drm/vc4/Kconfig | 1 + drivers/gpu/drm/vc4/vc4_hdmi.c | 17 +++-- 24 files changed, 206 insertions(+), 82 deletions(-)