dri-devel June 2019

dri-devel@lists.freedesktop.org

350 participants
2370 discussions

[PATCH v2 06/22] docs: mark orphan documents as such
by Mauro Carvalho Chehab 05 Jun '19

05 Jun '19

Sphinx doesn't like orphan documents: Documentation/accelerators/ocxl.rst: WARNING: document isn't included in any toctree Documentation/arm/stm32/overview.rst: WARNING: document isn't included in any toctree Documentation/arm/stm32/stm32f429-overview.rst: WARNING: document isn't included in any toctree Documentation/arm/stm32/stm32f746-overview.rst: WARNING: document isn't included in any toctree Documentation/arm/stm32/stm32f769-overview.rst: WARNING: document isn't included in any toctree Documentation/arm/stm32/stm32h743-overview.rst: WARNING: document isn't included in any toctree Documentation/arm/stm32/stm32mp157-overview.rst: WARNING: document isn't included in any toctree Documentation/gpu/msm-crash-dump.rst: WARNING: document isn't included in any toctree Documentation/interconnect/interconnect.rst: WARNING: document isn't included in any toctree Documentation/laptops/lg-laptop.rst: WARNING: document isn't included in any toctree Documentation/powerpc/isa-versions.rst: WARNING: document isn't included in any toctree Documentation/virtual/kvm/amd-memory-encryption.rst: WARNING: document isn't included in any toctree Documentation/virtual/kvm/vcpu-requests.rst: WARNING: document isn't included in any toctree So, while they aren't on any toctree, add :orphan: to them, in order to silent this warning. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> --- Documentation/accelerators/ocxl.rst | 2 ++ Documentation/arm/stm32/overview.rst | 2 ++ Documentation/arm/stm32/stm32f429-overview.rst | 2 ++ Documentation/arm/stm32/stm32f746-overview.rst | 2 ++ Documentation/arm/stm32/stm32f769-overview.rst | 2 ++ Documentation/arm/stm32/stm32h743-overview.rst | 2 ++ Documentation/arm/stm32/stm32mp157-overview.rst | 2 ++ Documentation/gpu/msm-crash-dump.rst | 2 ++ Documentation/interconnect/interconnect.rst | 2 ++ Documentation/laptops/lg-laptop.rst | 2 ++ Documentation/powerpc/isa-versions.rst | 2 ++ 11 files changed, 22 insertions(+) diff --git a/Documentation/accelerators/ocxl.rst b/Documentation/accelerators/ocxl.rst index 14cefc020e2d..b1cea19a90f5 100644 --- a/Documentation/accelerators/ocxl.rst +++ b/Documentation/accelerators/ocxl.rst @@ -1,3 +1,5 @@ +:orphan: + ======================================================== OpenCAPI (Open Coherent Accelerator Processor Interface) ======================================================== diff --git a/Documentation/arm/stm32/overview.rst b/Documentation/arm/stm32/overview.rst index 85cfc8410798..f7e734153860 100644 --- a/Documentation/arm/stm32/overview.rst +++ b/Documentation/arm/stm32/overview.rst @@ -1,3 +1,5 @@ +:orphan: + ======================== STM32 ARM Linux Overview ======================== diff --git a/Documentation/arm/stm32/stm32f429-overview.rst b/Documentation/arm/stm32/stm32f429-overview.rst index 18feda97f483..65bbb1c3b423 100644 --- a/Documentation/arm/stm32/stm32f429-overview.rst +++ b/Documentation/arm/stm32/stm32f429-overview.rst @@ -1,3 +1,5 @@ +:orphan: + STM32F429 Overview ================== diff --git a/Documentation/arm/stm32/stm32f746-overview.rst b/Documentation/arm/stm32/stm32f746-overview.rst index b5f4b6ce7656..42d593085015 100644 --- a/Documentation/arm/stm32/stm32f746-overview.rst +++ b/Documentation/arm/stm32/stm32f746-overview.rst @@ -1,3 +1,5 @@ +:orphan: + STM32F746 Overview ================== diff --git a/Documentation/arm/stm32/stm32f769-overview.rst b/Documentation/arm/stm32/stm32f769-overview.rst index 228656ced2fe..f6adac862b17 100644 --- a/Documentation/arm/stm32/stm32f769-overview.rst +++ b/Documentation/arm/stm32/stm32f769-overview.rst @@ -1,3 +1,5 @@ +:orphan: + STM32F769 Overview ================== diff --git a/Documentation/arm/stm32/stm32h743-overview.rst b/Documentation/arm/stm32/stm32h743-overview.rst index 3458dc00095d..c525835e7473 100644 --- a/Documentation/arm/stm32/stm32h743-overview.rst +++ b/Documentation/arm/stm32/stm32h743-overview.rst @@ -1,3 +1,5 @@ +:orphan: + STM32H743 Overview ================== diff --git a/Documentation/arm/stm32/stm32mp157-overview.rst b/Documentation/arm/stm32/stm32mp157-overview.rst index 62e176d47ca7..2c52cd020601 100644 --- a/Documentation/arm/stm32/stm32mp157-overview.rst +++ b/Documentation/arm/stm32/stm32mp157-overview.rst @@ -1,3 +1,5 @@ +:orphan: + STM32MP157 Overview =================== diff --git a/Documentation/gpu/msm-crash-dump.rst b/Documentation/gpu/msm-crash-dump.rst index 757cd257e0d8..240ef200f76c 100644 --- a/Documentation/gpu/msm-crash-dump.rst +++ b/Documentation/gpu/msm-crash-dump.rst @@ -1,3 +1,5 @@ +:orphan: + ===================== MSM Crash Dump Format ===================== diff --git a/Documentation/interconnect/interconnect.rst b/Documentation/interconnect/interconnect.rst index c3e004893796..56e331dab70e 100644 --- a/Documentation/interconnect/interconnect.rst +++ b/Documentation/interconnect/interconnect.rst @@ -1,5 +1,7 @@ .. SPDX-License-Identifier: GPL-2.0 +:orphan: + ===================================== GENERIC SYSTEM INTERCONNECT SUBSYSTEM ===================================== diff --git a/Documentation/laptops/lg-laptop.rst b/Documentation/laptops/lg-laptop.rst index aa503ee9b3bc..f2c2ffe31101 100644 --- a/Documentation/laptops/lg-laptop.rst +++ b/Documentation/laptops/lg-laptop.rst @@ -1,5 +1,7 @@ .. SPDX-License-Identifier: GPL-2.0+ +:orphan: + LG Gram laptop extra features ============================= diff --git a/Documentation/powerpc/isa-versions.rst b/Documentation/powerpc/isa-versions.rst index 812e20cc898c..66c24140ebf1 100644 --- a/Documentation/powerpc/isa-versions.rst +++ b/Documentation/powerpc/isa-versions.rst @@ -1,3 +1,5 @@ +:orphan: + CPU to ISA Version Mapping ========================== -- 2.21.0

2 1

[PATCH AUTOSEL 5.1 38/60] drm/amdgpu: keep stolen memory on picasso
by Sasha Levin 04 Jun '19

04 Jun '19

From: Flora Cui <flora.cui(a)amd.com> [ Upstream commit 379109351f4f6f2405cf54e7a296055f589c3ad1 ] otherwise screen corrupts during modprobe. Signed-off-by: Flora Cui <flora.cui(a)amd.com> Reviewed-by: Feifei Xu <Feifei.Xu(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c index 2fe8397241ea..1611bef19a2c 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c @@ -715,6 +715,7 @@ static bool gmc_v9_0_keep_stolen_memory(struct amdgpu_device *adev) case CHIP_VEGA10: return true; case CHIP_RAVEN: + return (adev->pdev->device == 0x15d8); case CHIP_VEGA12: case CHIP_VEGA20: default: -- 2.20.1

1 0

[PATCH v3 00/18] kunit: introduce KUnit, the Linux kernel unit testing framework
by Brendan Higgins 04 Jun '19

04 Jun '19

## TLDR I mostly wanted to incorporate feedback I got over the last week and a half. Biggest things to look out for: - KUnit core now outputs results in TAP14. - Heavily reworked tools/testing/kunit/kunit.py - Changed how parsing works. - Added testing. - Greg, Logan, you might want to re-review this. - Added documentation on how to use KUnit on non-UML kernels. You can see the docs rendered here[1]. There is still some discussion going on on the [PATCH v2 00/17] thread, but I wanted to get some of these updates out before they got too stale (and too difficult for me to keep track of). I hope no one minds. ## Background This patch set proposes KUnit, a lightweight unit testing and mocking framework for the Linux kernel. Unlike Autotest and kselftest, KUnit is a true unit testing framework; it does not require installing the kernel on a test machine or in a VM (however, KUnit still allows you to run tests on test machines or in VMs if you want) and does not require tests to be written in userspace running on a host kernel. Additionally, KUnit is fast: From invocation to completion KUnit can run several dozen tests in under a second. Currently, the entire KUnit test suite for KUnit runs in under a second from the initial invocation (build time excluded). KUnit is heavily inspired by JUnit, Python's unittest.mock, and Googletest/Googlemock for C++. KUnit provides facilities for defining unit test cases, grouping related test cases into test suites, providing common infrastructure for running tests, mocking, spying, and much more. ## What's so special about unit testing? A unit test is supposed to test a single unit of code in isolation, hence the name. There should be no dependencies outside the control of the test; this means no external dependencies, which makes tests orders of magnitudes faster. Likewise, since there are no external dependencies, there are no hoops to jump through to run the tests. Additionally, this makes unit tests deterministic: a failing unit test always indicates a problem. Finally, because unit tests necessarily have finer granularity, they are able to test all code paths easily solving the classic problem of difficulty in exercising error handling code. ## Is KUnit trying to replace other testing frameworks for the kernel? No. Most existing tests for the Linux kernel are end-to-end tests, which have their place. A well tested system has lots of unit tests, a reasonable number of integration tests, and some end-to-end tests. KUnit is just trying to address the unit test space which is currently not being addressed. ## More information on KUnit There is a bunch of documentation near the end of this patch set that describes how to use KUnit and best practices for writing unit tests. For convenience I am hosting the compiled docs here[2]. Additionally for convenience, I have applied these patches to a branch[3]. The repo may be cloned with: git clone https://kunit.googlesource.com/linux This patchset is on the kunit/rfc/v5.1/v3 branch. ## Changes Since Last Version - Converted KUnit core to print test results in TAP14 format as suggested by Greg and Frank. - Heavily reworked tools/testing/kunit/kunit.py - Changed how parsing works. - Added testing. - Added documentation on how to use KUnit on non-UML kernels. You can see the docs rendered here[1]. - Added a new set of EXPECTs and ASSERTs for pointer comparison. - Removed more function indirection as suggested by Logan. - Added a new patch that adds `kunit_try_catch_throw` to objtool's noreturn list. - Fixed a number of minorish issues pointed out by Shuah, Masahiro, and kbuild bot. [1] https://google.github.io/kunit-docs/third_party/kernel/docs/usage.html#kuni… [2] https://google.github.io/kunit-docs/third_party/kernel/docs/ [3] https://kunit.googlesource.com/linux/+/kunit/rfc/v5.1/v3 -- 2.21.0.1020.gf2820cf01a-goog

3 28

[Bug 109955] amdgpu [RX Vega 64] system freeze while gaming
by bugzilla-daemon＠freedesktop.org 04 Jun '19

04 Jun '19

https://bugs.freedesktop.org/show_bug.cgi?id=109955 Sam <samueldgv(a)mailbox.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |samueldgv(a)mailbox.org --- Comment #27 from Sam <samueldgv(a)mailbox.org> --- Hello! I can confirm that I have the same issues. I am using a Vega 56 and openSUSE Tumbleweed (X11 and KDE) with: Kernel Version: 5.1.5-1-default X Server Release: 12004000 Driver: X.Org Radeon RX Vega (VEGA10, DRM 3.30.0, 5.1.5-1-default, LLVM 7.0.1) I have been having the same freezes exactly as described here since, as far as I can remember, mesa 19.0.4 and 5.0.13 (based on the Tumbleweed snapshots from when this started happening) This was definitely not happening before on mesa 18.x/LLVM 6 and 7 and kernel 4.20. I niehter run overclocks, never messed with firmware/BIOS...etc. Everything has been running as-is since Oct. 2018 so firmware or BIOS issues should be discarded, I guess. In my case, I have also experienced this issue when running non-demanding OpenGL games and even desktop applications (I had a crash happen on the desktop with just WxMaxima, a computer algebra system GUI, opened doing nothing) The easiest way for me to reproduce it is by simply leaving Pillars of Eternity (an OpenGL unity game) open and idle for an hour or so. I have tried setting up Kdump and trying to catch some error messages in the logs with no luck. I'm definitely open for directions on how to get more info if this can help. -- You are receiving this mail because: You are the assignee for the bug.

1 0

[PATCH] drm/nouveau/bios: downgrade absence of tmds table to info from an error
by Rhys Kidd 04 Jun '19

04 Jun '19

Absence of a TMDS Info Table is common on Optimus setups where the NVIDIA gpu is not connected directly to any outputs. Reporting an error in this scenario is too harsh. Accordingly, change the error message to an info message. By default the error message also causes a boot flicker for these sytems. Signed-off-by: Rhys Kidd <rhyskidd(a)gmail.com> --- drivers/gpu/drm/nouveau/nouveau_bios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index 66bf2aff4a3e..bdfadc63204a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c @@ -935,7 +935,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios, tmdstableptr = ROM16(bios->data[bitentry->offset]); if (!tmdstableptr) { - NV_ERROR(drm, "Pointer to TMDS table invalid\n"); + NV_INFO(drm, "Pointer to TMDS table not found\n"); return -EINVAL; } -- 2.20.1

2 1

[PATCH 0/2] drm/nouveau/bios/init: Improve pre-PMU devinit opcode coverage
by Rhys Kidd 04 Jun '19

04 Jun '19

NVIDIA GPUs include a common scripting language (devinit) that can be interpreted by a number of "engines", e.g. within a kernel-mode software driver, the VGA BIOS or an on-board small microcontroller which provides certain security assertions (the 'PMU'). This system allows a GPU programming sequence to be shared by multiple entities that would not otherwise be able to execute common code. This series adds support to nouveau for two opcodes seen on VBIOSes prior to the locked-down PMU taking over responsibility for executing devinit scripts. Documentation for these two opcodes can be found at: https://github.com/envytools/envytools/pull/189 Rhys Kidd (2): drm/nouveau/bios/init: handle INIT_RESET_BEGUN devinit opcode drm/nouveau/bios/init: handle INIT_RESET_END devinit opcode .../gpu/drm/nouveau/nvkm/subdev/bios/init.c | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) -- 2.20.1

2 3

[pull] amdgpu, amdkfd drm-next-5.3
by Alex Deucher 04 Jun '19

04 Jun '19

Hi Dave, Daniel, New stuff for 5.3: - Add new thermal sensors for vega asics - Various RAS fixes - Add sysfs interface for memory interface utilization - Use HMM rather than mmu notifier for user pages - Expose xgmi topology via kfd - SR-IOV fixes - Fixes for manual driver reload - Add unique identifier for vega asics - Clean up user fence handling with UVD/VCE/VCN blocks - Convert DC to use core bpc attribute rather than a custom one - Add GWS support for KFD - Vega powerplay improvements - Add CRC support for DCE 12 - SR-IOV support for new security policy - Various cleanups The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9: Linux 5.2-rc1 (2019-05-19 15:47:09 -0700) are available in the Git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-5.3 for you to fetch changes up to cf401e2856b27b2deeada498eab864e2a50cf219: drm/amdkfd: fix null pointer dereference on dev (2019-05-29 16:50:09 -0500) ---------------------------------------------------------------- Alex Deucher (3): drm/amdgpu/vega20: use mode1 reset for RAS and XGMI drm/amdgpu: use pcie_bandwidth_available rather than open coding it drm/amdgpu/soc15: skip reset on init Amber Lin (1): drm/amdkfd: Add domain number into gpu_id Anthony Koo (1): drm/amd/display: fix multi display seamless boot case Aric Cyr (5): drm/amd/display: 3.2.28 drm/amd/display: 3.2.29 drm/amd/display: 3.2.30 drm/amd/display: Use VCP for extended colorimetry drm/amd/display: 3.2.31 Bhawanpreet Lakha (1): drm/amd/powerplay: Fix maybe-uninitialized in get_ppfeature_status Charlene Liu (5): drm/amd/display: add SW_USE_I2C_REG request. drm/amd/display: color space ycbcr709 support drm/amd/display: reset retimer/redriver below 340Mhz drm/amd/display: define v_total_min and max parameters drm/amd/display: enabling stream after HPD low to high happened Chengming Gui (2): drm/amd/powerplay: Enable "disable dpm" feature to support swSMU debug (v2) drm/amd/powerplay: Fix code error for translating int type to bool type correctly Chris Park (2): drm/amd/display: Support AVI InfoFrame V3 and V4 drm/amd/display: Define Byte 14 on AVI InfoFrame Christian König (2): drm/amdgpu: rename amdgpu_prime.[ch] into amdgpu_dma_buf.[ch] drm/amdgpu: remove static GDS, GWS and OA allocation Chunming Zhou (1): drm/amdgpu: add DRIVER_SYNCOBJ_TIMELINE to amdgpu Colin Ian King (2): drm/amdgpu: fix spelling mistake "retrived" -> "retrieved" drm/amdkfd: fix null pointer dereference on dev Dmytro Laktyushkin (4): drm/amd/display: move signal type out of otg dlg params drm/amd/display: stop external access to internal optc sync params drm/amd/display: fix acquire_first_split_pipe function drm/amd/display: add null checks and set update flags Emily Deng (2): drm/amdgpu: fix unload driver fail drm/amdgpu: Need to set the baco cap before baco reset Eric Yang (2): drm/amd/display: Set dispclk and dprefclock directly drm/amd/display: move back vbios cmd table for set dprefclk Evan Quan (26): drm/amd/powerplay: support hotspot/memory critical limit values drm/amd/powerplay: support temperature emergency max values drm/amd/powerplay: support SMU metrics table on Vega12 drm/amd/powerplay: expose current hotspot and memory temperatures V2 drm/amd/powerplay: support hwmon temperature channel labels V2 drm/amd/powerplay: expose Vega12 current power drm/amd/powerplay: expose Vega12 current gpu activity drm/amd/powerplay: expose Vega20 realtime memory utilization drm/amd/powerplay: expose Vega12 realtime memory utilization drm/amd/powerplay: expose SMU7 asics realtime memory utilization drm/amdgpu: add new sysfs interface for memory realtime utilization drm/amdgpu: enable separate timeout setting for every ring type V4 drm/amd/powerplay: fix Vega10 mclk/socclk voltage link setup drm/amd/powerplay: valid Vega10 DPMTABLE_OD_UPDATE_VDDC settings V2 drm/amd/powerplay: avoid repeat AVFS enablement/disablement drm/amd/powerplay: update Vega10 power state on OD drm/amd/powerplay: force to update all clock tables on OD reset drm/amd/powerplay: update Vega10 ACG Avfs Gb parameters drm/amd/powerplay: drop unnecessary sw smu check drm/amd/powerplay: drop redundant smu call drm/amd/powerplay: support ppfeatures sysfs interface on sw smu routine drm/amd/powerplay: honor hw limit on fetching metrics data drm/amd/powerplay: support uclk activity retrieve on sw smu routine drm/amd/powerplay: support sw smu hotspot and memory temperature retrieval drm/amd/powerplay: fix sw SMU wrong UVD/VCE powergate setting drm/amd/powerplay: enable ppfeaturemask module parameter support on Vega20 Felix Kuehling (3): drm/amdgpu: Reserve shared fence for eviction fence drm/amdgpu: Improve error handling for HMM drm/amdkfd: Fix a circular lock dependency Harish Kasiviswanathan (1): drm/amdkfd: Fix compute profile switching Harry Wentland (3): drm/amd/display: Add ASICREV_IS_PICASSO drm/amd/display: Don't load DMCU for Raven 1 (v2) drm/amd/display: Drop DCN1_01 guards James Zhu (3): drm/amdgpu: add EDC counter register drm/amdgpu: add gfx9 gpr EDC workaround when RAS is enabled drm/amdgpu: Fix S3 test issue Jay Cornwall (4): drm/amdkfd: Fix gfx8 MEM_VIOL exception handler drm/amdkfd: Preserve wave state after instruction fetch MEM_VIOL drm/amdkfd: Fix gfx9 XNACK state save/restore drm/amdkfd: Preserve ttmp[4:5] instead of ttmp[14:15] Jonathan Kim (1): drm/amdgpu: add df perfmon regs and funcs for xgmi Joshua Aberback (2): drm/amd/display: Program VTG params after programming Global Sync drm/amd/display: Rename EDID_BLOCK_SIZE to DC_EDID_BLOCK_SIZE Jun Lei (2): drm/amd/display: add support for disconnected eDP panels drm/amd/display: dont set otg offset Kent Russell (6): drm/amdgpu: Add replay counter defines to NBIO headers drm/amdgpu: Add PCIe replay count sysfs file drm/amdgpu: Fix CIK references in gmc_v8 drm/amdkfd: Cosmetic cleanup drm/amdkfd: Add VegaM support drm/amdgpu: Add Unique Identifier sysfs file unique_id v2 Kevin Wang (1): drm/amd/powerplay: add helper function to get smu firmware & if version Leo (Hanghong) Ma (1): drm/amd/display: Expose send immediate sdp message interface Leo Liu (7): drm/amdgpu: add no_user_fence flag to ring funcs drm/amdgpu/UVD: set no_user_fence flag to true drm/amdgpu/VCE: set no_user_fence flag to true drm/amdgpu/VCN: set no_user_fence flag to true drm/amdgpu: check no_user_fence flag for engines drm/amdgpu: move the VCN DPG mode read and write to VCN drm/amdgpu: make VCN DPG pause mode detached from general VCN Monk Liu (1): drm/amdgpu: suppress repeating tmo report Nicholas Kazlauskas (6): drm/amd/display: Fill prescale_params->scale for RGB565 drm/amd/display: Disable cursor when offscreen in negative direction drm/amd/display: Hook up CRC capture support for dce120 drm/amd/display: Explicitly specify update type per plane info change drm/amd/display: Switch the custom "max bpc" property to the DRM prop drm/amd/display: Use new connector state when getting color depth Oak Zeng (26): drm/amdgpu: Remap hdp coherency registers drm/amdkfd: Expose HDP registers to user space drm/amdkfd: Use 64 bit sdma_bitmap drm/amdkfd: Add sdma allocation debug message drm/amdkfd: Differentiate b/t sdma_id and sdma_queue_id drm/amdkfd: Shift sdma_engine_id and sdma_queue_id in mqd drm/amdkfd: Introduce asic-specific mqd_manager_init function drm/amdkfd: Introduce DIQ type mqd manager drm/amdkfd: Init mqd managers in device queue manager init drm/amdkfd: Add mqd size in mqd manager struct drm/amdkfd: Allocate MQD trunk for HIQ and SDMA drm/amdkfd: Fix a potential memory leak drm/amdkfd: Move non-sdma mqd allocation out of init_mqd drm/amdkfd: Allocate hiq and sdma mqd from mqd trunk drm/amdkfd: Fix sdma queue map issue drm/amdkfd: Introduce XGMI SDMA queue type drm/amdkfd: Expose sdma engine numbers to topology drm/amdkfd: Delete alloc_format field from map_queue struct drm/amdkfd: Use kfd fd to mmap mmio drm/amdkfd: Add gws number to kfd topology node properties drm/amdgpu: Add interface to alloc gws from amdgpu drm/amdkfd: Allocate gws on device initialization drm/amdgpu: Add function to add/remove gws to kfd process drm/amdkfd: Add function to set queue gws drm/amdkfd: New IOCTL to allocate queue GWS drm/amdkfd: PM4 packets change to support GWS Ori Messinger (1): drm/amdgpu: Report firmware versions with sysfs v2 Paul Hsieh (1): drm/amd/display: Disable ABM before destroy ABM struct Philip Yang (7): drm/amdgpu: use HMM callback to replace mmu notifier drm/amdkfd: avoid HMM change cause circular lock drm/amdgpu: replace get_user_pages with HMM mirror helpers drm/amdgpu: fix HMM config dependency issue drm/amdkfd: support concurrent userptr update for HMM drm/amdgpu: support userptr cross VMAs case with HMM drm/amdgpu: more descriptive message if HMM not enabled Roman Li (1): drm/amd/display: Fill plane attrs only for valid pxl format Samson Tam (1): drm/amd/display: block passive dongle EDID Emulation for USB-C ports SivapiriyanKumarasamy (1): drm/amd/display: Remove DPMS state dependency for fast boot Slava Abramov (1): drm/amdgpu: use div64_ul for 32-bit compatibility v1 Tiecheng Zhou (1): drm/amdgpu/sriov: Need to initialize the HDP_NONSURFACE_BAStE Tom St Denis (3): drm/amd/amdgpu: Add MEM_LOAD to amdgpu_pm_info debugfs file drm/amd/doc: Add XGMI sysfs documentation drm/amd/doc: Add RAS documentation to guide Trigger Huang (9): drm/amdgpu: init vega10 SR-IOV reg access mode drm/amdgpu: initialize PSP before IH under SR-IOV drm/amdgpu: Add new PSP cmd GFX_CMD_ID_PROG_REG drm/amdgpu: implement PSP cmd GFX_CMD_ID_PROG_REG drm/amdgpu: call psp to program ih cntl in SR-IOV drm/amdgpu: Support PSP VMR ring for Vega10 VF drm/amdgpu: Skip setting some regs under Vega10 VF drm/amdgpu: add basic func for RLC program reg drm/amdgpu: RLC to program regs for Vega10 SR-IOV Vitaly Prosyak (1): drm/amd/display: Reuse MPC OGRAM for 1D blender Wang Hai (1): drm/amd/display: Make some functions static Weitao Hou (1): gpu: fix typos in code comments Wesley Chalmers (2): drm/amd/display: Engine-specific encoder allocation drm/amd/display: Use DCN functions instead of DCE Yogesh Mohan Marimuthu (1): drm/amdgpu: sort probed modes before adding common modes Yong Zhao (1): drm/amdkfd: Move sdma_queue_id calculation into allocate_sdma_queue() Yongqiang Sun (1): drm/amd/display: Refactor program watermark. shaoyunl (4): drm/amdgpu: Implement get num of hops between two xgmi device drm/amdkfd: Adjust weight to represent num_hops info when report xgmi iolink drm/amdgpu: Update latest xgmi topology info after each device is enumulated drm/amdgpu: Use heavy weight for tlb invalidation on xgmi configuration xinhui pan (14): drm/amdgpu: gpu reset will run late_init drm/amdgpu: Revert "drm/amdgpu: skip gpu reset when ras error occured" drm/amdgpu: Issue ras TA disable/enable cmd forcely on boot drm/amdgpu: handle ras reset drm/amdgpu: gmc support ras gpu reset drm/amdgpu: gfx support ras gpu reset drm/amdgpu: sdma support ras gpu reset drm/amdgpu: gpu reset will run ras post init drm/amdgpu: add badpages sysfs interafce drm/amdgpu: ras support suspend/resume drm/amdgpu: enable ras suspend/resume drm/amdgpu: gmc handle ras resume drm/amdgpu: gfx handle ras resume drm/amdgpu: sdma handle ras resume Documentation/gpu/amdgpu.rst | 20 + drivers/gpu/drm/amd/amdgpu/Kconfig | 7 +- drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 29 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 70 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 83 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 225 ++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 144 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 133 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 - .../amdgpu/{amdgpu_prime.c => amdgpu_dma_buf.c} | 131 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 46 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 14 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 96 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 35 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h | 21 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 16 - drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 185 ++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 254 ++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 28 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 37 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 232 +++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 289 ++++++------ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 63 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 130 +----- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 23 + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 44 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 13 + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 81 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 3 +- drivers/gpu/drm/amd/amdgpu/cik.c | 13 + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 428 ++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/df_v3_6.h | 17 + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 32 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 32 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 424 ++++++++++++++---- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 14 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 35 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 25 +- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 21 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 15 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 15 +- drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 8 + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 131 ++++-- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 43 +- drivers/gpu/drm/amd/amdgpu/si.c | 13 + drivers/gpu/drm/amd/amdgpu/soc15.c | 92 +++- drivers/gpu/drm/amd/amdgpu/soc15.h | 10 + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 68 ++- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 1 + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 1 + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 3 + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 1 + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 1 + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 135 +++++- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 91 +++- drivers/gpu/drm/amd/amdgpu/vi.c | 13 + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 483 ++++++++++----------- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 13 - .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 63 +-- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 83 +++- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 12 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 65 ++- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 378 +++++++++------- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 14 +- .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 2 + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 1 + .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 2 + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 6 +- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 5 +- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 70 +-- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 8 + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 53 ++- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 85 ++-- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 55 ++- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 14 +- drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h | 7 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 31 +- .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 71 ++- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 18 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 3 + drivers/gpu/drm/amd/display/Kconfig | 6 - drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 94 ++-- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 - drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 + .../amd/display/dc/bios/command_table_helper2.c | 5 - drivers/gpu/drm/amd/display/dc/core/dc.c | 95 ++-- .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 29 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 37 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 130 ++---- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 51 +-- drivers/gpu/drm/amd/display/dc/dc.h | 5 +- drivers/gpu/drm/amd/display/dc/dc_helper.c | 2 +- drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + drivers/gpu/drm/amd/display/dc/dc_types.h | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 + drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 78 +++- drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.h | 23 + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 4 +- drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 7 +- drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 3 + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 1 + .../drm/amd/display/dc/dce100/dce100_resource.c | 44 +- .../drm/amd/display/dc/dce100/dce100_resource.h | 5 + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 97 ++--- .../drm/amd/display/dc/dce110/dce110_resource.c | 40 +- .../drm/amd/display/dc/dce110/dce110_resource.h | 5 + .../display/dc/dce110/dce110_timing_generator.c | 5 + .../display/dc/dce110/dce110_timing_generator.h | 5 + .../display/dc/dce110/dce110_timing_generator_v.c | 5 + .../drm/amd/display/dc/dce112/dce112_resource.c | 3 +- .../drm/amd/display/dc/dce120/dce120_resource.c | 9 +- .../display/dc/dce120/dce120_timing_generator.c | 96 +++- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 3 +- .../amd/display/dc/dce80/dce80_timing_generator.c | 7 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c | 78 +++- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 430 +++++++++--------- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 16 + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 55 ++- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 2 + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 2 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 152 ++++--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 20 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 91 ++-- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.h | 5 + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 107 ++++- .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 22 + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 2 +- .../drm/amd/display/dc/dml/display_mode_structs.h | 5 + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 4 - drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 5 - drivers/gpu/drm/amd/display/dc/inc/core_types.h | 25 ++ drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 8 +- .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 1 + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 7 +- .../drm/amd/display/dc/inc/hw/timing_generator.h | 25 +- drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 5 + .../drm/amd/display/include/bios_parser_types.h | 3 +- drivers/gpu/drm/amd/display/include/dal_asic_id.h | 10 +- drivers/gpu/drm/amd/display/include/dal_types.h | 2 - .../gpu/drm/amd/display/include/set_mode_types.h | 5 +- .../drm/amd/display/modules/color/color_gamma.c | 56 ++- .../drm/amd/display/modules/color/color_gamma.h | 1 + .../amd/display/modules/info_packet/info_packet.c | 4 +- .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 18 + .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 31 ++ .../drm/amd/include/asic_reg/nbio/nbio_6_1_smn.h | 3 + .../drm/amd/include/asic_reg/nbio/nbio_7_0_smn.h | 3 + .../drm/amd/include/asic_reg/nbio/nbio_7_4_0_smn.h | 3 + drivers/gpu/drm/amd/include/cik_structs.h | 3 +- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 1 + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 11 + drivers/gpu/drm/amd/include/v9_structs.h | 3 +- drivers/gpu/drm/amd/include/vi_structs.h | 3 +- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 76 ++-- .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 18 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 5 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 156 ++++++- .../amd/powerplay/hwmgr/vega10_processpptables.c | 24 + .../amd/powerplay/hwmgr/vega10_processpptables.h | 1 + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 123 ++++-- drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h | 3 + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 84 +++- drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 12 +- drivers/gpu/drm/amd/powerplay/inc/power_state.h | 7 + drivers/gpu/drm/amd/powerplay/inc/pp_thermal.h | 12 +- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 3 + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 1 + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 191 ++++++-- drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 2 + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 2 + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 2 + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 2 + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 2 + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 21 + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 2 + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 153 +++++++ drivers/gpu/drm/amd/powerplay/vega20_ppt.h | 44 ++ include/uapi/linux/kfd_ioctl.h | 35 +- 202 files changed, 6445 insertions(+), 2477 deletions(-) rename drivers/gpu/drm/amd/amdgpu/{amdgpu_prime.c => amdgpu_dma_buf.c} (93%) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h

3 4

[PATCH v2] drm/komeda: Added AFBC support for komeda driver
by james qian wang (Arm Technology China) 04 Jun '19

04 Jun '19

For supporting AFBC: 1. Check if the user requested modifier can be supported by display HW. 2. Check the obj->size with AFBC's requirement. 3. Configure HW according to the modifier (afbc features) This patch depends on: - https://patchwork.freedesktop.org/series/59915/ - https://patchwork.freedesktop.org/series/59000/ v2: Rebase and addressed Ayan's comments Signed-off-by: James Qian Wang (Arm Technology China) <james.qian.wang(a)arm.com> --- .../arm/display/komeda/d71/d71_component.c | 39 ++++++++++ .../arm/display/komeda/komeda_format_caps.c | 53 +++++++++++++ .../arm/display/komeda/komeda_format_caps.h | 5 ++ .../arm/display/komeda/komeda_framebuffer.c | 75 ++++++++++++++++++- .../arm/display/komeda/komeda_framebuffer.h | 4 + .../gpu/drm/arm/display/komeda/komeda_kms.c | 2 +- .../drm/arm/display/komeda/komeda_pipeline.h | 4 + .../display/komeda/komeda_pipeline_state.c | 18 ++++- .../gpu/drm/arm/display/komeda/komeda_plane.c | 15 +++- 9 files changed, 210 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c b/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c index 323e5994a55c..5c9bc859f886 100644 --- a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c @@ -134,6 +134,27 @@ static u32 to_rot_ctrl(u32 rot) return lr_ctrl; } +static u32 to_ad_ctrl(u64 modifier) +{ + u32 afbc_ctrl = AD_AEN; + + if (!modifier) + return 0; + + if ((modifier & AFBC_FORMAT_MOD_BLOCK_SIZE_MASK) == + AFBC_FORMAT_MOD_BLOCK_SIZE_32x8) + afbc_ctrl |= AD_WB; + + if (modifier & AFBC_FORMAT_MOD_YTR) + afbc_ctrl |= AD_YT; + if (modifier & AFBC_FORMAT_MOD_SPLIT) + afbc_ctrl |= AD_BS; + if (modifier & AFBC_FORMAT_MOD_TILED) + afbc_ctrl |= AD_TH; + + return afbc_ctrl; +} + static inline u32 to_d71_input_id(struct komeda_component_output *output) { struct komeda_component *comp = output->component; @@ -173,6 +194,24 @@ static void d71_layer_update(struct komeda_component *c, fb->pitches[i] & 0xFFFF); } + malidp_write32(reg, AD_CONTROL, to_ad_ctrl(fb->modifier)); + if (fb->modifier) { + u64 addr; + + malidp_write32(reg, LAYER_AD_H_CROP, HV_CROP(st->afbc_crop_l, + st->afbc_crop_r)); + malidp_write32(reg, LAYER_AD_V_CROP, HV_CROP(st->afbc_crop_t, + st->afbc_crop_b)); + /* afbc 1.2 wants payload, afbc 1.0/1.1 wants end_addr */ + if (fb->modifier & AFBC_FORMAT_MOD_TILED) + addr = st->addr[0] + kfb->offset_payload; + else + addr = st->addr[0] + kfb->afbc_size - 1; + + malidp_write32(reg, BLK_P1_PTR_LOW, lower_32_bits(addr)); + malidp_write32(reg, BLK_P1_PTR_HIGH, upper_32_bits(addr)); + } + malidp_write32(reg, LAYER_FMT, kfb->format_caps->hw_id); malidp_write32(reg, BLK_IN_SIZE, HV_SIZE(st->hsize, st->vsize)); diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c b/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c index 1e17bd6107a4..b2195142e3f3 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c @@ -35,6 +35,59 @@ komeda_get_format_caps(struct komeda_format_caps_table *table, return NULL; } +/* Two assumptions + * 1. RGB always has YTR + * 2. Tiled RGB always has SC + */ +u64 komeda_supported_modifiers[] = { + /* AFBC_16x16 + features: YUV+RGB both */ + AFBC_16x16(0), + /* SPARSE */ + AFBC_16x16(_SPARSE), + /* YTR + (SPARSE) */ + AFBC_16x16(_YTR | _SPARSE), + AFBC_16x16(_YTR), + /* SPLIT + SPARSE + YTR RGB only */ + /* split mode is only allowed for sparse mode */ + AFBC_16x16(_SPLIT | _SPARSE | _YTR), + /* TILED + (SPARSE) */ + /* TILED YUV format only */ + AFBC_16x16(_TILED | _SPARSE), + AFBC_16x16(_TILED), + /* TILED + SC + (SPLIT+SPARSE | SPARSE) + (YTR) */ + AFBC_16x16(_TILED | _SC | _SPLIT | _SPARSE | _YTR), + AFBC_16x16(_TILED | _SC | _SPARSE | _YTR), + AFBC_16x16(_TILED | _SC | _YTR), + /* AFBC_32x8 + features: which are RGB formats only */ + /* YTR + (SPARSE) */ + AFBC_32x8(_YTR | _SPARSE), + AFBC_32x8(_YTR), + /* SPLIT + SPARSE + (YTR) */ + /* split mode is only allowed for sparse mode */ + AFBC_32x8(_SPLIT | _SPARSE | _YTR), + /* TILED + SC + (SPLIT+SPARSE | SPARSE) + YTR */ + AFBC_32x8(_TILED | _SC | _SPLIT | _SPARSE | _YTR), + AFBC_32x8(_TILED | _SC | _SPARSE | _YTR), + AFBC_32x8(_TILED | _SC | _YTR), + DRM_FORMAT_MOD_LINEAR, + DRM_FORMAT_MOD_INVALID +}; + +bool komeda_format_mod_supported(struct komeda_format_caps_table *table, + u32 layer_type, u32 fourcc, u64 modifier) +{ + const struct komeda_format_caps *caps; + + caps = komeda_get_format_caps(table, fourcc, modifier); + if (!caps) + return false; + + if (!(caps->supported_layer_types & layer_type)) + return false; + + return true; +} + u32 *komeda_get_layer_fourcc_list(struct komeda_format_caps_table *table, u32 layer_type, u32 *n_fmts) { diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h b/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h index 60f39e77b098..bc3b2df361b9 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h @@ -77,6 +77,8 @@ struct komeda_format_caps_table { const struct komeda_format_caps *format_caps; }; +extern u64 komeda_supported_modifiers[]; + const struct komeda_format_caps * komeda_get_format_caps(struct komeda_format_caps_table *table, u32 fourcc, u64 modifier); @@ -86,4 +88,7 @@ u32 *komeda_get_layer_fourcc_list(struct komeda_format_caps_table *table, void komeda_put_fourcc_list(u32 *fourcc_list); +bool komeda_format_mod_supported(struct komeda_format_caps_table *table, + u32 layer_type, u32 fourcc, u64 modifier); + #endif diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c index 4d8160cf09c3..d0e713aedb8e 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c @@ -36,6 +36,76 @@ static const struct drm_framebuffer_funcs komeda_fb_funcs = { .create_handle = komeda_fb_create_handle, }; +static int +komeda_fb_afbc_size_check(struct komeda_fb *kfb, struct drm_file *file, + const struct drm_mode_fb_cmd2 *mode_cmd) +{ + struct drm_framebuffer *fb = &kfb->base; + const struct drm_format_info *info = fb->format; + struct drm_gem_object *obj; + u32 alignment_w = 0, alignment_h = 0, alignment_header; + u32 n_blocks = 0, min_size = 0; + + obj = drm_gem_object_lookup(file, mode_cmd->handles[0]); + if (!obj) { + DRM_DEBUG_KMS("Failed to lookup GEM object\n"); + return -ENOENT; + } + + switch (fb->modifier & AFBC_FORMAT_MOD_BLOCK_SIZE_MASK) { + case AFBC_FORMAT_MOD_BLOCK_SIZE_32x8: + alignment_w = 32; + alignment_h = 8; + break; + case AFBC_FORMAT_MOD_BLOCK_SIZE_16x16: + alignment_w = 16; + alignment_h = 16; + break; + default: + WARN(1, "Invalid AFBC_FORMAT_MOD_BLOCK_SIZE: %lld.\n", + fb->modifier & AFBC_FORMAT_MOD_BLOCK_SIZE_MASK); + break; + } + + /* tiled header afbc */ + if (fb->modifier & AFBC_FORMAT_MOD_TILED) { + alignment_w *= AFBC_TH_LAYOUT_ALIGNMENT; + alignment_h *= AFBC_TH_LAYOUT_ALIGNMENT; + alignment_header = AFBC_TH_BODY_START_ALIGNMENT; + } else { + alignment_header = AFBC_BODY_START_ALIGNMENT; + } + + kfb->aligned_w = ALIGN(fb->width, alignment_w); + kfb->aligned_h = ALIGN(fb->height, alignment_h); + + if (fb->offsets[0] % alignment_header) { + DRM_DEBUG_KMS("afbc offset alignment check failed.\n"); + goto check_failed; + } + + n_blocks = (kfb->aligned_w * kfb->aligned_h) / AFBC_SUPERBLK_PIXELS; + kfb->offset_payload = ALIGN(n_blocks * AFBC_HEADER_SIZE, + alignment_header); + + kfb->afbc_size = kfb->offset_payload + n_blocks * + ALIGN(info->cpp[0] * AFBC_SUPERBLK_PIXELS, + AFBC_SUPERBLK_ALIGNMENT); + min_size = kfb->afbc_size + fb->offsets[0]; + if (min_size > obj->size) { + DRM_DEBUG_KMS("afbc size check failed, obj_size: 0x%lx. min_size 0x%x.\n", + obj->size, min_size); + goto check_failed; + } + + fb->obj[0] = obj; + return 0; + +check_failed: + drm_gem_object_put_unlocked(obj); + return -EINVAL; +} + static int komeda_fb_none_afbc_size_check(struct komeda_dev *mdev, struct komeda_fb *kfb, struct drm_file *file, @@ -118,7 +188,10 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file, drm_helper_mode_fill_fb_struct(dev, &kfb->base, mode_cmd); - ret = komeda_fb_none_afbc_size_check(mdev, kfb, file, mode_cmd); + if (kfb->base.modifier) + ret = komeda_fb_afbc_size_check(kfb, file, mode_cmd); + else + ret = komeda_fb_none_afbc_size_check(mdev, kfb, file, mode_cmd); if (ret < 0) goto err_cleanup; diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h index ea2fe190c1e3..e3bab0defd72 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h @@ -25,6 +25,10 @@ struct komeda_fb { u32 aligned_w; /** @aligned_h: aligned frame buffer height */ u32 aligned_h; + /** @afbc_size: minimum size of afbc */ + u32 afbc_size; + /** @offset_payload: start of afbc body buffer */ + u32 offset_payload; }; #define to_kfb(dfb) container_of(dfb, struct komeda_fb, base) diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c index 3e58901fb776..306ea069a1b4 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c @@ -148,7 +148,7 @@ static void komeda_kms_mode_config_init(struct komeda_kms_dev *kms, config->min_height = 0; config->max_width = 4096; config->max_height = 4096; - config->allow_fb_modifiers = false; + config->allow_fb_modifiers = true; config->funcs = &komeda_mode_config_funcs; config->helper_private = &komeda_mode_config_helpers; diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h index 1b7e933ea303..fdde93bad8de 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h @@ -235,6 +235,10 @@ struct komeda_layer_state { /* layer specific configuration state */ u16 hsize, vsize; u32 rot; + u16 afbc_crop_l; + u16 afbc_crop_r; + u16 afbc_crop_t; + u16 afbc_crop_b; dma_addr_t addr[3]; }; diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c index 9748c9438868..db2c3d6d2a8a 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c @@ -291,8 +291,22 @@ komeda_layer_validate(struct komeda_layer *layer, st = to_layer_st(c_st); st->rot = dflow->rot; - st->hsize = kfb->aligned_w; - st->vsize = kfb->aligned_h; + + if (fb->modifier) { + st->hsize = kfb->aligned_w; + st->vsize = kfb->aligned_h; + st->afbc_crop_l = dflow->in_x; + st->afbc_crop_r = kfb->aligned_w - dflow->in_x - dflow->in_w; + st->afbc_crop_t = dflow->in_y; + st->afbc_crop_b = kfb->aligned_h - dflow->in_y - dflow->in_h; + } else { + st->hsize = dflow->in_w; + st->vsize = dflow->in_h; + st->afbc_crop_l = 0; + st->afbc_crop_r = 0; + st->afbc_crop_t = 0; + st->afbc_crop_b = 0; + } for (i = 0; i < fb->format->num_planes; i++) st->addr[i] = komeda_fb_get_pixel_addr(kfb, dflow->in_x, diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_plane.c b/drivers/gpu/drm/arm/display/komeda/komeda_plane.c index 07ed0cc1bc44..6462c0206942 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_plane.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_plane.c @@ -153,6 +153,18 @@ komeda_plane_atomic_destroy_state(struct drm_plane *plane, kfree(to_kplane_st(state)); } +static bool +komeda_plane_format_mod_supported(struct drm_plane *plane, + u32 format, u64 modifier) +{ + struct komeda_dev *mdev = plane->dev->dev_private; + struct komeda_plane *kplane = to_kplane(plane); + u32 layer_type = kplane->layer->layer_type; + + return komeda_format_mod_supported(&mdev->fmt_tbl, layer_type, + format, modifier); +} + static const struct drm_plane_funcs komeda_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, @@ -160,6 +172,7 @@ static const struct drm_plane_funcs komeda_plane_funcs = { .reset = komeda_plane_reset, .atomic_duplicate_state = komeda_plane_atomic_duplicate_state, .atomic_destroy_state = komeda_plane_atomic_destroy_state, + .format_mod_supported = komeda_plane_format_mod_supported, }; /* for komeda, which is pipeline can be share between crtcs */ @@ -212,7 +225,7 @@ static int komeda_plane_add(struct komeda_kms_dev *kms, err = drm_universal_plane_init(&kms->base, plane, get_possible_crtcs(kms, c->pipeline), &komeda_plane_funcs, - formats, n_formats, NULL, + formats, n_formats, komeda_supported_modifiers, get_plane_type(kms, c), "%s", c->name); -- 2.17.1

2 1

[Bug 110422] AMD_DEBUG=forcedma will crash OpenGL aps with SIGFAULT on VegaM 8706G
by bugzilla-daemon＠freedesktop.org 04 Jun '19

04 Jun '19

https://bugs.freedesktop.org/show_bug.cgi?id=110422 Bug ID: 110422 Summary: AMD_DEBUG=forcedma will crash OpenGL aps with SIGFAULT on VegaM 8706G Product: Mesa Version: git Hardware: Other OS: All Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/radeonsi Assignee: dri-devel(a)lists.freedesktop.org Reporter: phusho(a)yahoo.com QA Contact: dri-devel(a)lists.freedesktop.org Created attachment 143966 --> https://bugs.freedesktop.org/attachment.cgi?id=143966&action=edit Unigen Heaven same command DRI_PRIME=1 AMD_DEBUG=forcedma glxinfo [26320.370012] amdgpu 0000:01:00.0: GPU pci config reset [26332.450816] [drm] PCIE GART of 256M enabled (table at 0x000000F400000000). [26332.574698] [drm] UVD and UVD ENC initialized successfully. [26332.684628] [drm] VCE initialized successfully. [26332.747280] glxinfo[28470]: segfault at 0 ip 0000000000000000 sp 00007fff9ef92e08 error 14 in glxinfo[56271c220000+c000] [26332.747284] Code: Bad RIP value. but same command with glxgears work correct. Unigen will crash also -- You are receiving this mail because: You are the assignee for the bug.

1 4

[PATCH 1/2] drm/arm/hdlcd: Actually validate CRTC modes
by Robin Murphy 04 Jun '19

04 Jun '19

Rather than allowing any old mode through, then subsequently refusing unmatchable clock rates in atomic_check when it's too late to back out and pick a different mode, let's do that validation up-front where it will cause unsupported modes to be correctly pruned in the first place. This also eliminates an issue whereby a perceived clock rate of 0 would cause atomic disable to fail and prevent the module from being unloaded. Signed-off-by: Robin Murphy <robin.murphy(a)arm.com> --- This supersedes my previous patch here: https://patchwork.freedesktop.org/patch/288553/ --- drivers/gpu/drm/arm/hdlcd_crtc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c index 0b2b62f8fa3c..ecac6fe0b213 100644 --- a/drivers/gpu/drm/arm/hdlcd_crtc.c +++ b/drivers/gpu/drm/arm/hdlcd_crtc.c @@ -186,20 +186,19 @@ static void hdlcd_crtc_atomic_disable(struct drm_crtc *crtc, clk_disable_unprepare(hdlcd->clk); } -static int hdlcd_crtc_atomic_check(struct drm_crtc *crtc, - struct drm_crtc_state *state) +static enum drm_mode_status hdlcd_crtc_mode_valid(struct drm_crtc *crtc, + const struct drm_display_mode *mode) { struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc); - struct drm_display_mode *mode = &state->adjusted_mode; long rate, clk_rate = mode->clock * 1000; rate = clk_round_rate(hdlcd->clk, clk_rate); if (rate != clk_rate) { /* clock required by mode not supported by hardware */ - return -EINVAL; + return MODE_NOCLOCK; } - return 0; + return MODE_OK; } static void hdlcd_crtc_atomic_begin(struct drm_crtc *crtc, @@ -220,7 +219,7 @@ static void hdlcd_crtc_atomic_begin(struct drm_crtc *crtc, } static const struct drm_crtc_helper_funcs hdlcd_crtc_helper_funcs = { - .atomic_check = hdlcd_crtc_atomic_check, + .mode_valid = hdlcd_crtc_mode_valid, .atomic_begin = hdlcd_crtc_atomic_begin, .atomic_enable = hdlcd_crtc_atomic_enable, .atomic_disable = hdlcd_crtc_atomic_disable, -- 2.21.0.dirty

2 3

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2019