From patchwork Wed Aug 1 22:29:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 10553105 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 85AD513BF for ; Wed, 1 Aug 2018 22:29:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75EE529DE2 for ; Wed, 1 Aug 2018 22:29:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A1722A748; Wed, 1 Aug 2018 22:29:21 +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 7CF0529DE2 for ; Wed, 1 Aug 2018 22:29:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D6BC6E0D3; Wed, 1 Aug 2018 22:29:17 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt0-x242.google.com (mail-qt0-x242.google.com [IPv6:2607:f8b0:400d:c0d::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id B2AFF6E0D3; Wed, 1 Aug 2018 22:29:15 +0000 (UTC) Received: by mail-qt0-x242.google.com with SMTP id h4-v6so226618qtj.7; Wed, 01 Aug 2018 15:29:15 -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=oP+SB+Wl9vPUrnUM+C9XqWokQ/OVz6nhJ8e3l5VMYns=; b=nUXc7Fqpp3iR8twhksRFEchnv4UMaV7pVr6tPzcxdeCkYRHa3YA6U72/HOCSeHE9+s 0GOybf6lK3DLz47RbdnZW4+Erqgl7osGZ75G2s+CpIYhZdQa1B34l2ZNz76K8reIMRlW dGQ7ilDRNkjbqp7tkh19/jBklmGPqQpQ7KYmlSuWguWRpW+OYnsUHLFXfZdFogiZUjXP 0Ms3psvC28XE6ZWWpVnJzB3VKcrGBA+Hx2LZWPld4/WCgQ3CcSth6KzIW16GG8gh2ap/ fKUzqKh+N6OuaQDTQ+sU9jWm8OqlRR1wrVIQ+dGsU0gOKjzRkclKuMPG+eSbXbGMa004 l9gA== X-Gm-Message-State: AOUpUlF6WwP1vPRJh7kd8IZC1WLgaU55/ce5BWOs2k1w/+uO6vPUGKjz Bp+oa7R2rExuvoOR64BNHPPq5SkV X-Google-Smtp-Source: AAOMgpcTEzNI0CWFC/eTtgc+7FhjDLADPOnpP/JVS8ktCtNR91KaA7SPkC3BjjN/dk5eOqUZmdg+VQ== X-Received: by 2002:aed:3e13:: with SMTP id l19-v6mr217647qtf.345.1533162554504; Wed, 01 Aug 2018 15:29:14 -0700 (PDT) Received: from localhost.localdomain ([76.1.164.143]) by smtp.gmail.com with ESMTPSA id t3-v6sm236104qtj.36.2018.08.01.15.29.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Aug 2018 15:29:13 -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, radeon, scheduler, ttm drm-next-4.19 Date: Wed, 1 Aug 2018 17:29:06 -0500 Message-Id: <20180801222906.1016-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.19: - Fix UVD 7.2 instance handling - Fix UVD 7.2 harvesting - GPU scheduler fix for when a process is killed - TTM cleanups - amdgpu CS bo_list fixes - Powerplay fixes for polaris12 and CZ/ST - DC fixes for link training certain HMDs - DC fix for vega10 blank screen in certain cases The following changes since commit 6d52aacd92c60331ec8c3117522f4301b5195e28: Merge branch 'drm-next-4.19' of git://people.freedesktop.org/~agd5f/linux into drm-next (2018-07-27 12:31:48 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-4.19 for you to fetch changes up to df36b2fb8390d98453fff1aae3927095fe9ff36c: drm/ttm: clean up non-x86 definitions on ttm_tt (2018-08-01 17:23:56 -0500) ---------------------------------------------------------------- Alex Deucher (1): drm/amdgpu: implement harvesting support for UVD 7.2 (v3) Anthony Koo (1): drm/amd/display: Prevent PSR from being enabled if initialization fails Bas Nieuwenhuizen (1): drm/ttm: Merge hugepage attr changes in ttm_dma_page_put. (v2) Bhawanpreet Lakha (2): drm/amd/display: Retry link training again drm/amd/display: flatten aux_engine and engine Christian König (14): drm/amdgpu: add support for inplace IB patching for MM engines v2 drm/amdgpu: patch the IBs for the second UVD instance v2 drm/amdgpu: add proper error handling to amdgpu_bo_list_get drm/amdgpu: fix total size calculation drm/amdgpu: return error if both BOs and bo_list handle is given drm/amdgpu: add new amdgpu_vm_bo_trace_cs() function v2 drm/amdgpu: move bo_list defines to amdgpu_bo_list.h drm/amdgpu: always recreate bo_list drm/amdgpu: nuke amdgpu_bo_list_free drm/amdgpu: add bo_list iterators drm/amdgpu: allocate the bo_list array after the list drm/amdgpu: create an empty bo_list if no handle is provided drm/scheduler: only kill entity if last user is killed v2 drm/scheduler: stop setting rq to NULL Colin Ian King (1): drm/amd/display: add missing void parameter to dc_create_transfer_func Gustavo A. R. Silva (1): drm/amdgpu/pm: Fix potential Spectre v1 Harry Wentland (2): drm/amd/display: DC 3.1.59 drm/amd: Add missing fields in atom_integrated_system_info_v1_11 Huang Rui (7): drm/ttm: add ttm_set_memory header (v2) drm/ttm: clean up non-x86 definitions on ttm_page_alloc_dma drm/ttm: clean up non-x86 definitions on ttm_page_alloc drm/amdgpu: clean up the superfluous space and align the comment text for amdgpu_ttm drm/ttm: fix missed conversion of set_pages_array_uc drm/ttm: Add ttm_set_pages_wc and ttm_set_pages_uc helper drm/ttm: clean up non-x86 definitions on ttm_tt Jerry (Fangzhi) Zuo (1): drm/amd/display: Fix Vega10 black screen after mode change Junwei Zhang (1): drm/amdgpu: correct evict flag for bo move Masahiro Yamada (1): drm/sched: remove unneeded -Iinclude/drm compiler flag Rex Zhu (4): drm/amd/pp/Polaris12: Fix a chunk of registers missed to program drm/amd/pp: Delete unused temp variables drm/amd/pp: Convert voltage unit in mV*4 to mV on CZ/ST drm/amdgpu: fix a reversed condition Thomas Zimmermann (4): drm/amdgpu: Replace ttm_bo_reference with ttm_bo_get drm/amdgpu: Replace ttm_bo_unref with ttm_bo_put drm/radeon: Replace ttm_bo_reference with ttm_bo_get drm/radeon: Replace ttm_bo_unref with ttm_bo_put drivers/gpu/drm/amd/amdgpu/amdgpu.h | 41 +---- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 189 ++++++++------------- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 85 +++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 169 +++++++++--------- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 19 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 5 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 111 ++++++------ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 29 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 85 ++++++++- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 20 ++- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 8 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 5 +- drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 2 +- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 55 +++--- drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 4 +- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 38 +++-- .../drm/amd/display/dc/dce100/dce100_resource.c | 4 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 2 +- .../amd/display/dc/dce110/dce110_hw_sequencer.h | 5 + .../drm/amd/display/dc/dce110/dce110_resource.c | 4 +- .../drm/amd/display/dc/dce112/dce112_resource.c | 4 +- .../amd/display/dc/dce120/dce120_hw_sequencer.c | 10 ++ .../drm/amd/display/dc/dce120/dce120_resource.c | 4 +- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 4 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 3 +- drivers/gpu/drm/amd/display/dc/inc/hw/aux_engine.h | 127 ++++++++++---- drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/hw/engine.h | 106 ------------ drivers/gpu/drm/amd/include/atomfirmware.h | 15 +- .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 43 +++++ drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 5 +- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 22 +-- drivers/gpu/drm/radeon/radeon_object.c | 7 +- drivers/gpu/drm/scheduler/Makefile | 1 - drivers/gpu/drm/scheduler/gpu_scheduler.c | 41 ++--- drivers/gpu/drm/ttm/ttm_page_alloc.c | 62 +------ drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 59 +------ drivers/gpu/drm/ttm/ttm_tt.c | 25 +-- include/drm/gpu_scheduler.h | 2 + include/drm/ttm/ttm_set_memory.h | 150 ++++++++++++++++ 50 files changed, 911 insertions(+), 711 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h delete mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/engine.h create mode 100644 include/drm/ttm/ttm_set_memory.h