From patchwork Thu Sep 27 18:43:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 10618461 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 0205B112B for ; Thu, 27 Sep 2018 18:44:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D91C22BB82 for ; Thu, 27 Sep 2018 18:44:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CCE4A2BB87; Thu, 27 Sep 2018 18:44:10 +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 E00802BB82 for ; Thu, 27 Sep 2018 18:44:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 875246E025; Thu, 27 Sep 2018 18:44:05 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) by gabe.freedesktop.org (Postfix) with ESMTPS id 246486E025; Thu, 27 Sep 2018 18:44:04 +0000 (UTC) Received: by mail-qk1-x743.google.com with SMTP id q12-v6so2230306qkl.13; Thu, 27 Sep 2018 11:44:04 -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=PCCgcp2v9W7gg3FEgKNSkue4oh0U8ZzA8d0x41tEBnc=; b=rO/jWC0ZA0lL62vvC6cKTTyJOuSUI72sOwB8EomP48pPMV89+oCicq1rKQJlp0ECgx G1glVSkowQyRmKpG83Wadejb3cejuhe5hoW/StYnGbO6JzEnOQD66oHGmFxlM3yDbc9P 1be6HrQFAzgNo1W+iA8oX6fggyzzAyNNLpcYXHvdfqV6x1KgFEWtwfNYKekcchyzr1gI VJQcZ881/qUfozK+OHkACstMC3WXIeh+bukyvARlHTTS8evZdp9lLWXpjlDP72fjCY00 d7UfhwHyp7KKuAGxinoZ2z1/uG0a3CJMog91s2rU78FMPKnb4mclDuaH0eyGWGITzwIX i1OA== X-Gm-Message-State: ABuFfogMlbkMAhFYV+pHYz2IhesVCXO7aLjM10kJ5Civ6a5c/uyFESzw /2xSfcZ9tjqDgZFDJlzL/Y3gr4mf X-Google-Smtp-Source: ACcGV62aqJhSaMfO/8BUH+y0t2nIKZmf4m7RYipBpAKoehZtmtmdIZHBFyhpgvFAIFah2lzzxZJLOA== X-Received: by 2002:a37:8dc2:: with SMTP id p185-v6mr8728509qkd.53.1538073842992; Thu, 27 Sep 2018 11:44:02 -0700 (PDT) Received: from localhost.localdomain ([71.219.59.20]) by smtp.gmail.com with ESMTPSA id z17-v6sm1382763qki.52.2018.09.27.11.44.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Sep 2018 11:44:02 -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 drm-next-4.20 Date: Thu, 27 Sep 2018 13:43:48 -0500 Message-Id: <20180927184348.2696-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, More new features and fixes for 4.20: - Add dynamic powergating support for VCN on picasso - Scheduler cleanup - Vega20 support for KFD - DC cleanups and bug fixes The following changes since commit bf78296ab1cb215d0609ac6cff4e43e941e51265: BackMerge v4.19-rc5 into drm-next (2018-09-27 11:06:46 +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 6a96243056217662843694a4cbc83158d0e84403: drm/scheduler: remove timeout work_struct from drm_sched_job (v3) (2018-09-27 09:55:45 -0500) ---------------------------------------------------------------- Alex Deucher (11): drm/amdgpu/powerplay: add get_argument callback for vega20 drm/amdgpu/powerplay: Move vega10_enable_smc_features drm/amdgpu/powerplay: add smu smc_table_manager callback for vega12 drm/amdgpu/powerplay: add smu smc_table_manager callback for vega20 drm/amdgpu: add new AMDGPU_PP_SENSOR_ENABLED_SMC_FEATURES_MASK sensor drm/amdgpu: implement ENABLED_SMC_FEATURES_MASK sensor for vega10 drm/amdgpu: implement ENABLED_SMC_FEATURES_MASK sensor for vega12 drm/amdgpu: implement ENABLED_SMC_FEATURES_MASK sensor for vega20 drm/amdgpu: print smc feature mask in debugfs amdgpu_pm_info drm/amdgpu/soc15: fix warnings in register macro drm/amdgpu/vcn: whitespace cleanup Andrey Grodzovsky (4): Revert "drm/amdgpu: remove fence fallback" drm/amdgpu: Add warning message for INT SW fallback. drm/amdgpu: Deactivate SW interrupt fallback in amdgpu_fence_process v2 drm/amdgpu: Move fence SW fallback warning v3 Charlene Liu (1): drm/amd/display: add pp_smu NULL pointer check Christian König (5): drm/amdgpu: drop extra newline in amdgpu_iv trace drm/amdgpu: make function pointers mandatory drm/amdgpu: cleanup amdgpu_ih.c drm/amdgpu: move more interrupt processing into amdgpu_irq.c drm/amdgpu: move more defines into amdgpu_irq.h Emily Deng (2): drm/amdkfd: KFD doesn't support TONGA SRIOV drm/amdgpu/sriov: Correct the setting about sdma doorbell offset of Vega10 Eric Bernstein (1): drm/amd/display: Stereo 3D support in VSC Eric Huang (1): drm/amdkfd: reflect atomic support in IO link properties Felix Kuehling (2): drm/amdkfd: Report SDMA firmware version in the topology drm/amdgpu: remove unnecessary forward declaration Harish Kasiviswanathan (1): drm/amdgpu: Enable BAD_OPCODE intr for gfx8 Huang Rui (1): drm/amdgpu: fix the page fault of raven2 James Zhu (9): drm/amdgpu:No action when VCN PG state is unchanged drm/amdgpu:Use register UVD_SCRATCH9 for VCN ring/ib test drm/amdgpu:Add new register offset/mask to support VCN DPG mode drm/amdgpu:Add DPG support flag drm/amdgpu:Add DPG mode read/write macro drm/amdgpu:Add DPG mode support for vcn 1.0 drm/amdgpu:Add DPG pause state drm/amdgpu:Add DPG pause mode support drm/amdgpu:Enable DPG mode on PCO Jay Cornwall (1): drm/amdkfd: Add wavefront context save state retrieval ioctl Leo Li (1): drm/amd/display: Remove mst_hotplug_work Nathan Chancellor (1): drm/amd/powerplay: Change id parameter type in pp_atomfwctrl_get_clk_information_by_clkid Nayan Deshmukh (1): drm/scheduler: remove timeout work_struct from drm_sched_job (v3) Nicholas Kazlauskas (2): drm/amd/display: Guard against null stream dereference in do flip drm/amd/display: Raise dispclk value for dce120 by 15% Nikola Cornij (1): drm/amd/display: Refactor FPGA-specific link setup Rex Zhu (7): drm/amd/dc: Trigger set power state task when display configuration changes drm/amd/pp: Honour DC's clock limits on Rv drm/amd/pp: Return error immediately if load firmware failed drm/amdgpu: Refine function name drm/amdgpu: Halt rlc/cp in rlc_safe_mode drm/amdgpu: Remove redundant code in gfx_v8_0.c drm/amd/pp: Disable dpm features on smu7/8 when suspend Samson Tam (1): drm/amd/display: use proper pipe_ctx index Shaoyun Liu (6): drm/amdgpu: Doorbell assignment for 8 sdma user queue per engine drm/amdkfd: Make the number of SDMA queues variable drm/amd: Interface change to support 64 bit page_table_base drm/amdgpu: Add vega20 support on kfd probe drm/amdkfd: Vega20 bring up on amdkfd side drm/amdkfd: Remove the requirement for atomic Ops on vg20 SivapiriyanKumarasamy (2): drm/amd/display: Add color bit info to freesync infoframe drm/amd/display: fix gamma not being applied Su Sung Chung (1): drm/amd/display: program v_update and v_ready with proper field Tony Cheng (1): drm/amd/display: dc 3.1.67 zhong jiang (1): drm/amd/display: remove redundant null pointer check before kfree drivers/gpu/drm/amd/amdgpu/amdgpu.h | 24 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 50 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 66 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 166 +++++------ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 32 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 41 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 25 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 5 + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 177 ++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 12 + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 4 +- drivers/gpu/drm/amd/amdgpu/cik_ih.c | 9 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 26 +- drivers/gpu/drm/amd/amdgpu/cz_ih.c | 9 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 5 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 10 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 16 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 122 ++++---- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 7 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 7 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 7 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 9 +- drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 4 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 26 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 26 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 32 +- drivers/gpu/drm/amd/amdgpu/si_dma.c | 24 +- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 4 +- drivers/gpu/drm/amd/amdgpu/si_ih.c | 9 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- drivers/gpu/drm/amd/amdgpu/soc15_common.h | 22 +- drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 9 +- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 331 ++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 7 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 21 ++ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 65 ++-- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 55 +++- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 9 +- drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 8 + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 23 ++ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 23 ++ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 14 +- .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 22 ++ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 44 ++- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 29 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 - .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 2 + .../gpu/drm/amd/display/dc/calcs/dcn_calc_auto.c | 8 +- drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 12 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 41 ++- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 56 ++-- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 3 + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 15 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 6 +- .../drm/amd/display/modules/freesync/freesync.c | 164 ++++++++-- .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 4 +- .../gpu/drm/amd/display/modules/inc/mod_shared.h | 49 +++ .../amd/display/modules/info_packet/info_packet.c | 58 +++- drivers/gpu/drm/amd/display/modules/stats/stats.c | 8 +- drivers/gpu/drm/amd/include/amd_shared.h | 1 + .../drm/amd/include/asic_reg/vcn/vcn_1_0_offset.h | 8 + .../drm/amd/include/asic_reg/vcn/vcn_1_0_sh_mask.h | 25 ++ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 10 +- drivers/gpu/drm/amd/include/kgd_pp_interface.h | 1 + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 3 +- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 25 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 19 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 37 +-- drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 16 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 2 - .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 1 + .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 1 + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 14 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 55 ++-- .../gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c | 5 +- drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 10 +- .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 18 +- .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h | 4 + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 22 +- .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.h | 4 - .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 45 +-- .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.h | 5 - drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- drivers/gpu/drm/scheduler/sched_main.c | 31 +- drivers/gpu/drm/v3d/v3d_sched.c | 2 +- include/drm/gpu_scheduler.h | 6 +- include/uapi/linux/kfd_ioctl.h | 13 +- 118 files changed, 1856 insertions(+), 717 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_shared.h