From patchwork Thu Oct 11 01:47:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 10635611 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6CEC3112B for ; Thu, 11 Oct 2018 01:47:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4170329FC4 for ; Thu, 11 Oct 2018 01:47:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 347432AC3A; Thu, 11 Oct 2018 01:47:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5DBFE29FC4 for ; Thu, 11 Oct 2018 01:47:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8C4236E372; Thu, 11 Oct 2018 01:47:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9135B6E370; Thu, 11 Oct 2018 01:47:52 +0000 (UTC) Received: by mail-qt1-x82d.google.com with SMTP id v19-v6so8129957qtg.2; Wed, 10 Oct 2018 18:47:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tBdc7ebUYjeMIVD6O4l64aRWqEFs4y/ard+YdJgQiio=; b=BXl0bw59QwaTBFlezuw/TJHFRdPAdOSkSkgIC25p/uMLjqKwkjv1I2tPetsl7LxOJN 76nBZofpVtr1xvU52TAlcef5Yt8Txzkc7CkSApjck9ySjhhNk49n4dXpC2+KmBlZdQQW GoPiR5BmxZ3H3u0h8INC23sHwS6YiDYIXg1xNVJXP49wbKduSkfm84CQXw8QoIoFyz1M ZlHeRGz6fDVN/0fkJBbVyLSAt3vDiVWWMcGCNKuIfL2R1I3/CN8Qvtto6nYuOee2WNFZ 40apBbt1U48OkNzkgW8WKGdBLsikQr/FZaaOJbUVdiSNTcbxvFakqnr2ZWWFZPYT3nf2 hrnw== X-Gm-Message-State: ABuFfoirKDElXpAP/vBIotsZGkErCcwWr+jNdkhHwmsEJjzJ3Xl8S7AN zoMkjsn5HCPlrLFPcnJv0Adwc8Lv X-Google-Smtp-Source: ACcGV62hJgJRR3xDLL03BKeqpURBT7EzpU78c0aq/KDXmtzJCrNtkh1FVyECpi9QfP8FGD3cMVvHCQ== X-Received: by 2002:a0c:d0c4:: with SMTP id b4mr9113949qvh.237.1539222471344; Wed, 10 Oct 2018 18:47:51 -0700 (PDT) Received: from localhost.localdomain ([71.219.49.5]) by smtp.gmail.com with ESMTPSA id s13-v6sm19309702qte.29.2018.10.10.18.47.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Oct 2018 18:47:50 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, airlied@gmail.com Subject: [pull] amdgpu, amdkfd, scheduler, radeon, ttm drm-next-4.20 Date: Wed, 10 Oct 2018 20:47:39 -0500 Message-Id: <20181011014739.3117-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.13.6 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Deucher Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi Dave, Fixes for 4.20. A little bigger than I'd like, but there are a lot of fixes for new asics that were introduced in 4.20 (Vega20, RV2, PCO). Highlights: - Add a new list.h helper for doing bulk updates. Used by ttm. - Fixes for display underflow on VI APUs at 4K with UVD running - Endian fixes for powerplay on vega - DC fixes for interlaced video - Vega20 powerplay fixes - RV/RV2/PCO powerplay fixes - Fix for spurious ACPI events on HG laptops - Fix a memory leak in DC on driver unload - Fixes for manual fan control mode switching - Suspend/resume robustness fixes - Fix display handling on RV2 - VCN fixes for DPG on PCO - Misc code cleanups and warning fixes The following changes since commit c530174b90fa3bcaa83d168b001b574bcb2da021: Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next (2018-10-04 11:31:05 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-4.20 for you to fetch changes up to df2fc43d09d3ee5ede82cab9299df5e78aa427b5: list: introduce list_bulk_move_tail helper (2018-10-10 15:20:54 -0500) ---------------------------------------------------------------- Akshu Agrawal (1): drm/amd/powerplay: Enable/Disable NBPSTATE on On/OFF of UVD Alex Deucher (5): drm/amdgpu/vega20: make power profile output more consistent drm/amdgpu/powerplay: endian fixes for vega10_processpptables.c drm/amdgpu/powerplay: endian fixes for vega12_processpptables.c drm/amdgpu/powerplay: endian fixes for vega20_processpptables.c drm/amdgpu/powerplay: factor out some pptable helpers Charlene Liu (2): drm/amd/display: fix 4K stereo screen flash issue drm/amd/display: fix Interlace video timing. Christian König (3): drm/amdgpu: fix AGP location with VRAM at 0x0 drm/amdgpu: fix incorrect use of amdgpu_irq_add_id in si_dma.c list: introduce list_bulk_move_tail helper Colin Ian King (1): drm/amdgpu/powerplay: fix missing break in switch statements Emily Deng (1): drm/amdgpu: Limit the max mc address to hole start Eric Yang (2): drm/amd/display: block DP YCbCr420 modes drm/amd/display: clean up encoding checks Eryk Brol (1): drm/amd/display: Add function to fetch clock requirements Evan Quan (8): drm/amd/powerplay/vega20: correct the hwmon interface ppt limit output drm/amd/powerplay/vega20: tell the correct gfx voltage V2 drm/amd/powerplay/vega20: enable fan RPM and pwm settings V2 drm/amdgpu: added vega20 LBPW support v2 drm/amdgpu: change Raven always on CUs to 4 drm/amdgpu: added AMD GPU instance counting V2 drm/amd/powerplay: helper interfaces for MGPU fan boost feature drm/amd/powerplay: enable MGPU fan boost feature on Vega20 Felix Kuehling (1): drm/amdkfd: Fix incorrect use of process->mm Hersen Wu (1): drm/amd/display: RV2 DP MST 2nd display within daisy chain not light up James Zhu (4): drm/amdgpu/vcn:Remove unused code drm/amdgpu/vcn:fix dpg pause mode hang issue drm/amdgpu/vcn:Replace value with defined macro drm/amdgpu/vcn:Correct VCN cache window definition Jun Lei (2): drm/amd/display: Add DC build_id to determine build type drm/amd/display: fix memory leak in resource pools Leo Li (1): drm/amd/display: Flatten irq handler data struct Lyude Paul (1): drm/amdgpu: Suppress keypresses from ACPI_VIDEO events Murton Liu (1): drm/amd/display: HLK Periodic Frame Notification test failed Nathan Chancellor (2): drm/amd/display: Use proper enums in process_channel_reply drm/scheduler: Simplify spsc_queue_count check in drm_sched_entity_select_rq Nicholas Kazlauskas (1): drm/amd/display: Raise dispclk value for dce_update_clocks Nick Alcock (1): drm/radeon: ratelimit bo warnings Nikola Cornij (1): drm/amd/display: Add a check-function for virtual signal type Pratik Vishwakarma (1): drm/amdgpu: skip IB tests for KIQ in general Rex Zhu (35): drm/amdgpu: Fix comments error in sdma_v4_1_update_power_gating drm/amd/pp: Fix fan's RPM setting not work on VI/Vega10 drm/amd/pp: Avoid divide-by-zero in fan_ctrl_set_fan_speed_rpm drm/amd/pp: Expose the smu support for SDMA PG cntl drm/amdgpu: Move out power up/down sdma out of smu drm/amd/pp: Remove uncessary extra vcn pg cntl in smu drm/amd/pp: Remove wrong code in fiji_start_smu drm/amdgpu: Refine uvd_v6/7_0_enc_get_destroy_msg drm/amdgpu: Add new AMDGPU_PP_SENSOR_MIN/MAX_FAN_RPM sensor drm/amd/pp: Implement AMDGPU_PP_SENSOR_MIN/MAX_FAN_RPM drm/amdgpu: Add fan RPM setting via sysfs drm/amdgpu: Disable sysfs pwm1 if not in manual fan control drm/amdgpu: Always enable fan sensors for read drm/amdgpu: Drop dead define in amdgpu.h drm/amd/pp: Fix memory leak on CI/AI drm/amdgpu: Move gfx flag in_suspend to adev drm/amd/pp: Refine function iceland_start_smu drm/amd/pp: Setup SoftRegsStart before request smu load fw drm/amd/pp: Refine smu7/8 request_smu_load_fw callback function drm/amdgpu: Remove FW_LOAD_DIRECT type support on VI drm/amdgpu: Don't reallocate ucode bo when suspend drm/amd/pp: Allocate ucode bo in request_smu_load_fw drm/amd/pp: Implement load_firmware interface drm/amdgpu: Add fw load in gfx_v8 and sdma_v3 drm/amdgpu: Change VI gfx/sdma/smu init sequence drm/amdgpu: Change SI/CI gfx/sdma/smu init sequence drm/amdgpu: Change AI gfx/sdma/smu init sequence drm/amdgpu: Refine function amdgpu_device_ip_late_init drm/amdgpu: Check late_init status before set cg/pg state drm/amdgpu: Split amdgpu_ucode_init/fini_bo into two functions drm/amdgpu: Remove amdgpu_ucode_fini_bo drm/amdgpu: split ip hw_init into 2 phases drm/amdgpu: Load fw between hw_init/resume_phase1 and phase2 drm/amdgpu: Remove wrong fw loading type warning drm/amdgpu: Remove the direct fw loading support for sdma2.4 Roman Li (1): drm/amd/display: Fix warning storm on Raven2 Shirish S (2): drm/amd/display: Signal hw_done() after waiting for flip_done() drm/amdgpu: remove the intterupt handling for the KIQ events Su Sung Chung (1): drm/amd/display: Calculate swizzle mode using bpp during validation Tao Zhou (2): drm/amdgpu: add CP_DEBUG register definition for GC9.0 drm/amdgpu: fix CPDMA hang in PRT mode Tony Cheng (1): drm/amd/display: dc 3.1.68 Yongqiang Sun (1): drm/amd/display: WA for DF keeps awake after S0i3. YueHaibing (3): drm/amdkfd: Remove set but not used variable 'preempt_all_queues' drm/amdgpu: remove set but not used variable 'ring' in psp_v11_0_ring_stop drm/amdgpu: remove set but not used variable 'header' drivers/gpu/drm/amd/amdgpu/amdgpu.h | 49 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 17 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 183 ++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 7 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 8 + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 52 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 187 +++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 4 - drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 84 ++---- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 6 +- drivers/gpu/drm/amd/amdgpu/cik.c | 17 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 321 ++++----------------- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 219 ++++++++------ drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 3 - drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 42 --- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 57 +--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/si.c | 13 +- drivers/gpu/drm/amd/amdgpu/si_dma.c | 27 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 8 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 10 +- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 12 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 53 ++-- drivers/gpu/drm/amd/amdgpu/vi.c | 24 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 40 ++- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 37 +-- drivers/gpu/drm/amd/display/dc/core/dc.c | 46 ++- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 40 +++ drivers/gpu/drm/amd/display/dc/dc.h | 8 +- drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 3 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 12 + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 5 + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 17 +- .../drm/amd/display/dc/dce100/dce100_resource.c | 5 +- .../drm/amd/display/dc/dce110/dce110_resource.c | 5 +- .../drm/amd/display/dc/dce112/dce112_resource.c | 11 +- .../drm/amd/display/dc/dce120/dce120_resource.c | 3 +- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 5 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 60 +++- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 4 + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 14 + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 18 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 34 +-- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 45 ++- .../display/dc/i2caux/dce110/aux_engine_dce110.c | 2 +- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 3 + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 1 - drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 + drivers/gpu/drm/amd/display/include/signal_types.h | 5 + .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 2 + .../amd/include/asic_reg/smuio/smuio_9_0_offset.h | 3 + .../amd/include/asic_reg/smuio/smuio_9_0_sh_mask.h | 3 + .../amd/include/asic_reg/thm/thm_11_0_2_offset.h | 12 + .../amd/include/asic_reg/thm/thm_11_0_2_sh_mask.h | 10 + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 4 + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 87 +++++- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 19 -- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 9 + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 3 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 5 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 44 +++ drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h | 12 + .../amd/powerplay/hwmgr/vega10_processpptables.c | 30 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 7 +- .../amd/powerplay/hwmgr/vega12_processpptables.c | 82 ++---- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 64 +++- .../amd/powerplay/hwmgr/vega20_processpptables.c | 91 ++---- .../gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c | 151 +++++++++- .../gpu/drm/amd/powerplay/hwmgr/vega20_thermal.h | 11 +- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 3 +- .../gpu/drm/amd/powerplay/inc/smu11_driver_if.h | 6 + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 2 + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 12 +- .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 25 +- .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 31 +- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 55 +--- drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 55 ++-- .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 11 + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 2 + drivers/gpu/drm/radeon/evergreen_cs.c | 2 +- drivers/gpu/drm/scheduler/sched_entity.c | 3 +- drivers/gpu/drm/ttm/ttm_bo.c | 25 +- include/linux/list.h | 23 ++ 91 files changed, 1652 insertions(+), 1144 deletions(-)