From patchwork Thu Feb 21 21:41:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 10824787 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 A63F713B5 for ; Thu, 21 Feb 2019 21:41:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9638F325E0 for ; Thu, 21 Feb 2019 21:41:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 944E93260C; Thu, 21 Feb 2019 21:41:47 +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 018AD325E0 for ; Thu, 21 Feb 2019 21:41:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 85AB989339; Thu, 21 Feb 2019 21:41:45 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3A9DC89333; Thu, 21 Feb 2019 21:41:44 +0000 (UTC) Received: by mail-qt1-x843.google.com with SMTP id p25so168906qtb.3; Thu, 21 Feb 2019 13:41:44 -0800 (PST) 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=TtEnJUT/hjcu+miOfXUQqxP2upAzKIzlcayVnA7UGO4=; b=Bts7g+SlC0tym77drnb6Gpm6l3QtlkHIiyjnHtPrz2mO+zFEw1bxi5TRXn0nHV+PKZ XtQ+NPhtU5hBD7Z93dR1YXlyYOrMikmo1hq5NXHZ8NYhc8BphD22d5vkB45l32+T73nx jdOHxFLwDR2vBrJXNIog+5nzJv8ZX2ClE9oMp6fZLqApZ73BRxM+lXnsNURwAsb86fbD nwbbhOL+zwSAYptipwOY59JGq9B84TGaksbHUifTYc72ZD8o48JTOtVHaplUxwdbmjC0 qvEsCZbz1i8G7zCMOek3HH5ZsYg+B+UJtW7mn3jPjbxAyMWUDwc4NzbJ1NU1TJBOkdJG JMjQ== X-Gm-Message-State: AHQUAuYL02wNtP0prcO+7cr9tUgjy7oDTbxJQ5WCK7zvxOnMIsFdUimf qfZhv9S8w80thqOsxOwhPeD4YW3N X-Google-Smtp-Source: AHgI3Ia9YOIjjw9XRalWrEHZ5lkv2WYihwnSNRpWXX96c4V5nBLAhZjcjB6ee5BxTMIuzgB6psu0oA== X-Received: by 2002:aed:302f:: with SMTP id 44mr515507qte.178.1550785303021; Thu, 21 Feb 2019 13:41:43 -0800 (PST) Received: from localhost.localdomain ([71.219.56.162]) by smtp.gmail.com with ESMTPSA id h58sm10770351qtb.89.2019.02.21.13.41.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Feb 2019 13:41:42 -0800 (PST) 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, radeon, sched drm-next-5.1 Date: Thu, 21 Feb 2019 16:41:34 -0500 Message-Id: <20190221214134.3308-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=TtEnJUT/hjcu+miOfXUQqxP2upAzKIzlcayVnA7UGO4=; b=Os/SnBQncVsZyr8Ow4QtbBaQoOmh/DC/OfgU4gP2iBodDx9h/Mno4oCMtKr476ERCz gHyWWVvXhFemrFfhFBwbRKLBdLyzTZcDp+ZaTJs7n1avpEvO3NGX0n14/uwr7d1y3E+B DEANHUZHaMvIb0O9T0YuoJYzZLEtPDNJO9DmaywvfL9MuJ5ogKnm3Mvr6OsvmtZS5WD3 KA54me5MDpfbDnN8DGdoXxsfcNBxhN9ezfsTAjF5jSXOS89CKpHB7S6s30YfqGSdl0kV jdQxpZlptJ83iH7c+ABSOqEWAWAFx0RL7JhBNqBOYuKC9npm9O6MCFDWDrr2Bpwlviz5 LgzQ== 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, Fixes for 5.1: amdgpu: - Fix missing fw declaration after dropping old CI DPM code - Fix debugfs access to registers beyond the MMIO bar size - Fix context priority handling - Add missing license on some new files - Various cleanups and bug fixes radeon: - Fix missing break in CS parser for evergreen - Various cleanups and bug fixes sched: - Fix entities with 0 run queues The following changes since commit 16065fcdd19ddb9e093192914ac863884f308766: drm/virtio: do NOT reuse resource ids (2019-02-11 14:44:10 +1000) are available in the Git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-5.1 for you to fetch changes up to 767e06a9924162ce8ca5890533932174b04471f3: drm/amdgpu: Bump amdgpu version for context priority override. (2019-02-21 15:52:56 -0500) ---------------------------------------------------------------- Alex Deucher (6): drm/amdgpu/powerplay: declare firmware for CI cards drm/amdgpu: don't clamp debugfs register access to the BAR size drm/amdgpu: remove some old unused dpm helpers drm/amdgpu: add missing license on baco files drm/amdgpu/powerplay: fix return codes in BACO code drm/amdgpu/powerplay: fix typo in BACO header guards Andrey Grodzovsky (1): drm/amd/display: Fix deadlock with display during hanged ring recovery. Anthony Koo (2): drm/amd/display: remove screen flashes on seamless boot drm/amd/display: Increase precision for backlight curve Bas Nieuwenhuizen (5): drm/sched: Fix entities with 0 rqs. drm/amdgpu: Only add rqs for initialized rings. drm/amdgpu: Check if fd really is an amdgpu fd. drm/amdgpu: Add command to override the context priority. drm/amdgpu: Bump amdgpu version for context priority override. Christian König (3): drm/amdgpu: cleanup amdgpu_ih_process a bit more drm/amdgpu: cleanup setting bulk_movable drm/amdgpu: partial revert cleanup setting bulk_movable v2 Colin Ian King (1): drm/amdgpu: fix several indentation issues Felix Kuehling (4): drm/amdgpu: Add helper to wait for BO fences using a sync object drm/amdgpu: Replace ttm_bo_wait with amdgpu_bo_sync_wait drm/amdgpu: Avoid setting off KFD eviction fences in amdgpu_vm drm/amdgpu: Simplify eviction fence handling Gary Kattan (1): drm/amd/display: Ungate stream before programming registers Gustavo A. R. Silva (9): drm/amd/display/dc/bios_parser2: Mark expected switch fall-throughs drm/radeon/si_dpm: Mark expected switch fall-throughs drm/amd/display/dce_mem_input: Mark expected switch fall-through drm/amd/powerplay/smu7_hwmgr: Mark expected switch fall-throughs drm/radeon/ci_dpm: Mark expected switch fall-throughs drm/amdgpu/si_dpm: Mark expected switch fall-throughs drm/radeon/evergreen_cs: fix missing break in switch statement drm/amd/powerplay/smu8_hwmgr: use struct_size() in kzalloc() drm/amd/powerplay/smu10_hwmgr: use struct_size() in kzalloc() Josip Pavic (2): drm/amd/display: send pipe set command to dmcu when stream unblanks drm/amd/display: send pipe set command to dmcu when backlight is set Nicholas Kazlauskas (5): drm/amd/display: Fix wrong z-order when updating overlay planes drm/amd/display: Don't expose support for DRM_FORMAT_RGB888 drm/amd/display: Fix update type mismatches in atomic check drm/amd/display: Do cursor updates after stream updates drm/amd/display: Clear stream->mode_changed after commit Yong Zhao (8): drm/amdgpu: Fix bugs in setting CP RB/MEC DOORBELL_RANGE registers drm/amdgpu: Delete user queue doorbell variables drm/amdkfd: Move a constant definition around drm/amdgpu: Add first_non_cp and last_non_cp in amdgpu_doorbell_index drm/amdkfd: Fix bugs regarding CP queue doorbell mask on SOC15 drm/amdkfd: Optimize out sdma doorbell array in kgd2kfd_shared_resources Revert "drm/amdgpu: Delete user queue doorbell variables" Revert "drm/amdgpu: Fix bugs in setting CP RB/MEC DOORBELL_RANGE registers" Yongqiang Sun (1): drm/amd/display: Refactor for setup periodic interrupt. wentalou (1): drm/amdgpu: tighten gpu_recover in mailbox_flr to avoid duplicate recover in sriov drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 47 ++---- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 138 ++------------- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 9 + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 88 ---------- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 9 - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 19 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 48 ++---- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 24 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 51 +++++- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 38 +---- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 3 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +- drivers/gpu/drm/amd/amdgpu/si.c | 2 +- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 2 + drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 4 + drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 4 + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 16 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 22 ++- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 14 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 81 +++++++-- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 + drivers/gpu/drm/amd/display/dc/core/dc.c | 15 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 24 ++- drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 45 ++--- drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 2 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 22 ++- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 185 ++++++++++++++++++++- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 2 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 133 ++------------- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 13 +- drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 1 + .../drm/amd/display/dc/inc/hw/timing_generator.h | 23 +-- drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 12 ++ drivers/gpu/drm/amd/display/include/dal_asic_id.h | 3 + .../drm/amd/display/modules/power/power_helpers.c | 23 +-- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 19 +-- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 8 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 + .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 8 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.c | 26 ++- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.h | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 28 +++- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.h | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 4 + drivers/gpu/drm/radeon/ci_dpm.c | 2 + drivers/gpu/drm/radeon/evergreen_cs.c | 1 + drivers/gpu/drm/radeon/si_dpm.c | 2 + drivers/gpu/drm/scheduler/sched_entity.c | 39 +++-- include/uapi/drm/amdgpu_drm.h | 3 +- 60 files changed, 701 insertions(+), 612 deletions(-)