From patchwork Thu Apr 11 03:12:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 10895045 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 BD8591669 for ; Thu, 11 Apr 2019 03:12:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9ADC28C0C for ; Thu, 11 Apr 2019 03:12:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9DBA828C03; Thu, 11 Apr 2019 03:12: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 0772428C03 for ; Thu, 11 Apr 2019 03:12:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C83DD8980C; Thu, 11 Apr 2019 03:12:55 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3F8D489807; Thu, 11 Apr 2019 03:12:54 +0000 (UTC) Received: by mail-qt1-x842.google.com with SMTP id v20so5438130qtv.12; Wed, 10 Apr 2019 20:12:54 -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=Tu5nzZGZI0s2c1cJeNf+aiBStgVfkJ++mU+T0ILcUdI=; b=HcJJ/wR+2nugNpyrqRoHkuZLMbkrTWN09zQg1Pw/dW3FGXFaGYTRkyE3D+H9naZEvY dtipfHeUfOHO/JAPfVYg1/TWh12V2nvkSA9hUd+VtwZ2xybBg6eiGOx3VuCvrtyEeqlW B0CaPGf0/VJYd3FV1MPEm1rGBMfmno0FbmkzOXTphCeWTYSzoC6hO6NbmdvIdh2t6ntu dEJS1ciREkWi3WPUWb1DIMW9tZqgEF5/GuvA0uVGZdSs4kLStyLcyUBrj4h2CSxlthDe nHghdl55VSoe8sUm0i2cX1WM9yX6U95k4ZwV9vJ9lWCXki2BmEr+4tQk1RUKKG3HNnEF CAeQ== X-Gm-Message-State: APjAAAWnBN/gnZABrQHgPrmYOuS2ZGq9QPu+XPjZSvX/sPKkqwC7SDC+ 1f22BHOBRx4KTHMEUlFvATT91F5Pr1E= X-Google-Smtp-Source: APXvYqwTLhGlAXTmDrsCCall99I9l8Oc4+Y5zBZpCqRcHUh6xgCZcmU0EKf/iwXjOEPaa921MDoKaQ== X-Received: by 2002:a0c:928a:: with SMTP id b10mr39611661qvb.4.1554952373058; Wed, 10 Apr 2019 20:12:53 -0700 (PDT) Received: from localhost.localdomain ([71.219.84.143]) by smtp.gmail.com with ESMTPSA id d142sm23173522qke.20.2019.04.10.20.12.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Apr 2019 20:12:52 -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, daniel.vetter@ffwll.ch Subject: [pull] amdgpu drm-next-5.2 Date: Wed, 10 Apr 2019 22:12:42 -0500 Message-Id: <20190411031242.3337-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Tu5nzZGZI0s2c1cJeNf+aiBStgVfkJ++mU+T0ILcUdI=; b=l1vYqnMKIResU6vefu3GfLLjWYjkhH4X1CEYiyGXOCTw60w4AyDwQHUkEeIIduCNt9 7vLjMfDHhs3gIdfvpE8WOfRPzlR98uvJx6wBrLt2cp7AW+ORdVkDh4RI5PUGqDkjU1yV W69uX4JIm0w2iDkz+B461MHmwngqV5xcwoHvhhxH1vc4j18cDLFFSyixN6Y0eVaGI63Q inDswhFezU+DGxi+BQf/dy8OBEkd6SGE3SSZsDJsfqi43s2jJjw09FOO7n2ATR9Th2zf S0qcDiI5DvRRflpICq4KE9Zri6B0DNDkxG21yqj0SE8Yoc6e4a3yWppbW4a7UzBcukxP Q3lw== 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, Daniel, More stuff for 5.2: - Fixes for powerplay custom profiles - DC bandwidth clean ups and fixes - RAS fixes for vega20 - DC atomic resume fix - Better plane handling in DC - Freesync improvements - Misc bug fixes and cleanups The following changes since commit 5ebffda257731a11cf1db6c6142c82d5b30aec35: Merge commit 'refs/for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next (2019-04-03 13:44:40 +1000) are available in the Git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-5.2 for you to fetch changes up to fe6382cd69de98802455e77040c6e00d9e12cc47: drm/amd/display: fix is odm head pipe logic (2019-04-10 13:53:28 -0500) ---------------------------------------------------------------- Aidan Wood (1): drm/amd/display: Fix multi-thread writing to 1 state Anthony Koo (2): drm/amd/display: init dc_config before rest of DC init drm/amd/display: disable link before changing link settings Aric Cyr (1): drm/amd/display: 3.2.25 Christian König (3): drm/amdgpu: fix ATC handling for Ryzen drm/amdgpu: handle leaf PDEs as PTEs on Vega drm/amdgpu: provide the page fault queue to the VM code Dmytro Laktyushkin (2): drm/amd/display: fix clk_mgr naming drm/amd/display: fix is odm head pipe logic Emily Deng (1): drm/amdgpu: Correct the irq types' num of sdma Eric Yang (1): drm/amd/display: fix underflow on boot Evan Quan (1): drm/amd/powerplay: check for invalid profile mode before switching Josip Pavic (1): drm/amd/display: remove min reduction for abm 2.2 level 3 Kent Russell (3): drm/amdgpu: Allow switching to CUSTOM profile on smu7 v2 drm/amdgpu: Allow switching to CUSTOM profile on Vega10 v2 drm/amdgpu: Allow switching to CUSTOM profile on Vega20 Kevin Wang (2): drm/amd/powerplay: optimization function of smu_update_table drm/amd/powerplay: simplify the code of [get|set]_activity_monitor_coeff Leo Li (3): drm/amd/display: Fix "dc has no member named dml" compile error drm/amd/display: Recreate private_obj->state during S3 resume drm/amd/display: Clean up locking in dcn*_apply_ctx_for_surface() Mario Kleiner (5): drm/amd/display: Update VRR state earlier in atomic_commit_tail. drm/amd/display: Prevent vblank irq disable while VRR is active. (v3) drm/amd/display: Rework vrr flip throttling for late vblank irq. drm/amd/display: In VRR mode, do DRM core vblank handling at end of vblank. (v2) drm/amd/display: Make pageflip event delivery compatible with VRR. Murton Liu (1): drm/amd/display: HDR visual confirmation incorrectly reports black color Nicholas Kazlauskas (7): drm/amd/display: Prevent cursor hotspot overflow for RV overlay planes drm/amd/display: Remove semicolon from to_dm_plane_state definition drm/amd/display: Initialize stream_update with memset drm/amd/display: Add debugfs entry for amdgpu_dm_visual_confirm drm/amd/display: Use plane->color_space for dpp if specified drm/amd/display: Set surface color space from DRM plane state drm/amd/display: Pass plane caps into amdgpu_dm_plane_init Nikola Cornij (1): drm/amd/display: Calculate link bandwidth in a common function SivapiriyanKumarasamy (2): drm/amd/display: fix dp_hdmi_max_pixel_clk units drm/amd/display: Call hwss.set_cursor_sdr_white_level, if available Su Sung Chung (1): drm/amd/display: return correct dc_status for dcn10_validate_global Wenjing Liu (2): drm/amd/display: use proper formula to calculate bandwidth from timing drm/amd/display: prefer preferred link cap over verified link settings Yintian Tao (1): drm/amdgpu: support dpm level modification under virtualization v3 shaoyunl (3): drm/amdgpu: Adjust TMR address alignment as per HW requirement drm/amdgpu: Add preferred_domain check when determine XGMI state drm/amdgpu: Always enable memory sharing within same XGMI hive xinhui pan (6): drm/amdgpu: Make default ras error type to none drm/amdgpu: Introduce another ras enable function drm/amdgpu: gfx use amdgpu_ras_feature_enable_on_boot drm/amdgpu: gmc use amdgpu_ras_feature_enable_on_boot drm/amdgpu: sdma use amdgpu_ras_feature_enable_on_boot drm/amdgpu: Add a check to avoid panic because of unexpected irqs drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 11 + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 16 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 51 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 49 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 11 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 37 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 8 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 12 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 12 +- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 78 ++++ drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 6 + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 38 +- drivers/gpu/drm/amd/amdgpu/si_dma.c | 8 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 455 +++++++++++++++++---- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 9 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 39 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 22 + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 98 ++--- drivers/gpu/drm/amd/display/dc/core/dc.c | 111 ++++- drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 24 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 77 +++- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 83 +--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 13 +- drivers/gpu/drm/amd/display/dc/dc.h | 5 +- drivers/gpu/drm/amd/display/dc/dc_link.h | 8 + drivers/gpu/drm/amd/display/dc/dc_types.h | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 30 +- .../drm/amd/display/dc/dce100/dce100_resource.c | 8 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 18 +- .../drm/amd/display/dc/dce110/dce110_resource.c | 62 +-- .../drm/amd/display/dc/dce112/dce112_resource.c | 62 +-- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 8 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 6 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 113 +++-- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 4 + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 12 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 +- drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 12 +- .../amd/display/dc/irq/dce110/irq_service_dce110.c | 7 +- .../amd/display/dc/irq/dce120/irq_service_dce120.c | 7 +- .../amd/display/dc/irq/dce80/irq_service_dce80.c | 6 +- .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 40 +- .../drm/amd/display/modules/power/power_helpers.c | 4 +- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 7 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 32 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 28 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 16 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h | 2 + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 11 +- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 75 +--- 63 files changed, 1318 insertions(+), 586 deletions(-)