From patchwork Fri May 14 21:02:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dave Airlie X-Patchwork-Id: 12258989 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.6 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 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 B3879C433B4 for ; Fri, 14 May 2021 21:02:58 +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 7081161442 for ; Fri, 14 May 2021 21:02:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7081161442 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 F09086E311; Fri, 14 May 2021 21:02:57 +0000 (UTC) Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF7B66E311 for ; Fri, 14 May 2021 21:02:56 +0000 (UTC) Received: by mail-ed1-x52c.google.com with SMTP id r11so29765edt.13 for ; Fri, 14 May 2021 14:02:56 -0700 (PDT) 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=ProY55k5ekiZ8lOnAY4fJDoMbyGsmSug4xwolpHstgY=; b=RIjK/rkqtB7BQ4HcjQDYq/sHK0SVPr8GXSNY1nXO4C0hDtZ4lnwAOsOc2PaVwJKuRA nS7L7KXf1lygsL/PDuaeGzhN4FPFU539jnps2JiQpZzz08A1RiUwea4fnXNToMipzULl wzwmuKR8/kZQ4dEWKYSHPBIc19j9v2iUUy8e+sa6Fg1gXZf8n/RhXDdHbtc/auELaAZ8 vklGuRMZYlfHkhAyeFt3YqL6hGKzcELYq4PF65+fDVtf7BvW5BYvkpnRgNrT0aWgmhn+ wjEvipPB9Mkp4771cy7uHspENGmSnO9jCMcBeou2PBhSGTVF2MhTbghNcWtz88q3jdZw l4xQ== 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=ProY55k5ekiZ8lOnAY4fJDoMbyGsmSug4xwolpHstgY=; b=shirVsgsdliUDdaSjR+u0/lhzsCCH6inYyvkeoyS8+VIDaKx4Vj6/yTFJZI3BaFTMp 0jxjVOK3YS7+c1nokL/s5lMiq2GpTEv7FOot4+AGstJ40prkIeVhX5mWCqfjQjbtBZXX 0gjObkIJUNBTh3qjmLbtKT0TGps298dr46RbOjSFcaLRO2PHuoN+sdQeGXCSP4sB0nzE qnkug5mYdENUYPL6n4LHcCG5sPg2Pae9JQg3732XQhDjvACP3DiMrvFRemOH5Ul8qh9O Wf5nViKSLigZ5L+s7SpIVGoauPct085D4P3tXhaGGwEg0BLf5bgU423kMkw4gCH0gH5R dQIg== X-Gm-Message-State: AOAM532p4XlEA3Ix0Eagqf13Obckr4yDV7SAtMFCVAiNDRGUx2Nalb9U E54xtovIKHbufW0Z5f7YHkXSxO2a7TGSODsHXRZEyN5O6dM= X-Google-Smtp-Source: ABdhPJwkjffJer2TwFDBA4jdDZ2QpUBoL1vVxFiJIQNI52ubpGqhn/brKjvnj4e4NwrB9PQo2kHTxICndbzHh3C4vVY= X-Received: by 2002:a05:6402:441:: with SMTP id p1mr58502908edw.298.1621026175577; Fri, 14 May 2021 14:02:55 -0700 (PDT) MIME-Version: 1.0 From: Dave Airlie Date: Sat, 15 May 2021 07:02:44 +1000 Message-ID: Subject: [git pull] drm fixes for 5.13-rc2 (part two) 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" Hey, Looks like I wasn't the only one not fully switched on this week, the msm pull has a missing tag so I missed it, and i915 team were a bit late. In my defence I did have a day with the roof of my home office removed, so was sitting at my kids desk. Dave. drm-fixes-2021-05-15: drm fixes for 5.13-rc2 (part two) msm: - dsi regression fix - dma-buf pinning fix - displayport fixes - llc fix i915: - Fix active callback alignment annotations and subsequent crashes - Retract link training strategy to slow and wide, again - Avoid division by zero on gen2 - Use correct width reads for C0DRB3/C1DRB3 registers - Fix double free in pdp allocation failure path - Fix HDMI 2.1 PCON downstream caps check The following changes since commit 08f0cfbf739a5086995f0779bbcb607163128a9a: Merge tag 'amd-drm-fixes-5.13-2021-05-13' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2021-05-14 09:20:04 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-05-15 for you to fetch changes up to 5dce58de4be8a4c9f2af3beed3ee9813933a0583: Merge tag 'drm-msm-fixes-2021-05-09' of https://gitlab.freedesktop.org/drm/msm into drm-fixes (2021-05-15 06:52:15 +1000) ---------------------------------------------------------------- drm fixes for 5.13-rc2 (part two) msm: - dsi regression fix - dma-buf pinning fix - displayport fixes - llc fix i915: - Fix active callback alignment annotations and subsequent crashes - Retract link training strategy to slow and wide, again - Avoid division by zero on gen2 - Use correct width reads for C0DRB3/C1DRB3 registers - Fix double free in pdp allocation failure path - Fix HDMI 2.1 PCON downstream caps check ---------------------------------------------------------------- Ankit Nautiyal (1): drm/i915: Use correct downstream caps for check Src-Ctl mode for PCON Dave Airlie (2): Merge tag 'drm-intel-fixes-2021-05-14' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'drm-msm-fixes-2021-05-09' of https://gitlab.freedesktop.org/drm/msm into drm-fixes Dmitry Baryshkov (2): drm/msm/dsi: dsi_phy_28nm_8960: fix uninitialized variable access drm/msm/dsi: fix msm_dsi_phy_get_clk_provider return code Jonathan Marek (2): drm/msm: fix LLC not being enabled for mmu500 targets drm/msm: fix minor version to indicate MSM_PARAM_SUSPENDS support Kai-Heng Feng (1): drm/i915/dp: Use slow and wide link training for everything Kuogee Hsieh (2): drm/msm/dp: check sink_count before update is_connected status drm/msm/dp: initialize audio_comp when audio starts Lv Yunlong (1): drm/i915/gt: Fix a double free in gen8_preallocate_top_level_pdp Rob Clark (1): drm/msm: Do not unpin/evict exported dma-buf's Stéphane Marchesin (1): drm/i915: Fix crash in auto_retire Tvrtko Ursulin (1): drm/i915/overlay: Fix active retire callback alignment Ville Syrjälä (2): drm/i915: Avoid div-by-zero on gen2 drm/i915: Read C0DRB3/C1DRB3 as 16 bits again drivers/gpu/drm/i915/display/intel_dp.c | 61 +++---------------------- drivers/gpu/drm/i915/display/intel_overlay.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 1 - drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 4 +- drivers/gpu/drm/i915/i915_active.c | 3 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 9 ++-- drivers/gpu/drm/msm/dp/dp_audio.c | 1 + drivers/gpu/drm/msm/dp/dp_display.c | 26 +++++++---- drivers/gpu/drm/msm/dp/dp_display.h | 1 + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 +- drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 4 ++ drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/msm/msm_gem.c | 16 ++++++- drivers/gpu/drm/msm/msm_gem.h | 4 +- 15 files changed, 59 insertions(+), 79 deletions(-)