From patchwork Sat Apr 23 05:18:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dave Airlie X-Patchwork-Id: 12824424 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D88BFC433F5 for ; Sat, 23 Apr 2022 05:18:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DEC6810FAD2; Sat, 23 Apr 2022 05:18:56 +0000 (UTC) Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0001C10FACF for ; Sat, 23 Apr 2022 05:18:55 +0000 (UTC) Received: by mail-ej1-x636.google.com with SMTP id y20so19976741eju.7 for ; Fri, 22 Apr 2022 22:18:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to:cc :content-transfer-encoding; bh=FSLBd1Ysis1ZqaWu6Zoyxjq+Ki98jPbY3SmhIZw4EwE=; b=IV4z1ZP/uQ3FlyiVUNFu/3mdSaYgUs3AVLD2EJxXOf10Lg0S7d+77yfrxIgXsvuUwI lLWLdJzEjCZh/wIRJKdnkQzZ6/zf1P5NTRXokPdvMGcqN3Sl1SU5UFqgoHw473PAU6+I 3ydQyK3XcT4yu5SnyaLktw9DBCLcVQh/hjCR5KhVEDIylFrmKHSWM70YeGPCPywt9bwc 6GwJJR2halIn7NhwGBihFo7CmLlA6QUJ26SOeK4liFx3K9He1jRWt84r6LAX4CNm8MuS gH515uA9JvcPUHb26ubw4w0NAxlQ+xd87GQ+9fYch8bUGM/R+b4Lt638OI4/0SMXzuTJ 9edA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc :content-transfer-encoding; bh=FSLBd1Ysis1ZqaWu6Zoyxjq+Ki98jPbY3SmhIZw4EwE=; b=jGwAQUI3MHN1zjQRo/aXCil5AHfbuAXEh07zu21n0bZuTB5cZ0/BobdqFZ/8M3qrh1 fnYFyhf4hwBtQG4Aaah1ikxY6Ve6+Pzx8aRfKmAtpYsr2ER50AMzcdhDDdJcA5qt9wRp szKnq+Y2VTfAFGASV4tsdkdRrlONrwqn3qEpFEuY10cVlx7yhXrzsAu28h0993xyJktM /ZhpyB1e1L3PzdtqZDPeiUiJJzRWtb4vN3wcmr/CP2OOk/n/TKhn3BKT25pgWG6Bp93X RKRUT6nvHyNeOF8WoUKjmfckDYZFK2VRcIbix7Ds929gA8BmMCi2Ns3Uwh3ZA49MS5f6 lm8Q== X-Gm-Message-State: AOAM5312WypqcBNzzO3BNm+cyATiohTIdEZFjCpxCAYWXxdk3ifcA9JO lLQwb7dIwWoLP67GERD8plqsrgzDrEFDt458nrg= X-Google-Smtp-Source: ABdhPJyvc8cz+2ghAyYyfb1+6ZWEzgPG15m+aRsXu6N6K2pkN+1K5j3DYFhxq1eACxb4Nvjpu0UN2IlcK4p4T8n9gHU= X-Received: by 2002:a17:906:4794:b0:6f3:7569:77fd with SMTP id cw20-20020a170906479400b006f3756977fdmr829165ejc.266.1650691134325; Fri, 22 Apr 2022 22:18:54 -0700 (PDT) MIME-Version: 1.0 From: Dave Airlie Date: Sat, 23 Apr 2022 15:18:43 +1000 Message-ID: Subject: [git pull] drm fixes for 5.18-rc4 (part 2) 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, Maarten was away, so Maxine stepped up and sent me the drm-fixes merge, so no point leaving it for another week. The big change is an OF revert around bridge/panels, it may have some driver fallout, but hopefully this revert gets them shook out in the next week easier. Otherwise it's a bunch of locking/refcounts across drivers, a radeon dma_resv logic fix and some raspberry pi panel fixes. Regards, Dave. drm-fixes-2022-04-23: drm fixes for 5.18-rc4 - 2nd part panel: - revert of patch that broke panel/bridge issues dma-buf: - remove unused header file. amdgpu: - partial revert of locking change radeon: - fix dma_resv logic inversion panel: - pi touchscreen panel init fixes vc4: - build fix - runtime pm refcount fix vmwgfx: - refcounting fix The following changes since commit 70da382e1c5b9b2049c10abfd4489a40c1b60df0: Merge tag 'drm-msm-fixes-2022-04-20' of https://gitlab.freedesktop.org/drm/msm into drm-fixes (2022-04-22 09:25:47 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2022-04-23 for you to fetch changes up to c18a2a280c073f70569a91ef0d7434d12e66e200: Merge tag 'drm-misc-fixes-2022-04-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2022-04-23 15:00:44 +1000) ---------------------------------------------------------------- drm fixes for 5.18-rc4 - 2nd part panel: - revert of patch that broke panel/bridge issues dma-buf: - remove unused header file. amdgpu: - partial revert of locking change radeon: - fix dma_resv logic inversion panel: - pi touchscreen panel init fixes vc4: - build fix - runtime pm refcount fix vmwgfx: - refcounting fix ---------------------------------------------------------------- Bjorn Andersson (2): Revert "drm: of: Properly try all possible cases for bridge/panel detection" Revert "drm: of: Lookup if child node has panel or bridge" Christian König (2): drm/radeon: fix logic inversion in radeon_sync_resv drm/amdgpu: partial revert "remove ctx->lock" v2 Dave Airlie (1): Merge tag 'drm-misc-fixes-2022-04-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Dave Stevenson (2): drm/panel/raspberrypi-touchscreen: Avoid NULL deref if not initialised drm/panel/raspberrypi-touchscreen: Initialise the bridge in prepare Karol Herbst (1): dma-buf-map: remove renamed header file Miaoqian Lin (1): drm/vc4: Use pm_runtime_resume_and_get to fix pm_runtime_get_sync() usage Zack Rusin (1): drm/vmwgfx: Fix gem refcounting and memory evictions Zheng Bin (1): drm/vc4: Fix build error when CONFIG_DRM_VC4=y && CONFIG_RASPBERRYPI_FIRMWARE=m drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 21 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 1 + drivers/gpu/drm/drm_of.c | 84 +++---- .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 13 +- drivers/gpu/drm/radeon/radeon_sync.c | 2 +- drivers/gpu/drm/vc4/Kconfig | 3 + drivers/gpu/drm/vc4/vc4_dsi.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 43 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 7 +- include/linux/dma-buf-map.h | 266 --------------------- 12 files changed, 94 insertions(+), 358 deletions(-) delete mode 100644 include/linux/dma-buf-map.h