From patchwork Wed Jul 25 21:53:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 10544855 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 DB2F19093 for ; Wed, 25 Jul 2018 21:53:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA69E212D8 for ; Wed, 25 Jul 2018 21:53:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE90B2AC24; Wed, 25 Jul 2018 21:53:42 +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 410B32AC23 for ; Wed, 25 Jul 2018 21:53:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EB1C96E68D; Wed, 25 Jul 2018 21:53:39 +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 A07436E687; Wed, 25 Jul 2018 21:53:37 +0000 (UTC) Received: by mail-qt0-x242.google.com with SMTP id c15-v6so9251731qtp.0; Wed, 25 Jul 2018 14:53:37 -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=nQ8U/2fs02qHYXJ9d9IDBlWUVfVIhqi3EwRYN0dCeiU=; b=cN11M9qFh4fD4vexj8FVzYF1f/6TMfNs8JOxr7JoTyZ/4FRIdQHSbHDkjLk5n3Dk+7 ED9RdhoqKndKBHvaxEecQXIsRdEpuUoNP4uyB5ynEIM/CopmBBnAKwylx39cl3idiQO9 AeY7a6jZGEOHmApE1vjb/uF91cEh++6pKHsC0MZBcnTrVfdj39oEEOARg5aPD+uuZCYN yttoXQWp5/+NhJ1TwEwfF996bxyl+zU+EAXct9OKZW1P9vfTfDB5a3iKBWHTeRDRs4YK LytIZwWhelNvGnFHrEu+r1qiIQejOE+oOyCC4+7fkEbxvJ0XwFy0pE4yE+WezwMQ2ZBm lDtg== X-Gm-Message-State: AOUpUlHkveramqGTgQNuVQem5z/K/3pC0qBAeGTc5icDNF0WrcBSwpTP WsB0wuOpEi50VUk01SAZLzehK6AYO8c= X-Google-Smtp-Source: AAOMgpdIRmUV+i8Q+Z7yZfzyEyhetatEUooYOKfR5JEoRuM5FmCOoxI0H+yA4sPazKiBL9baApNtMA== X-Received: by 2002:ac8:6681:: with SMTP id d1-v6mr21694502qtp.94.1532555616492; Wed, 25 Jul 2018 14:53:36 -0700 (PDT) Received: from localhost.localdomain ([76.1.164.143]) by smtp.gmail.com with ESMTPSA id 49-v6sm11326545qtu.0.2018.07.25.14.53.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Jul 2018 14:53:35 -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, scheduler, drm-next-4.19 Date: Wed, 25 Jul 2018 16:53:26 -0500 Message-Id: <20180725215326.2709-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, Updates for 4.19. Mostly bug fixes and cleanups. Highlights: - Internal API cleanup in GPU scheduler - Decouple i2c and aux abstractions in DC - Update maintainers - Misc cleanups - Misc bug fixes The following changes since commit 500775074f88d9cf5416bed2ca19592812d62c41: Merge branch 'drm-next-4.19' of git://people.freedesktop.org/~agd5f/linux into drm-next (2018-07-20 14:54:31 +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 586092ab4b768b01b3184d9a2541e2cf9a8d9740: gpu: drm: amdgpu: Replace mdelay with msleep in cik_pcie_gen3_enable() (2018-07-25 15:06:40 -0500) ---------------------------------------------------------------- Alex Deucher (5): drm/amdgpu/apci: don't call sbios request function if it's not supported drm/amdgpu/acpi: skip backlight events for DC drm/amdgpu: split ip suspend into 2 phases drm/amdgpu: rework suspend and resume to deal with atomic changes drm/amdgpu/gmc9: clarify GPUVM fault error message Andrey Grodzovsky (1): drm/amdgpu: Fix warning in dma_fence_is_later on resume from S3. Bhawanpreet Lakha (1): drm/amd/display: Decouple aux from i2c Christian König (7): drm/amdgpu: clean up coding style a bit drm/amdgpu: expose only the first UVD instance for now MAINTAINERS: add new TTM maintainers MAINTAINERS: Add separate section for DC MAINTAINERS: add entry for AMD PP code drm/amdgpu: consistenly name amdgpu_bo_ functions drm/amdgpu: reduce the number of placements for a BO Colin Ian King (1): drm/amdgpu: fix spelling mistake "successed" -> "succeeded" David Francis (1): drm/amd/display: On dce100, set clocks to 0 on suspend Evan Quan (3): drm/amd/powerplay: slow UCLK switch when multiple displays not in sync drm/amd/powerplay: correct the argument for PPSMC_MSG_SetUclkFastSwitch drm/amd/powerplay: allow slow switch only if NBPState enabled v2 Harry Wentland (3): drm/amd/display: Drop unused backlight functions in DM drm/amd/display: Honor pplib stutter mask for all ASICs in DC drm/amd/display: DC 3.1.58 Jia-Ju Bai (1): gpu: drm: amdgpu: Replace mdelay with msleep in cik_pcie_gen3_enable() Jun Lei (1): drm/amd/display: separate dc_debug into dc_debug_options and dc_debug data Michel Dänzer (2): drm/amdgpu: Fix RLC safe mode test in gfx_v9_0_enter_rlc_safe_mode drm/amdgpu: Don't warn on destroying a pinned BO Mikita Lipski (1): drm/amd/display: Remove unnecessary warning Nayan Deshmukh (2): drm/scheduler: modify API to avoid redundancy drm/scheduler: remove sched field from the entity Rex Zhu (4): drm/amd/pp: Read vbios vddc limit before use them drm/amd/pp: Update clk with od setting when set power state drm/amd/pp: Set Max clock level to display by default drm/amd/display: Convert 10kHz clks from PPLib into kHz Shirish S (3): drm/amdgpu: lock and unlock console only for amdgpu_fbdev_set_suspend [V5] drm/amdgpu: use drm_fb helper for console_(un)lock drm/amdgpu: move the amdgpu_fbdev_set_suspend() further up Tony Cheng (1): drm/amd/display: allow diags to skip initial link training vikrant mhaske (1): drm/amd/display: DPP CM ICSC AYCRCB8888 format support MAINTAINERS | 19 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 55 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 204 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 27 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 38 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 10 +- drivers/gpu/drm/amd/amdgpu/cik.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 25 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 4 +- drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 22 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 9 +- drivers/gpu/drm/amd/display/dc/dc.h | 22 +- drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 2 +- drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 942 +++++++++++++++++++++ drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 111 +++ drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 4 +- .../amd/display/dc/dce100/dce100_hw_sequencer.c | 4 - .../drm/amd/display/dc/dce100/dce100_resource.c | 61 +- .../drm/amd/display/dc/dce110/dce110_resource.c | 45 + .../drm/amd/display/dc/dce112/dce112_resource.c | 47 + .../drm/amd/display/dc/dce120/dce120_resource.c | 44 +- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 44 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 4 + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 48 +- drivers/gpu/drm/amd/display/dc/i2caux/engine.h | 1 + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/hw/aux_engine.h | 113 +++ drivers/gpu/drm/amd/display/dc/inc/hw/engine.h | 106 +++ drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 9 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 32 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 5 +- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 3 +- drivers/gpu/drm/etnaviv/etnaviv_sched.c | 4 +- drivers/gpu/drm/scheduler/gpu_scheduler.c | 33 +- drivers/gpu/drm/scheduler/sched_fence.c | 2 +- drivers/gpu/drm/v3d/v3d_drv.c | 4 +- drivers/gpu/drm/v3d/v3d_gem.c | 2 - include/drm/gpu_scheduler.h | 12 +- 58 files changed, 1933 insertions(+), 292 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_aux.c create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_aux.h create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/aux_engine.h create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/engine.h