From patchwork Fri Mar 12 01:35:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dave Airlie X-Patchwork-Id: 12133575 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B17BC433E0 for ; Fri, 12 Mar 2021 01:35:49 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 12EE764F90 for ; Fri, 12 Mar 2021 01:35:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 12EE764F90 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E0636E077; Fri, 12 Mar 2021 01:35:48 +0000 (UTC) Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 30CB76E077 for ; Fri, 12 Mar 2021 01:35:47 +0000 (UTC) Received: by mail-ej1-x62d.google.com with SMTP id ox4so34671875ejb.11 for ; Thu, 11 Mar 2021 17:35:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to:cc :content-transfer-encoding; bh=cbgBFf+BEA9xs4Z7rCDOKTIFOgdpu3jcVQ672BqRb0Q=; b=mryrvoSzymEiw7kiNIes9XS4UStg997NHG7vwovJf/sd7khHJGjzf+ZPz+ev62QofL sb/2agaBU229XuvRI+D01VCQRUJh28YY0TN7I3uUdWK0p43V9VV+DYNfSdEgJI0/xZAT NvfNll0B00OnkyQ8zCjM49LYmXVNTjXZjsvDz2MyGOWw3IaSTVGpqMZzJmuL5hOAd+zr HtwXCwpQ1v7J9rH/YFcZf8cdtIZhhmQuIdNQJmCw9f4Mhb5RgfR31YbpLo+tHCCQkDcB +MddgzB6sLpIf08EmNWtzSEDFdHlAogNrmoRrYExVbeXyO5vVxhbXMkiEn/5+1T/CBJg y+mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc :content-transfer-encoding; bh=cbgBFf+BEA9xs4Z7rCDOKTIFOgdpu3jcVQ672BqRb0Q=; b=EJQIA0qv6Wsm/C9ZthvIpWro3W/oARUhdxAP8rMdtFhaVxtIzrcFnRdd0wdHL3a2x2 XowKC4D2QXGwUL7Nd1v7hFxpHGZhLiaFKNgyebRyczNR0J5QwWFM+3kOPwLpgWgs6CSI Cg3VPt7WANns5Pu+oFyHJl2bNs6r4rpBcyjareLEwcEPNyCbSNs3CjPp4N0XGfPCn7c0 6VTcEoxRbs/Mf8H8sUHDrvvSyMujKkZyxsA72f0B0RKoTyPNIXnBLPe7Hk1B6NQ08OYJ ZDzPevSXqSKCy8OR+cInDm+9g34GFUSluwdOaXT3jJj8GC1ZpKrSVc016h/mHDCT2Mp4 OByg== X-Gm-Message-State: AOAM531qwrLG9dfOEI6DUiJoD7Rf3UyUXo8SxZ02v5mb7QWt8gxWZUz1 kvn0b4ezggfKE4xVNIusO4mxv5u6iuG2Jhj1Fyk= X-Google-Smtp-Source: ABdhPJwUphkl1Z3MNf5inuSvFRT7d4jByhZeBPXpESv7o9mueqYXpUIvJyOzelfskC9fkqPsiz9HehIpRUUBZpDf7nQ= X-Received: by 2002:a17:906:ad96:: with SMTP id la22mr6124304ejb.237.1615512945694; Thu, 11 Mar 2021 17:35:45 -0800 (PST) MIME-Version: 1.0 From: Dave Airlie Date: Fri, 12 Mar 2021 11:35:33 +1000 Message-ID: Subject: [git pull] drm fixes for 5.12-rc3 To: Linus Torvalds , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: LKML , dri-devel Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Linus, Regular fixes for rc3. The i915 pull was based on the rc1 tag so I just cherry-picked the single fix from there to avoid it. The misc and amd trees seem to be on okay bases. It's a bunch of fixes across the tree, amdgpu has most of them a few ttm fixes around qxl, and nouveau. Dave. drm-fixes-2021-03-12-1: drm fixes for 5.12-rc3 core: - Clear holes when converting compat ioctl's between 32-bits and 64-bits. docs: - Use gitlab for drm bugzilla now. ttm: - Fix ttm page pool accounting. fbdev: - Fix oops in drm_fbdev_cleanup() shmem: - Assorted fixes for shmem helpers. qxl: - unpin qxl bos created as pinned when freeing them, and make ttm only warn once on this behavior. - Zero head.surface_id correctly in qxl. atyfb: - Use LCD management for atyfb on PPC_MAC. meson: - Shutdown kms poll helper in meson correctly. nouveau: - fix regression in bo syncing i915: - Wedge the GPU if command parser setup fails amdgpu: - Fix aux backlight control - Add a backlight override parameter - Various display fixes - PCIe DPM fix for vega - Polaris watermark fixes - Additional S0ix fix radeon: - Fix GEM regression - Fix AGP dependency handling The following changes since commit a38fd8748464831584a19438cbb3082b5a2dab15: Linux 5.12-rc2 (2021-03-05 17:33:41 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-03-12-1 for you to fetch changes up to 4042160c2e5433e0759782c402292a90b5bf458d: drm/nouveau: fix dma syncing for loops (v2) (2021-03-12 11:21:47 +1000) ---------------------------------------------------------------- drm fixes for 5.12-rc3 core: - Clear holes when converting compat ioctl's between 32-bits and 64-bits. docs: - Use gitlab for drm bugzilla now. ttm: - Fix ttm page pool accounting. fbdev: - Fix oops in drm_fbdev_cleanup() shmem: - Assorted fixes for shmem helpers. qxl: - unpin qxl bos created as pinned when freeing them, and make ttm only warn once on this behavior. - Zero head.surface_id correctly in qxl. atyfb: - Use LCD management for atyfb on PPC_MAC. meson: - Shutdown kms poll helper in meson correctly. nouveau: - fix regression in bo syncing i915: - Wedge the GPU if command parser setup fails amdgpu: - Fix aux backlight control - Add a backlight override parameter - Various display fixes - PCIe DPM fix for vega - Polaris watermark fixes - Additional S0ix fix radeon: - Fix GEM regression - Fix AGP dependency handling ---------------------------------------------------------------- Alex Deucher (4): drm/amdgpu/display: simplify backlight setting drm/amdgpu/display: don't assert in set backlight function drm/amdgpu/display: handle aux backlight in backlight_get_brightness drm/amdgpu: fix S0ix handling when the CONFIG_AMD_PMC=m Anthony DeRossi (1): drm/ttm: Fix TTM page pool accounting Artem Lapkin (1): drm: meson_drv add shutdown function Christian König (3): drm/radeon: also init GEM funcs in radeon_gem_prime_import_sg_table drm/radeon: fix AGP dependency drm/ttm: soften TTM warnings Colin Ian King (1): qxl: Fix uninitialised struct field head.surface_id Daniel Vetter (1): drm/compat: Clear bounce structures Dave Airlie (3): Merge tag 'drm-misc-fixes-2021-03-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'amd-drm-fixes-5.12-2021-03-10' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes drm/nouveau: fix dma syncing for loops (v2) Dillon Varone (1): drm/amd/display: Enabled pipe harvesting in dcn30 Evan Quan (1): drm/amd/pm: correct the watermark settings for Polaris Gerd Hoffmann (2): drm/qxl: unpin release objects drm/qxl: fix lockdep issue in qxl_alloc_release_reserved Holger Hoffstätte (2): drm/amd/display: Fix nested FPU context in dcn21_validate_bandwidth() drm/amdgpu/display: use GFP_ATOMIC in dcn21_validate_bandwidth_fp() Kenneth Feng (1): drm/amd/pm: bug fix for pcie dpm Neil Roberts (2): drm/shmem-helper: Check for purged buffers in fault handler drm/shmem-helper: Don't remove the offset in vm_area_struct pgoff Nirmoy Das (1): drm/amdgpu: fb BO should be ttm_bo_type_device Noralf Trønnes (1): drm/shmem-helpers: vunmap: Don't put pages for dma-buf Pavel Turinský (1): MAINTAINERS: update drm bug reporting URL Qingqing Zhuo (1): drm/amd/display: Enable pflip interrupt upon pipe enable Randy Dunlap (2): fbdev: atyfb: always declare aty_{ld,st}_lcd() fbdev: atyfb: use LCD management functions for PPC_PMAC also Sung Lee (1): drm/amd/display: Revert dram_clock_change_latency for DCN2.1 Takashi Iwai (1): drm/amd/display: Add a backlight module option Thomas Zimmermann (1): drm: Use USB controller's DMA mask when importing dmabufs Tong Zhang (1): drm/fb-helper: only unmap if buffer not null Tvrtko Ursulin (1): drm/i915: Wedge the GPU if command parser setup fails Zhan Liu (1): drm/amdgpu/display: Use wm_table.entries for dcn301 calculate_wm Documentation/gpu/todo.rst | 21 +++++ MAINTAINERS | 2 +- drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 50 ++++++----- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 1 - drivers/gpu/drm/amd/display/dc/dc.h | 1 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 11 +++ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 6 ++ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 7 ++ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 1 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 6 ++ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 1 + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 8 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 1 + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 31 +++++++ .../drm/amd/display/dc/dcn301/dcn301_resource.c | 96 +++++++++++++++++++++- drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 8 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 48 +++++++++++ .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 66 +++++++++++++++ .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 48 ++++++----- drivers/gpu/drm/drm_fb_helper.c | 2 +- drivers/gpu/drm/drm_gem_shmem_helper.c | 32 +++++--- drivers/gpu/drm/drm_ioc32.c | 11 +++ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 7 +- drivers/gpu/drm/i915/i915_cmd_parser.c | 19 +++-- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/meson/meson_drv.c | 11 +++ drivers/gpu/drm/nouveau/nouveau_bo.c | 6 +- drivers/gpu/drm/qxl/qxl_display.c | 1 + drivers/gpu/drm/qxl/qxl_release.c | 12 ++- drivers/gpu/drm/radeon/radeon.h | 2 + drivers/gpu/drm/radeon/radeon_gem.c | 4 +- drivers/gpu/drm/radeon/radeon_prime.c | 2 + drivers/gpu/drm/tiny/gm12u320.c | 44 ++++++++-- drivers/gpu/drm/ttm/ttm_bo.c | 8 +- drivers/gpu/drm/ttm/ttm_pool.c | 4 +- drivers/gpu/drm/udl/udl_drv.c | 17 ++++ drivers/gpu/drm/udl/udl_drv.h | 1 + drivers/gpu/drm/udl/udl_main.c | 10 +++ drivers/usb/core/usb.c | 32 ++++++++ drivers/video/fbdev/aty/atyfb.h | 3 - drivers/video/fbdev/aty/atyfb_base.c | 9 +- include/linux/usb.h | 2 + 48 files changed, 566 insertions(+), 100 deletions(-)