From patchwork Thu Oct 31 19:30:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11221805 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4E0831390 for ; Thu, 31 Oct 2019 19:30:22 +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 354BB2080F for ; Thu, 31 Oct 2019 19:30:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 354BB2080F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run 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 85F5A6E130; Thu, 31 Oct 2019 19:30:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yb1-xb44.google.com (mail-yb1-xb44.google.com [IPv6:2607:f8b0:4864:20::b44]) by gabe.freedesktop.org (Postfix) with ESMTPS id D2A276E12C for ; Thu, 31 Oct 2019 19:30:17 +0000 (UTC) Received: by mail-yb1-xb44.google.com with SMTP id q143so2825930ybg.12 for ; Thu, 31 Oct 2019 12:30:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:content-transfer-encoding:user-agent; bh=G3PkBACuYMJVzOT27ElHgMKfES8XjIH0JhlZGbKIDb4=; b=Kmmsk6IppfDDPOSCzRwXNuQrXrTFBBbd9PA620CL4/ced4JlJtbwsm8TqecZiiAvCs WKujX2p8o/qHpit7ua6r0ESENOmPtRtpUaGHABD/J0MVksj5x6Xt31Bor9EoPn/sGMHo IMJXBSQjaHA3tX+Q37bfq387vH8HMeTc6UckkNvfu96JVm1XhlJOOSEnTMUsJ9ldBx35 jjQbgW1WWTEp0wcQtL2ZH2IO4lVLkr+td9vT08wuMto8OHY25fKR/RgBt2MdCekixFOf z/bf/uP3uMkBglV0WSGKG+jP6DZ8+QE0zFaJF9yNq2r7wqy4YnEMZ7UJ2ZwPCzGaRqbh U2EQ== X-Gm-Message-State: APjAAAW19LSqseqbNHu6omgDJtorseF7fvyZRQm19W9tcdMaq+yqrlyJ ygRAJfIygHnlSMxIphJjJM0DvA== X-Google-Smtp-Source: APXvYqyOKgH6MvRQQF14zM+hJ9+xDpZhlyJK4xBpVsliBTlJLTmnHA3Sj/dp/Iqw4DD6t663EC5BSA== X-Received: by 2002:a25:2fd1:: with SMTP id v200mr5577728ybv.484.1572550216807; Thu, 31 Oct 2019 12:30:16 -0700 (PDT) Received: from localhost ([2620:0:1013:11:89c6:2139:5435:371d]) by smtp.gmail.com with ESMTPSA id q2sm1409506ywd.12.2019.10.31.12.30.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Oct 2019 12:30:16 -0700 (PDT) Date: Thu, 31 Oct 2019 15:30:15 -0400 From: Sean Paul To: Dave Airlie , Daniel Vetter Subject: [PULL] drm-misc-next Message-ID: <20191031193015.GA243509@art_vandelay> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :content-transfer-encoding:user-agent; bh=G3PkBACuYMJVzOT27ElHgMKfES8XjIH0JhlZGbKIDb4=; b=IT+Cf6kimFd9mnKBC7wlFQ04N0eMPOCoVv6OISXRaId73Q1aOiq1uTCE6GkYb7Kx02 XvVtEeWw2XNARGP1uekXoLaJ+VbFQu1KETnMRMcj/6iGxYVXjaWON4fexuD09rbjwVuz bmmry/LCXClpXlVCkON+n6tk4EpY6A3cz10wypLibDM8M/1BegETklSmO7uFgzdnUCoe x77Vu1RASYD7++qRCtQxkM9fLA0y+mU10cpG5RneqLzW+rZGN89mgGLk/uJekRMTPpTn acweJoY3LbI8aTrBYE7D5kMK3TXdt9uh5XDWzPcwfASEidarTKd1lT5iENPD1862Nli0 8BhA== 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: dim-tools@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Christian =?iso-8859-1?q?K=F6nig?= , "Andrew F. Davis" , Thomas Zimmermann , Rodrigo Vivi , Sean Paul , Steven Price , Sean Paul , intel-gfx@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Dave & Daniel, Here's the last -misc-next pull request for 5.5. Lots of refactoring going on this week which results in a negative diffstat. Only thing to highlight is the dma-buf heap introduction and revert, which you are already aware of, so hopefully no other surprises here. drm-misc-next-2019-10-31: drm-misc-next for 5.5: UAPI Changes: -dma-buf: Introduce and revert dma-buf heap (Andrew/John/Sean) Cross-subsystem Changes: - None Core Changes: -dma-buf: add dynamic mapping to allow exporters to choose dma_resv lock state on mmap/munmap (Christian) -vram: add prepare/cleanup fb helpers to vram helpers (Thomas) -ttm: always keep bo's on the lru + ttm cleanups (Christian) -sched: allow a free_job routine to sleep (Steven) -fb_helper: remove unused drm_fb_helper_defio_init() (Thomas) Driver Changes: -bochs/hibmc/vboxvideo: Use new vram helpers for prepare/cleanup fb (Thomas) -amdgpu: Implement dma-buf import/export without drm helpers (Christian) -panfrost: Simplify devfreq integration in driver (Steven) Cc: Christian König Cc: Thomas Zimmermann Cc: Steven Price Cc: Andrew F. Davis Cc: John Stultz Cc: Sean Paul Cheers, Sean The following changes since commit 9a42c7c647a9ad0f7ebb147a52eda3dcb7c84292: drm/tegra: Move drm_dp_link helpers to Tegra DRM (2019-10-23 18:22:10 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2019-10-31 for you to fetch changes up to fae7d7d5f374eadbb0b5dd31b39162e7176e9c3d: Revert "dma-buf: Add dma-buf heaps framework" (2019-10-30 16:41:49 -0400) ---------------------------------------------------------------- drm-misc-next for 5.5: UAPI Changes: -dma-buf: Introduce and revert dma-buf heap (Andrew/John/Sean) Cross-subsystem Changes: - None Core Changes: -dma-buf: add dynamic mapping to allow exporters to choose dma_resv lock state on mmap/munmap (Christian) -vram: add prepare/cleanup fb helpers to vram helpers (Thomas) -ttm: always keep bo's on the lru + ttm cleanups (Christian) -sched: allow a free_job routine to sleep (Steven) -fb_helper: remove unused drm_fb_helper_defio_init() (Thomas) Driver Changes: -bochs/hibmc/vboxvideo: Use new vram helpers for prepare/cleanup fb (Thomas) -amdgpu: Implement dma-buf import/export without drm helpers (Christian) -panfrost: Simplify devfreq integration in driver (Steven) Cc: Christian König Cc: Thomas Zimmermann Cc: Steven Price Cc: Andrew F. Davis Cc: John Stultz Cc: Sean Paul ---------------------------------------------------------------- Andrew F. Davis (1): dma-buf: Add dma-buf heaps framework Anna Karas (1): doc: drm: Update references to previously renamed files Bhanusree (3): drm/gpu: Add comment for memory barrier drm/gpu: Fix Missing blank line after declarations drm/gpu: Fix Memory barrier without comment Issue Christian König (10): dma-buf: change DMA-buf locking convention v3 dma-buf: stop using the dmabuf->lock so much v2 drm/ttm, drm/vmwgfx: move cpu_writers handling into vmwgfx drm/ttm: always keep BOs on the LRU drm/ttm: remove pointers to globals drm/ttm: use the parent resv for ghost objects v3 drm/qxl: stop using TTM to call driver internal functions drm/ttm: stop exporting ttm_mem_io_* functions drm/amdgpu: add independent DMA-buf export v8 drm/amdgpu: add independent DMA-buf import v9 Daniel Vetter (1): drm/simple-kms: Standardize arguments for callbacks Geert Uytterhoeven (1): drm: Spelling s/connet/connect/ Hans de Goede (1): drm/vboxvideo: Use drm_gem_fb_create_with_dirty instead of drm_gem_fb_create John Stultz (4): dma-buf: heaps: Add heap helpers dma-buf: heaps: Add system heap to dmabuf heaps dma-buf: heaps: Add CMA heap to dmabuf heaps kselftests: Add dma-heap test Rob Herring (1): drm/gem: Fix mmap fake offset handling for drm_gem_object_funcs.mmap Sean Paul (5): Revert "kselftests: Add dma-heap test" Revert "dma-buf: heaps: Add CMA heap to dmabuf heaps" Revert "dma-buf: heaps: Add system heap to dmabuf heaps" Revert "dma-buf: heaps: Add heap helpers" Revert "dma-buf: Add dma-buf heaps framework" Steven Price (3): drm: Don't free jobs in wait_event_interruptible() drm/panfrost: Use generic code for devfreq drm/panfrost: Simplify devfreq utilisation tracking Thomas Zimmermann (6): drm/vram-helpers: Add helpers for prepare_fb() and cleanup_fb() drm/bochs: Replace prepare_fb()/cleanup_fb() with GEM VRAM helpers drm/hisilicon/hibmc: Use GEM VRAM's prepare_fb() and cleanup_fb() helpers drm/vboxvideo: Replace prepare_fb()/cleanup_fb() with GEM VRAM helpers drm/fb-helper: Remove drm_fb_helper_defio_init() and update docs drm/todo: Clarify situation around fbdev and defio Wambui Karuga (1): drm/mediatek: remove cast to pointers passed to kfree Documentation/driver-api/dma-buf.rst | 6 +- Documentation/gpu/todo.rst | 8 +- drivers/dma-buf/dma-buf.c | 120 +++++++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 215 ++++++++++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 5 - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 32 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 9 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- drivers/gpu/drm/bochs/bochs_kms.c | 26 +-- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/drm_cache.c | 14 +- drivers/gpu/drm/drm_fb_helper.c | 61 ++---- drivers/gpu/drm/drm_gem.c | 3 + drivers/gpu/drm/drm_gem_shmem_helper.c | 3 - drivers/gpu/drm/drm_gem_vram_helper.c | 131 ++++++++++++- drivers/gpu/drm/drm_simple_kms_helper.c | 2 +- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 2 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 14 +- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 4 +- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 124 ++++--------- drivers/gpu/drm/panfrost/panfrost_devfreq.h | 3 +- drivers/gpu/drm/panfrost/panfrost_device.h | 14 +- drivers/gpu/drm/panfrost/panfrost_job.c | 15 +- drivers/gpu/drm/pl111/pl111_display.c | 4 +- drivers/gpu/drm/qxl/qxl_drv.h | 2 + drivers/gpu/drm/qxl/qxl_object.c | 11 +- drivers/gpu/drm/qxl/qxl_release.c | 11 +- drivers/gpu/drm/qxl/qxl_ttm.c | 11 +- drivers/gpu/drm/radeon/radeon_gem.c | 2 +- drivers/gpu/drm/radeon/radeon_object.c | 2 +- drivers/gpu/drm/scheduler/sched_main.c | 43 +++-- drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +- drivers/gpu/drm/ttm/ttm_bo.c | 132 ++++--------- drivers/gpu/drm/ttm/ttm_bo_util.c | 27 ++- drivers/gpu/drm/ttm/ttm_bo_vm.c | 11 +- drivers/gpu/drm/ttm/ttm_execbuf_util.c | 57 +----- drivers/gpu/drm/ttm/ttm_memory.c | 2 +- drivers/gpu/drm/ttm/ttm_page_alloc.c | 4 +- drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 4 +- drivers/gpu/drm/vboxvideo/vbox_mode.c | 63 +------ drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 17 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 3 + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 3 + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 2 +- drivers/gpu/drm/xen/xen_drm_front_kms.c | 7 +- include/drm/drm_fb_helper.h | 1 - include/drm/drm_gem.h | 5 +- include/drm/drm_gem_vram_helper.h | 25 +++ include/drm/drm_simple_kms_helper.h | 2 +- include/drm/ttm/ttm_bo_api.h | 56 ------ include/drm/ttm/ttm_bo_driver.h | 26 +-- include/drm/ttm/ttm_execbuf_util.h | 2 +- include/drm/ttm/ttm_memory.h | 1 - include/linux/dma-buf.h | 63 ++++++- include/uapi/drm/exynos_drm.h | 2 +- 62 files changed, 709 insertions(+), 733 deletions(-)