From patchwork Thu Oct 17 19:26:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11196999 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 2D6661575 for ; Thu, 17 Oct 2019 19:26:33 +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 160FA20869 for ; Thu, 17 Oct 2019 19:26:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 160FA20869 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0516A6EA2E; Thu, 17 Oct 2019 19:26:32 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yb1-xb41.google.com (mail-yb1-xb41.google.com [IPv6:2607:f8b0:4864:20::b41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 01C936EA2A for ; Thu, 17 Oct 2019 19:26:04 +0000 (UTC) Received: by mail-yb1-xb41.google.com with SMTP id q143so1054628ybg.12 for ; Thu, 17 Oct 2019 12:26:03 -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=zUrToJZYnyBE8gW0vgj+Y2P25amcLP2HT/V8e/fX87E=; b=CZNNQJMp+lhZf0CBzVGDAu1bSp1gCWaEU+n/kthZoKD3Szw3jeoCNfiFPB3mLruo0J GTKpehLUcOqGdOrRwBu1UBroRQB7MS7tbhnpdHmdeBaYmXiDQW+WNxheWu4tmZCp/OFO wKEbfj+xOe5/JgebI1oUH8Bu/lbgkn0eZIYvl6d71f72qLwP6OSCem6G7szWP11poK8s G2U104/NfgpQiylfdu1Un5mPfCQl/k8VnzUwDwzZl1hudHofJ1dCa3MaQxXMp2dy8OR8 IkUjCZDNFfZSc73BJB6QkICyOZxk7Up85Ae5a07K0M3pmTHo9yOAeRFJH8e/QWa9lpHL f6QQ== X-Gm-Message-State: APjAAAXDWj0kBuiaZyPkuiZktMgY6GsuEUQJbpXCsqKWuJzOyOo9D+yz b3Z5/UxlKfSE2ZILi3O+GPmdZg== X-Google-Smtp-Source: APXvYqxjoCTCsvNH2bm0Xufwy1+gJfPUtxu38Zw1uhegoepJ4CoPEHojMo3PYUJdiR6qZuJzTdQ6iQ== X-Received: by 2002:a25:94a:: with SMTP id u10mr3399218ybm.312.1571340362829; Thu, 17 Oct 2019 12:26:02 -0700 (PDT) Received: from localhost ([2620:0:1013:11:89c6:2139:5435:371d]) by smtp.gmail.com with ESMTPSA id a64sm748631ywe.92.2019.10.17.12.26.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 12:26:02 -0700 (PDT) Date: Thu, 17 Oct 2019 15:26:01 -0400 From: Sean Paul To: Dave Airlie , Daniel Vetter Message-ID: <20191017192601.GA215957@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=zUrToJZYnyBE8gW0vgj+Y2P25amcLP2HT/V8e/fX87E=; b=K8g6doVhJpOCppf76HQX8ntMTHUmukIE3I92qQTZ17k1XxqRPWXJ10J8M9rHWcLBh0 DsGqfDNi3M3gJVr/8a5EjSCTV8ThHUC4UrpKQol8+UINd6Znz62VTZwWISJnLoihDVVd 3cKn0u6rQ8yP4atmM0eJ3KcJvltZAQaEqkOSFjvjk1A72R/z2km616ElJQdJDKHKJ8dW C0noAfkBgQAnhVT7WOFxMxEIESDuNc0TKa4ZO3tK0QeRHvlEGSOawAD7dmufNdPEdQ+J /j6/qUPOWNrYRFWu8l3cnswCNVJ00+YpQpdcxaBdCF+pIjxVHOPtGPZ8CjbJrSEeECEs XZRg== Subject: [Intel-gfx] [PULL] drm-misc-next X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org, Gerd Hoffmann , Sam Ravnborg , dim-tools@lists.freedesktop.org, Ezequiel Garcia , Rodrigo Siqueira , Steven Price , Tomi Valkeinen , Robert Chiras , Jean-Jacques Hiblot , Lowry Li , Jonas Karlman , intel-gfx@lists.freedesktop.org, Maxime Ripard , Wen He , Simon Ser , Oleg Vasilev , Qiang Yu , Thomas Zimmermann Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi Dave/Daniel, Apologies for this being a day late, I wanted to get the dt-bindings for the malidp QoS change before sending this. Most of the volume is incremental this week, there's some new HW features enabled which I've called out below. As for the uapi changes, well it's interesting timing with your RFC the other day :) I think the error code changes are well-scrutinized so I don't have much concern for those. The omap OMAP_BO_MEM_* changes though I don't think have really reached non-TI eyes. There's no link in the commit message to a UAPI implementation and the only reference I could find is libkmsxx which can set them through the python bindings. Since this is TI-specific gunk in TI-specific headers I'm inclined to let it pass, but I would have liked to have this conversation upfront. I figured I'd call this out so you have final say. drm-misc-next-2019-10-17: drm-misc-next for 5.5: UAPI Changes: -omap: -Add OMAP_BO_MEM_* flags to specify how to allocate BO (Tomi) -Reorder OMAP_BO_* #defines, no functional change (Tomi) -Change unsupported error code from EINVAL to EOPNOTSUPP for: (Rodrigo) -drm_wait_vblank_ioctl -drm_crtc_get_sequence_ioctl -drm_crtc_queue_sequence_ioctl Cross-subsystem Changes: -None Core Changes: -Delete drmP.h \o/ (Sam) -kerneldoc clarifications on zpos collisions and plane rects (Simon & Maarten) -dp_helpers: Add link training repeater definitions added in DP 1.4 (Rodrigo) -TODO: Add item to convert fbdev drivers to drm (Thomas) -prime: Add mmap to drm_gem_object_funcs giving more control than vm_ops (Gerd) -shmem/ttm/vram: Use new mmap gem_object callback (Gerd) Driver Changes: -malidp: Add display QoS configuration via devicetree (Wen) -vkms: Add prime import support (Oleg) -panfrost: Properly handle job timeouts when cancelling them (Steven) -rockchip/meson/sun4i(via dw-hdmi): Add Dynamic Range and Mastering infoframe support (Jonas) -mxsfb: Add bridge support to accommodate dsi outputs (Robert) -vboxvideo: Drop hand-rolled implementations and use fbdev emulation, dirtyfb and drm_framebuffer struct from core/core helpers (Thomas) -komeda: Add D71-specific line sizes and respect connector color fmt (Lowry) -lima: Use shmem and reservation lock helpers from gem (Qiang) -rockchip: Add gamma LUT support on vop crtcs (Ezequiel) -omap: -Use refcount_t instead of rolling custom refcounting (Jean-Jacques) Cc: Wen He Cc: Sam Ravnborg Cc: Rodrigo Siqueira Cc: Oleg Vasilev Cc: Steven Price Cc: Jonas Karlman Cc: Maarten Lankhorst Cc: Simon Ser Cc: Robert Chiras Cc: Thomas Zimmermann Cc: Lowry Li Cc: Gerd Hoffmann Cc: Qiang Yu Cc: Tomi Valkeinen Cc: Ezequiel Garcia Cc: Jean-Jacques Hiblot Cheers, Sean The following changes since commit 354c2d310082d1c384213ba76c3757dd3cd8755d: drm: damage_helper: Fix race checking plane->state->fb (2019-10-08 09:41:06 -0400) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2019-10-17 for you to fetch changes up to e30b38b71294849c018322d85e90ec056438fe43: drm/lima: add __GFP_NOWARN flag to all dma_alloc_wc (2019-10-17 23:42:02 +0800) ---------------------------------------------------------------- drm-misc-next for 5.5: UAPI Changes: -omap: -Add OMAP_BO_MEM_* flags to specify how to allocate BO (Tomi) -Reorder OMAP_BO_* #defines, no functional change (Tomi) -Change unsupported error code from EINVAL to EOPNOTSUPP for: (Rodrigo) -drm_wait_vblank_ioctl -drm_crtc_get_sequence_ioctl -drm_crtc_queue_sequence_ioctl Cross-subsystem Changes: -None Core Changes: -Delete drmP.h \o/ (Sam) -kerneldoc clarifications on zpos collisions and plane rects (Simon & Maarten) -dp_helpers: Add link training repeater definitions added in DP 1.4 (Rodrigo) -TODO: Add item to convert fbdev drivers to drm (Thomas) -prime: Add mmap to drm_gem_object_funcs giving more control than vm_ops (Gerd) -shmem/ttm/vram: Use new mmap gem_object callback (Gerd) Driver Changes: -malidp: Add display QoS configuration via devicetree (Wen) -vkms: Add prime import support (Oleg) -panfrost: Properly handle job timeouts when cancelling them (Steven) trockchip/meson/sun4i(via dw-hdmi): Add Dynamic Range and Mastering infoframe support (Jonas) -mxsfb: Add bridge support to accommodate dsi outputs (Robert) -vboxvideo: Drop hand-rolled implementations and use fbdev emulation, dirtyfb and drm_framebuffer struct from core/core helpers (Thomas) -komeda: Add D71-specific line sizes and respect connector color fmt (Lowry) -lima: Use shmem and reservation lock helpers from gem (Qiang) -rockchip: Add gamma LUT support on vop crtcs (Ezequiel) -omap: -Use refcount_t instead of rolling custom refcounting (Jean-Jacques) Cc: Wen He Cc: Sam Ravnborg Cc: Rodrigo Siqueira Cc: Oleg Vasilev Cc: Steven Price Cc: Jonas Karlman Cc: Maarten Lankhorst Cc: Simon Ser Cc: Robert Chiras Cc: Thomas Zimmermann Cc: Lowry Li Cc: Gerd Hoffmann Cc: Qiang Yu Cc: Tomi Valkeinen Cc: Ezequiel Garcia Cc: Jean-Jacques Hiblot ---------------------------------------------------------------- Ben Dooks (3): drm/scheduler: make unexported items static drm/rockchip: include rockchip_drm_drv.h drm/rockchip: make rockchip_gem_alloc_object static Brian Masney (1): drm/bridge: analogix-anx78xx: add support for 7808 addresses Colin Ian King (1): drm/komeda: remove redundant assignment to pointer disable_done Daniel Kurtz (1): drm/bridge: dw-hdmi: Restore audio when setting a mode Daniel Vetter (1): drm/dp-mst: Drop connection_mutex check Douglas Anderson (1): drm/rockchip: Round up _before_ giving to the clock framework Ezequiel Garcia (2): dt-bindings: display: rockchip: document VOP gamma LUT address drm/rockchip: Add optional support for CRTC gamma LUT Gerd Hoffmann (11): drm: add mmap() to drm_gem_object_funcs drm/shmem: switch shmem helper to &drm_gem_object_funcs.mmap drm/shmem: drop VM_DONTDUMP drm/shmem: drop VM_IO drm/shmem: drop DEFINE_DRM_GEM_SHMEM_FOPS drm/ttm: factor out ttm_bo_mmap_vma_setup drm/ttm: rename ttm_fbdev_mmap drm/ttm: add drm_gem_ttm_mmap() drm/vram: switch vram helper to &drm_gem_object_funcs.mmap() drm/vram: drop verify_access drm/vram: drop DRM_VRAM_MM_FILE_OPERATIONS Guido Günther (1): drm/mxsfb: Read bus flags from bridge if present Jean-Jacques Hiblot (1): drm/omap: use refcount API to track the number of users of dma_addr Jonas Karlman (4): drm/bridge: dw-hdmi: Add Dynamic Range and Mastering InfoFrame support drm/rockchip: Enable DRM InfoFrame support on RK3328 and RK3399 drm/meson: Enable DRM InfoFrame support on GXL, GXM and G12A drm/sun4i: Enable DRM InfoFrame support on H6 Lee Shawn C (1): drm/edid: Select DMT timing if EDID's display feature not support GTF Lowry Li (Arm Technology China) (4): drm/komeda: Add line size support drm/komeda: Adds layer horizontal input size limitation check for D71 drm/komeda: Set output color depth for output drm/komeda: Adds output-color format support Lucas De Marchi (1): drm/dp-mst: fix warning on unused var Maarten Lankhorst (1): drm/plane: Clarify our expectations for src/dst rectangles Markus Elfring (1): drm/rockchip: rk3066_hdmi: Use devm_platform_ioremap_resource() in rk3066_hdmi_bind() Nickey Yang (1): drm/rockchip: vop: add the definition of dclk_pol Oleg Vasilev (1): drm/vkms: prime import support Qiang Yu (3): drm/lima: use drm_gem_shmem_helpers drm/lima: use drm_gem_(un)lock_reservations drm/lima: add __GFP_NOWARN flag to all dma_alloc_wc Robert Chiras (1): drm/mxsfb: Update mxsfb to support a bridge Rodrigo Siqueira (3): drm: Add link training repeaters addresses drm/drm_vblank: Change EINVAL by the correct errno drm: Add LT-tunable PHY repeater mode operations Ronald Tschalär (1): drm/bridge: sil_sii8620: make remote control optional. Sam Ravnborg (2): drm_dp_cec: drop use of drmP.h drm: delete drmP.h + drm_os_linux.h Sean Paul (1): Documentation: Fix warning in drm-kms-helpers.rst Sebastian Andrzej Siewior (1): drm/i810: Refer to `PREEMPTION' in comment Simon Ser (1): drm: two planes with the same zpos have undefined ordering Steven Price (3): drm/panfrost: Remove NULL check for regulator drm/panfrost: Handle resetting on timeout better drm/panfrost: Remove commented out call to panfrost_core_dump Thomas Zimmermann (5): drm/vboxvideo: Switch to generic fbdev emulation drm/vboxvideo: Switch to drm_atomic_helper_dirty_fb() drm/vboxvideo: Replace struct vram_framebuffer with generic implemenation drm: Add TODO item for fbdev driver conversion drm/cirrus: Remove obsolete header file Tomi Valkeinen (7): drm/omap: add omap_gem_unpin_locked() drm/omap: accept NULL for dma_addr in omap_gem_pin drm/omap: cleanup OMAP_BO flags drm/omap: remove OMAP_BO_TILED define drm/omap: cleanup OMAP_BO_SCANOUT use drm/omap: add omap_gem_validate_flags() drm/omap: add OMAP_BO flags to affect buffer allocation Ville Syrjälä (1): drm/atmel-hlcdc: Use swap() where appropriate Wen He (2): drm/arm/mali-dp: Add display QoS interface configuration for Mali DP500 dt/bindings: display: Add optional property node define for Mali DP500 Wolfram Sang (1): gpu: drm: bridge: sii9234: convert to devm_i2c_new_dummy_device YueHaibing (2): drm/vkms: Remove duplicated include from vkms_drv.c drm/qxl: Fix randbuild error zhengbin (4): drm/omap: Remove set but not used variable 'plane' drm/omap: Remove set but not used variable 'tclk_trail' drm/omap: Remove set but not used variable 'err' in hdmi5_audio_config drm/omap: Remove set but not used variable 'err' in hdmi4_audio_config zhong jiang (1): drm/vkms: Fix an undefined reference error in vkms_composer_worker .../devicetree/bindings/display/arm,malidp.txt | 3 + .../bindings/display/rockchip/rockchip-vop.txt | 6 +- Documentation/gpu/drm-kms-helpers.rst | 3 - Documentation/gpu/todo.rst | 39 +++- drivers/gpu/drm/Kconfig | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 +- .../gpu/drm/arm/display/komeda/d71/d71_component.c | 121 +++++++++- drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h | 9 +- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 29 ++- drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 2 + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 3 + .../drm/arm/display/komeda/komeda_pipeline_state.c | 46 ++++ .../drm/arm/display/komeda/komeda_wb_connector.c | 5 + drivers/gpu/drm/arm/malidp_drv.c | 6 + drivers/gpu/drm/arm/malidp_hw.c | 9 + drivers/gpu/drm/arm/malidp_hw.h | 3 + drivers/gpu/drm/arm/malidp_regs.h | 10 + drivers/gpu/drm/ast/ast_drv.c | 5 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 5 +- drivers/gpu/drm/bochs/bochs_drv.c | 5 +- drivers/gpu/drm/bridge/Kconfig | 3 +- drivers/gpu/drm/bridge/analogix-anx78xx.c | 36 +-- drivers/gpu/drm/bridge/analogix-anx78xx.h | 17 +- drivers/gpu/drm/bridge/sii9234.c | 36 +-- drivers/gpu/drm/bridge/sil-sii8620.c | 10 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 83 ++++++- drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 37 +++ drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/cirrus/cirrus_drv.h | 247 --------------------- drivers/gpu/drm/drm_blend.c | 8 +- drivers/gpu/drm/drm_dp_cec.c | 6 +- drivers/gpu/drm/drm_dp_mst_topology.c | 3 - drivers/gpu/drm/drm_edid.c | 3 +- drivers/gpu/drm/drm_gem.c | 27 ++- drivers/gpu/drm/drm_gem_shmem_helper.c | 28 +-- drivers/gpu/drm/drm_gem_ttm_helper.c | 17 ++ drivers/gpu/drm/drm_gem_vram_helper.c | 56 +---- drivers/gpu/drm/drm_prime.c | 9 + drivers/gpu/drm/drm_vblank.c | 6 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 5 +- drivers/gpu/drm/lima/Kconfig | 1 + drivers/gpu/drm/lima/Makefile | 4 +- drivers/gpu/drm/lima/lima_device.c | 2 +- drivers/gpu/drm/lima/lima_drv.c | 22 +- drivers/gpu/drm/lima/lima_gem.c | 195 ++++++---------- drivers/gpu/drm/lima/lima_gem.h | 32 ++- drivers/gpu/drm/lima/lima_gem_prime.c | 46 ---- drivers/gpu/drm/lima/lima_gem_prime.h | 13 -- drivers/gpu/drm/lima/lima_mmu.c | 1 - drivers/gpu/drm/lima/lima_object.c | 119 ---------- drivers/gpu/drm/lima/lima_object.h | 35 --- drivers/gpu/drm/lima/lima_sched.c | 6 +- drivers/gpu/drm/lima/lima_vm.c | 87 ++++---- drivers/gpu/drm/meson/meson_dw_hdmi.c | 5 + drivers/gpu/drm/mgag200/mgag200_drv.c | 5 +- drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 20 +- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 46 +++- drivers/gpu/drm/mxsfb/mxsfb_drv.h | 4 +- drivers/gpu/drm/mxsfb/mxsfb_out.c | 26 ++- drivers/gpu/drm/omapdrm/dss/dsi.c | 3 +- drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 4 +- drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 4 +- drivers/gpu/drm/omapdrm/omap_dmm_tiler.h | 2 +- drivers/gpu/drm/omapdrm/omap_fb.c | 9 +- drivers/gpu/drm/omapdrm/omap_gem.c | 191 +++++++++++----- drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 +- drivers/gpu/drm/panfrost/TODO | 2 + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +- drivers/gpu/drm/panfrost/panfrost_job.c | 18 +- drivers/gpu/drm/qxl/Kconfig | 1 + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 8 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 169 +++++++++++++- drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 10 +- drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 48 ++-- drivers/gpu/drm/scheduler/sched_fence.c | 4 +- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 2 + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 1 + drivers/gpu/drm/tiny/gm12u320.c | 2 +- drivers/gpu/drm/ttm/ttm_bo_vm.c | 54 +++-- drivers/gpu/drm/v3d/v3d_bo.c | 2 +- drivers/gpu/drm/v3d/v3d_drv.c | 2 +- drivers/gpu/drm/vboxvideo/Makefile | 2 +- drivers/gpu/drm/vboxvideo/vbox_drv.c | 19 +- drivers/gpu/drm/vboxvideo/vbox_drv.h | 25 --- drivers/gpu/drm/vboxvideo/vbox_fb.c | 149 ------------- drivers/gpu/drm/vboxvideo/vbox_main.c | 119 +--------- drivers/gpu/drm/vboxvideo/vbox_mode.c | 85 +++---- drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- drivers/gpu/drm/virtio/virtgpu_object.c | 2 +- drivers/gpu/drm/vkms/vkms_drv.c | 13 +- drivers/gpu/drm/vkms/vkms_drv.h | 6 + drivers/gpu/drm/vkms/vkms_gem.c | 27 +++ include/drm/bridge/dw_hdmi.h | 1 + include/drm/drmP.h | 103 --------- include/drm/drm_dp_helper.h | 30 +++ include/drm/drm_gem.h | 14 ++ include/drm/drm_gem_shmem_helper.h | 30 +-- include/drm/drm_gem_ttm_helper.h | 2 + include/drm/drm_gem_vram_helper.h | 25 --- include/drm/drm_os_linux.h | 55 ----- include/drm/drm_plane.h | 31 ++- include/drm/ttm/ttm_bo_api.h | 10 +- include/uapi/drm/omap_drm.h | 27 ++- 107 files changed, 1336 insertions(+), 1618 deletions(-) delete mode 100644 drivers/gpu/drm/cirrus/cirrus_drv.h delete mode 100644 drivers/gpu/drm/lima/lima_gem_prime.c delete mode 100644 drivers/gpu/drm/lima/lima_gem_prime.h delete mode 100644 drivers/gpu/drm/lima/lima_object.c delete mode 100644 drivers/gpu/drm/lima/lima_object.h delete mode 100644 drivers/gpu/drm/vboxvideo/vbox_fb.c delete mode 100644 include/drm/drmP.h delete mode 100644 include/drm/drm_os_linux.h