Changes in Makefile

c95baf12f5077419db01313ab61c2aac007d40cd - Merge drm-intel-next-queued into gvt-next

Thu, 20 Feb 2020 09:23:37 +0100

Merge drm-intel-next-queued into gvt-nextBackmerge to pull inhttps://patchwork.freedesktop.org/patch/353621/?series=73544&rev=1Signed-off-by: Zhenyu Wang List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

28336be568bb473d16ba80db0801276fb4f1bbe5 - Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts

Mon, 30 Dec 2019 08:10:51 +0100

Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflictsConflicts: init/main.c lib/Kconfig.debugSigned-off-by: Ingo Molnar List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

b19efcabb587e5470a423ef778905f47e5a47f1a - Merge branch 'next' into for-linus

Sat, 01 Feb 2020 02:42:33 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.6 merge window. List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

1bdd3e05a0a3b4a97ea88bc46fef8fb265c8b94c - Merge tag 'v5.5-rc5' into next

Fri, 10 Jan 2020 23:56:04 +0100

Merge tag 'v5.5-rc5' into nextSync up with mainline to get SPI "delay" API changes. List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

2040cf9f59037aa8aec749363e69ead165b67b43 - Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts

Tue, 10 Dec 2019 10:11:00 +0100

Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflictsSigned-off-by: Ingo Molnar List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

4f797f56c3786e2c6bc542b3f80e9a599b073976 - Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patches

Sun, 08 Dec 2019 14:37:10 +0100

Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patchesSigned-off-by: Ingo Molnar List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

942e6f8a8314e5550e254519dfba4ccd5170421d - Merge mainline/master into arm/fixes

Thu, 05 Dec 2019 22:16:58 +0100

Merge mainline/master into arm/fixesThis brings in the mainline tree right after armsoc contents was mergedthis release cycle, so that we can re-run savedefconfig, etc.Signed-off-by: Olof Johansson List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

a6ed68d6468bd5a3da78a103344ded1435fed57a - Merge tag 'drm-next-2019-11-27' of git://anongit.freedesktop.org/drm/drm

Thu, 28 Nov 2019 02:45:48 +0100

Merge tag 'drm-next-2019-11-27' of git://anongit.freedesktop.org/drm/drmPull drm updates from Dave Airlie: "Lots of stuff in here, though it hasn't been too insane this merge apart from dealing with the security fun. uapi: - export different colorspace properties on DP vs HDMI - new fourcc for ARM 16x16 block format - syncobj: allow querying last submitted timeline value - DRM_FORMAT_BIG_ENDIAN defined as unsigned core: - allow using gem vma manager in ttm - connector/encoder/bridge doc fixes - allow more than 3 encoders for a connector - displayport mst suspend/resume reprobing support - vram lazy unmapping, uniform vram mm and gem vram - edid cleanups + AVI informframe bar info - displayport helpers - dpcd parser added dp_cec: - Allow a connector to be associated with a cec device ttm: - pipelining with no_gpu_wait fix - always keep BOs on the LRU sched: - allow free_job routine to sleep i915: - Block userptr from mappable GTT - i915 perf uapi versioning - OA stream dynamic reconfiguration - make context persistence optional - introduce DRM_I915_UNSTABLE Kconfig - add fake lmem testing under unstable - BT.2020 support for DP MSA - struct mutex elimination - Tigerlake display/PLL/power management improvements - Jasper Lake PCH support - refactor PMU for multiple GPUs - Icelake firmware update - Split out vga + switcheroo code amdgpu: - implement dma-buf import/export without helpers - vega20 RAS enablement - DC i2c over aux fixes - renoir GPU reset - DC HDCP support - BACO support for CI/VI asics - MSI-X support - Arcturus EEPROM support - Arcturus VCN encode support - VCN dynamic powergating on RV/RV2 amdkfd: - add navi12/14/renoir support to kfd radeon: - SI dpm fix ported from amdgpu - fix bad DMA on ppc platforms gma500: - memory leak fixes qxl: - convert to new gem mmap exynos: - build warning fix komeda: - add aclk sysfs attribute v3d: - userspace cleanup uapi change i810: - fix for underflow in dispatch ioctls ast: - refactor show_cursor mgag200: - refactor show_cursor arcgpu: - encoder finding improvements mediatek: - mipi_tx, dsi and partial crtc support for MT8183 SoC - rotation support meson: - add suspend/resume support omap: - misc refactors tegra: - DisplayPort support for Tegra 210, 186 and 194. - IOMMU-backed DMA API fixes panfrost: - fix lockdep issue - simplify devfreq integration rcar-du: - R8A774B1 SoC support - fixes for H2 ES2.0 sun4i: - vcc-dsi regulator support virtio-gpu: - vmexit vs spinlock fix - move to gem shmem helpers - handle large command buffers with cma"* tag 'drm-next-2019-11-27' of git://anongit.freedesktop.org/drm/drm: (1855 commits) drm/amdgpu: invalidate mmhub semaphore workaround in gmc9/gmc10 drm/amdgpu: initialize vm_inv_eng0_sem for gfxhub and mmhub drm/amd/amdgpu/sriov skip RLCG s/r list for arcturus VF. drm/amd/amdgpu/sriov temporarily skip ras,dtm,hdcp for arcturus VF drm/amdgpu/gfx10: re-init clear state buffer after gpu reset merge fix for "ftrace: Rework event_create_dir()" drm/amdgpu: Update Arcturus golden registers drm/amdgpu/gfx10: fix out-of-bound mqd_backup array access drm/amdgpu/gfx10: explicitly wait for cp idle after halt/unhalt Revert "drm/amd/display: enable S/G for RAVEN chip" drm/amdgpu: disable gfxoff on original raven drm/amdgpu: remove experimental flag for Navi14 drm/amdgpu: disable gfxoff when using register read interface drm/amdgpu/powerplay: properly set PP_GFXOFF_MASK (v2) drm/amdgpu: fix bad DMA from INTERRUPT_CNTL2 drm/radeon: fix bad DMA from INTERRUPT_CNTL2 drm/amd/display: Fix debugfs on MST connectors drm/amdgpu/nv: add asic func for fetching vbios from rom directly drm/amdgpu: put flush_delayed_work at first drm/amdgpu/vcn2.5: fix the enc loop with hw fini ... List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

976e3645923bdd2fe7893aae33fd7a21098bfb28 - Merge branch 'next' into for-linus

Mon, 25 Nov 2019 22:26:56 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.5 merge window. List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

9f4813b531a0b8cc502fcfb142937fe4e9104d77 - Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixes

Tue, 19 Nov 2019 09:00:45 +0100

Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

e205ceeb253723f4e4bdce619844ed678ae48276 - Merge drm/drm-next into drm-intel-next-queued

Fri, 15 Nov 2019 12:17:39 +0100

Merge drm/drm-next into drm-intel-next-queuedBackmerge to get dfce90259d74 ("Backmerge i915 security patches fromcommit 'ea0b163b13ff' into drm-next") and thus 100d46bd72ec ("MergeIntel Gen8/Gen9 graphics fixes from Jon Bloomfield.").Signed-off-by: Jani Nikula List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

ac94be498f84f7327533b62faca4c3da64434904 - Merge branch 'linus' into x86/hyperv

Fri, 15 Nov 2019 10:30:50 +0100

Merge branch 'linus' into x86/hypervPick up upstream fixes to avoid conflicts. List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

a24e4b09dc75357492ca19d74b02e1edebc282e8 - Merge tag 'drm-misc-next-2019-10-24-2' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

Tue, 29 Oct 2019 21:10:59 +0100

Merge tag 'drm-misc-next-2019-10-24-2' of git://anongit.freedesktop.org/drm/drm-misc into drm-nextdrm-misc-next for 5.5:UAPI Changes:-syncobj: allow querying the last submitted timeline value (David)-fourcc: explicitly defineDRM_FORMAT_BIG_ENDIAN as unsigned (Adam)-omap: revert the OMAP_BO_* flags that were added -- no userspace (Sean)Cross-subsystem Changes:-MAINTAINERS: add Mihail as komeda co-maintainer (Mihail)Core Changes:-edid: a few cleanups, add AVI infoframe bar info (Ville)-todo: remove i915 device_link item and add difficulty levels (Daniel)-dp_helpers: add a few new helpers to parse dpcd (Thierry)Driver Changes:-gma500: fix a few memory disclosure leaks (Kangjie)-qxl: convert to use the new drm_gem_object_funcs.mmap (Gerd)-various: open code dp_link helpers in preparation for helper removal (Thierry)Cc: Chunming Zhou Cc: Adam Jackson Cc: Sean Paul Cc: Ville Syrjälä Cc: Kangjie Lu Cc: Mihail Atanassov Cc: Daniel Vetter Cc: Thierry Reding Signed-off-by: Dave Airlie From: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20191024155535.GA10294@art_vandelay List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

728d90bdc9e480dc93913e59a0aa3c896c7aa697 - Merge tag 'v5.4-rc5' into next

Sun, 27 Oct 2019 19:00:19 +0100

Merge tag 'v5.4-rc5' into nextSync up with mainline. List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

112d6212c80a1c560757520bd822a41c0ad15c2c - Merge tag 'v5.4-rc3' into spi-5.4

Fri, 18 Oct 2019 19:30:49 +0200

Merge tag 'v5.4-rc3' into spi-5.4Linux 5.4-rc3 List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

2695eae1f6d3a5b513735a1d7f4e187414381bee - drm/vboxvideo: Switch to generic fbdev emulation

Fri, 11 Oct 2019 15:48:06 +0200

drm/vboxvideo: Switch to generic fbdev emulationThere's nothing special about vboxvideo's fbdev emulation that isnot provided by the generic implementation. Switch over and removethe driver's code.Signed-off-by: Thomas Zimmermann Acked-by: Sam Ravnborg Link: https://patchwork.freedesktop.org/patch/msgid/20191011134808.3955-2-tzimmermann@suse.de List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

1913c7f3fc2514e09262baf2267a82dfdb215c39 - Merge tag 'fix-missing-panels' into fixes

Fri, 04 Oct 2019 18:06:41 +0200

Merge tag 'fix-missing-panels' into fixes List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

77fdaa091d79c87323a9f3912a25f73e02ea2a01 - Merge drm/drm-fixes into drm-misc-fixes

Thu, 03 Oct 2019 09:59:29 +0200

Merge drm/drm-fixes into drm-misc-fixesWe haven't backmerged for a while, let's start the -rc period by pullingrc1.Signed-off-by: Maxime Ripard List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

574cc4539762561d96b456dbc0544d8898bd4c6e - Merge tag 'drm-next-2019-09-18' of git://anongit.freedesktop.org/drm/drm

Fri, 20 Sep 2019 01:24:24 +0200

Merge tag 'drm-next-2019-09-18' of git://anongit.freedesktop.org/drm/drmPull drm updates from Dave Airlie: "This is the main pull request for 5.4-rc1 merge window. I don't think there is anything outstanding so next week should just be fixes, but we'll see if I missed anything. I landed some fixes earlier in the week but got delayed writing summary and sending it out, due to a mix of sick kid and jetlag! There are some fixes pending, but I'd rather get the main merge out of the way instead of delaying it longer. It's also pretty large in commit count and new amd header file size. The largest thing is four new amdgpu products (navi12/14, arcturus and renoir APU support). Otherwise it's pretty much lots of work across the board, i915 has started landing tigerlake support, lots of icelake fixes and lots of locking reworking for future gpu support, lots of header file rework (drmP.h is nearly gone), some old legacy hacks (DRM_WAIT_ON) have been put into the places they are needed. uapi: - content protection type property for HDCP core: - rework include dependencies - lots of drmP.h removals - link rate calculation robustness fix - make fb helper map only when required - add connector->DDC adapter link - DRM_WAIT_ON removed - drop DRM_AUTH usage from drivers dma-buf: - reservation object fence helper dma-fence: - shrink dma_fence struct - merge signal functions - store timestamps in dma_fence - selftests ttm: - embed drm_get_object struct into ttm_buffer_object - release_notify callback bridges: - sii902x - audio graph card support - tc358767 - aux data handling rework - ti-snd64dsi86 - debugfs support, DSI mode flags support panels: - Support for GiantPlus GPM940B0, Sharp LQ070Y3DG3B, Ortustech COM37H3M, Novatek NT39016, Sharp LS020B1DD01D, Raydium RM67191, Boe Himax8279d, Sharp LD-D5116Z01B - TI nspire, NEC NL8048HL11, LG Philips LB035Q02, Sharp LS037V7DW01, Sony ACX565AKM, Toppoly TD028TTEC1 Toppoly TD043MTEA1 i915: - Initial tigerlake platform support - Locking simplification work, general all over refactoring. - Selftests - HDCP debug info improvements - DSI properties - Icelake display PLL fixes, colorspace fixes, bandwidth fixes, DSI suspend/resume - GuC fixes - Perf fixes - ElkhartLake enablement - DP MST fixes - GVT - command parser enhancements amdgpu: - add wipe memory on release flag for buffer creation - Navi12/14 support (may be marked experimental) - Arcturus support - Renoir APU support - mclk DPM for Navi - DC display fixes - Raven scatter/gather support - RAS support for GFX - Navi12 + Arcturus power features - GPU reset for Picasso - smu11 i2c controller support amdkfd: - navi12/14 support - Arcturus support radeon: - kexec fix nouveau: - improved display color management - detect lack of GPU power cables vmwgfx: - evicition priority support - remove unused security feature msm: - msm8998 display support - better async commit support for cursor updates etnaviv: - per-process address space support - performance counter fixes - softpin support mcde: - DCS transfers fix exynos: - drmP.h cleanup lima: - reduce logging kirin: - misc clenaups komeda: - dual-link support - DT memory regions hisilicon: - misc fixes imx: - IPUv3 image converter fixes - 32-bit RGB V4L2 pixel format support ingenic: - more support for panel related cases mgag200: - cursor support fix panfrost: - export GPU features register to userspace - gpu heap allocations - per-fd address space support pl111: - CLD pads wiring support removed from DT rockchip: - rework to use DRM PSR helpers - fix bug in VOP_WIN_GET macro - DSI DT binding rework sun4i: - improve support for color encoding and range - DDC enabled GPIO tinydrm: - rework SPI support - improve MIPI-DBI support - moved to drm/tiny vkms: - rework CRC tracking dw-hdmi: - get_eld and i2s improvements gm12u320: - misc fixes meson: - global code cleanup - vpu feature detect omap: - alpha/pixel blend mode properties rcar-du: - misc fixes"* tag 'drm-next-2019-09-18' of git://anongit.freedesktop.org/drm/drm: (2112 commits) drm/nouveau/bar/gm20b: Avoid BAR1 teardown during init drm/nouveau: Fix ordering between TTM and GEM release drm/nouveau/prime: Extend DMA reservation object lock drm/nouveau: Fix fallout from reservation object rework drm/nouveau/kms/nv50-: Don't create MSTMs for eDP connectors drm/i915: Use NOEVICT for first pass on attemping to pin a GGTT mmap drm/i915: to make vgpu ppgtt notificaiton as atomic operation drm/i915: Flush the existing fence before GGTT read/write drm/i915: Hold irq-off for the entire fake lock period drm/i915/gvt: update RING_START reg of vGPU when the context is submitted to i915 drm/i915/gvt: update vgpu workload head pointer correctly drm/mcde: Fix DSI transfers drm/msm: Use the correct dma_sync calls harder drm/msm: remove unlikely() from WARN_ON() conditions drm/msm/dsi: Fix return value check for clk_get_parent drm/msm: add atomic traces drm/msm/dpu: async commit support drm/msm: async commit support drm/msm: split power control from prepare/complete_commit drm/msm: add kms->flush_commit() ... List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile

829e8def7bd7b1e58028113ee5c2877da89d8f27 - Merge drm/drm-next into drm-intel-next-queued

Thu, 22 Aug 2019 07:47:35 +0200

Merge drm/drm-next into drm-intel-next-queuedWe need the rename of reservation_object to dma_resv.The solution on this merge came from linux-next:From: Stephen Rothwell Date: Wed, 14 Aug 2019 12:48:39 +1000Subject: [PATCH] drm: fix up fallout from "dma-buf: rename reservation_object to dma_resv"Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/gt/intel_engine_pool.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-)diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pool.c b/drivers/gpu/drm/i915/gt/intel_engine_pool.cindex 03d90b49584a..4cd54c569911 100644--- a/drivers/gpu/drm/i915/gt/intel_engine_pool.c+++ b/drivers/gpu/drm/i915/gt/intel_engine_pool.c@@ -43,12 +43,12 @@ static int pool_active(struct i915_active *ref) { struct intel_engine_pool_node *node = container_of(ref, typeof(*node), active);- struct reservation_object *resv = node->obj->base.resv;+ struct dma_resv *resv = node->obj->base.resv; int err;- if (reservation_object_trylock(resv)) {- reservation_object_add_excl_fence(resv, NULL);- reservation_object_unlock(resv);+ if (dma_resv_trylock(resv)) {+ dma_resv_add_excl_fence(resv, NULL);+ dma_resv_unlock(resv); } err = i915_gem_object_pin_pages(node->obj);which is a simplified version from a previous one which had:Reviewed-by: Christian König Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/gpu/drm/vboxvideo/Makefile