dri-devel July 2021

dri-devel@lists.freedesktop.org

321 participants
829 discussions

[PATCH v2] drm/amdgpu: Avoid printing of stack contents on firmware load error
by Jiri Kosina 01 Jul '21

01 Jul '21

From: Jiri Kosina <jkosina(a)suse.cz> In case when psp_init_asd_microcode() fails to load ASD microcode file, psp_v12_0_init_microcode() tries to print the firmware filename that failed to load before bailing out. This is wrong because: - the firmware filename it would want it print is an incorrect one as psp_init_asd_microcode() and psp_v12_0_init_microcode() are loading different filenames - it tries to print fw_name, but that's not yet been initialized by that time, so it prints random stack contents, e.g. amdgpu 0000:04:00.0: Direct firmware load for amdgpu/renoir_asd.bin failed with error -2 amdgpu 0000:04:00.0: amdgpu: fail to initialize asd microcode amdgpu 0000:04:00.0: amdgpu: psp v12.0: Failed to load firmware "\xfeTO\x8e\xff\xff" Fix that by bailing out immediately, instead of priting the bogus error message. Reported-by: Vojtech Pavlik <vojtech(a)ucw.cz> Signed-off-by: Jiri Kosina <jkosina(a)suse.cz> --- v1 -> v2: remove now-unused label drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c index c4828bd3264b..b0ee77ee80b9 100644 --- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c @@ -67,7 +67,7 @@ static int psp_v12_0_init_microcode(struct psp_context *psp) err = psp_init_asd_microcode(psp, chip_name); if (err) - goto out; + return err; snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", chip_name); err = request_firmware(&adev->psp.ta_fw, fw_name, adev->dev); @@ -80,7 +80,7 @@ static int psp_v12_0_init_microcode(struct psp_context *psp) } else { err = amdgpu_ucode_validate(adev->psp.ta_fw); if (err) - goto out2; + goto out; ta_hdr = (const struct ta_firmware_header_v1_0 *) adev->psp.ta_fw->data; @@ -105,10 +105,9 @@ static int psp_v12_0_init_microcode(struct psp_context *psp) return 0; -out2: +out: release_firmware(adev->psp.ta_fw); adev->psp.ta_fw = NULL; -out: if (err) { dev_err(adev->dev, "psp v12.0: Failed to load firmware \"%s\"\n", -- 2.12.3

2 2

[PATCH] drm/amdgpu: Fix resource leak on probe error path
by Jiri Kosina 01 Jul '21

01 Jul '21

From: Jiri Kosina <jkosina(a)suse.cz> This reverts commit 4192f7b5768912ceda82be2f83c87ea7181f9980. It is not true (as stated in the reverted commit changelog) that we never unmap the BAR on failure; it actually does happen properly on amdgpu_driver_load_kms() -> amdgpu_driver_unload_kms() -> amdgpu_device_fini() error path. What's worse, this commit actually completely breaks resource freeing on probe failure (like e.g. failure to load microcode), as amdgpu_driver_unload_kms() notices adev->rmmio being NULL and bails too early, leaving all the resources that'd normally be freed in amdgpu_acpi_fini() and amdgpu_device_fini() still hanging around, leading to all sorts of oopses when someone tries to, for example, access the sysfs and procfs resources which are still around while the driver is gone. Fixes: 4192f7b57689 ("drm/amdgpu: unmap register bar on device init failure") Reported-by: Vojtech Pavlik <vojtech(a)ucw.cz> Signed-off-by: Jiri Kosina <jkosina(a)suse.cz> --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 57ec108b5972..0f1c0e17a587 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3414,13 +3414,13 @@ int amdgpu_device_init(struct amdgpu_device *adev, r = amdgpu_device_get_job_timeout_settings(adev); if (r) { dev_err(adev->dev, "invalid lockup_timeout parameter syntax\n"); - goto failed_unmap; + return r; } /* early init functions */ r = amdgpu_device_ip_early_init(adev); if (r) - goto failed_unmap; + return r; /* doorbell bar mapping and doorbell index init*/ amdgpu_device_doorbell_init(adev); @@ -3646,10 +3646,6 @@ int amdgpu_device_init(struct amdgpu_device *adev, failed: amdgpu_vf_error_trans_all(adev); -failed_unmap: - iounmap(adev->rmmio); - adev->rmmio = NULL; - return r; } -- 2.12.3

2 2

[PATCH] dt-bindings: Fix 'unevaluatedProperties' errors in DT graph users
by Rob Herring 01 Jul '21

01 Jul '21

In testing out under development json-schema 2020-12 support, there's a few issues with 'unevaluatedProperties' and the graph schema. If 'graph.yaml#/properties/port' is used, then neither the port nor the endpoint(s) can have additional properties. 'graph.yaml#/$defs/port-base' needs to be used instead. Cc: Sakari Ailus <sakari.ailus(a)linux.intel.com> Cc: Mauro Carvalho Chehab <mchehab(a)kernel.org> Cc: "Paul J. Murphy" <paul.j.murphy(a)intel.com> Cc: Daniele Alessandrelli <daniele.alessandrelli(a)intel.com> Cc: "Niklas Söderlund" <niklas.soderlund(a)ragnatech.se> Cc: Krzysztof Kozlowski <krzk(a)kernel.org> Cc: Paul Kocialkowski <paul.kocialkowski(a)bootlin.com> Cc: dri-devel(a)lists.freedesktop.org Cc: linux-media(a)vger.kernel.org Cc: linux-renesas-soc(a)vger.kernel.org Signed-off-by: Rob Herring <robh(a)kernel.org> --- .../devicetree/bindings/display/bridge/lontium,lt8912b.yaml | 3 ++- Documentation/devicetree/bindings/media/i2c/imx258.yaml | 2 +- Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml | 2 +- Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml | 2 +- Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml | 2 +- Documentation/devicetree/bindings/media/renesas,vin.yaml | 3 ++- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml b/Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml index 735d0233a7d6..674891ee2f8e 100644 --- a/Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml +++ b/Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml @@ -29,7 +29,8 @@ properties: properties: port@0: - $ref: /schemas/graph.yaml#/properties/port + $ref: /schemas/graph.yaml#/$defs/port-base + unevaluatedProperties: false description: Primary MIPI port for MIPI input diff --git a/Documentation/devicetree/bindings/media/i2c/imx258.yaml b/Documentation/devicetree/bindings/media/i2c/imx258.yaml index 515317eff41a..cde0f7383b2a 100644 --- a/Documentation/devicetree/bindings/media/i2c/imx258.yaml +++ b/Documentation/devicetree/bindings/media/i2c/imx258.yaml @@ -49,7 +49,7 @@ properties: # See ../video-interfaces.txt for more details port: - $ref: /schemas/graph.yaml#/properties/port + $ref: /schemas/graph.yaml#/$defs/port-base additionalProperties: false properties: diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml b/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml index 9149f5685688..246dc5fec716 100644 --- a/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml +++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml @@ -45,7 +45,7 @@ properties: port: description: MIPI CSI-2 transmitter port - $ref: /schemas/graph.yaml#/properties/port + $ref: /schemas/graph.yaml#/$defs/port-base additionalProperties: false properties: diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml b/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml index 0699c7e4fdeb..b962863e4f65 100644 --- a/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml +++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml @@ -45,7 +45,7 @@ properties: port: description: MIPI CSI-2 transmitter port - $ref: /schemas/graph.yaml#/properties/port + $ref: /schemas/graph.yaml#/$defs/port-base additionalProperties: false properties: diff --git a/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml b/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml index 27cc5b7ff613..f5055b9db693 100644 --- a/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml +++ b/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml @@ -37,7 +37,7 @@ properties: port: additionalProperties: false - $ref: /schemas/graph.yaml#/properties/port + $ref: /schemas/graph.yaml#/$defs/port-base properties: endpoint: diff --git a/Documentation/devicetree/bindings/media/renesas,vin.yaml b/Documentation/devicetree/bindings/media/renesas,vin.yaml index dd1a5ce5896c..4945a2f0eca6 100644 --- a/Documentation/devicetree/bindings/media/renesas,vin.yaml +++ b/Documentation/devicetree/bindings/media/renesas,vin.yaml @@ -118,7 +118,8 @@ properties: properties: port@0: - $ref: /schemas/graph.yaml#/properties/port + $ref: /schemas/graph.yaml#/$defs/port-base + unevaluatedProperties: false description: Input port node, single endpoint describing a parallel input source. -- 2.27.0

3 3

[PATCH] dt-bindings: display: renesas,du: Fix 'ports' reference
by Rob Herring 01 Jul '21

01 Jul '21

Fix the renesas,du binding 'ports' schema which is referencing the 'port' schema instead of the 'ports' schema. Fixes: 99d66127fad2 ("dt-bindings: display: renesas,du: Convert binding to YAML") Cc: Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com> Cc: Kieran Bingham <kieran.bingham+renesas(a)ideasonboard.com> Cc: dri-devel(a)lists.freedesktop.org Cc: linux-renesas-soc(a)vger.kernel.org Signed-off-by: Rob Herring <robh(a)kernel.org> --- Documentation/devicetree/bindings/display/renesas,du.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/display/renesas,du.yaml b/Documentation/devicetree/bindings/display/renesas,du.yaml index 121596f106da..5f4345d43020 100644 --- a/Documentation/devicetree/bindings/display/renesas,du.yaml +++ b/Documentation/devicetree/bindings/display/renesas,du.yaml @@ -55,7 +55,7 @@ properties: maxItems: 1 ports: - $ref: /schemas/graph.yaml#/properties/port + $ref: /schemas/graph.yaml#/properties/ports description: | The connections to the DU output video ports are modeled using the OF graph bindings specified in Documentation/devicetree/bindings/graph.txt. -- 2.27.0

3 3

[PULL] drm-misc-next-fixes
by Thomas Zimmermann 01 Jul '21

01 Jul '21

Hi Dave and Daniel, this week's PR for drm-misc-next-fixes contains a number of BO-related fixes in amdgpu, gma500 and radeon, and a documentation fix for dma-buf. Best regards Thomas drm-misc-next-fixes-2021-07-01: Short summary of fixes pull: * amdgpu: TTM fixes * dma-buf: Doc fixes * gma500: Fix potential BO leaks in error handling * radeon: Fix NULL-ptr deref The following changes since commit eed75ce7c8260e0d5612ced4a88180ab991e207c: drm/amdgpu: fix amdgpu_preempt_mgr_new() (2021-06-21 15:24:29 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2021-07-01 for you to fetch changes up to f18f58012ee894039cd59ee8c889bf499d7a3943: drm/radeon: Fix NULL dereference when updating memory stats (2021-06-30 11:56:21 +0200) ---------------------------------------------------------------- Short summary of fixes pull: * amdgpu: TTM fixes * dma-buf: Doc fixes * gma500: Fix potential BO leaks in error handling * radeon: Fix NULL-ptr deref ---------------------------------------------------------------- Jing Xiangfeng (1): drm/gma500: Add the missed drm_gem_object_put() in psb_user_framebuffer_create() Mikel Rychliski (1): drm/radeon: Fix NULL dereference when updating memory stats Nirmoy Das (1): drm/amdgpu: return early for non-TTM_PL_TT type BOs Randy Dunlap (1): <linux/dma-resv.h>: correct a function name in kernel-doc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 ++- drivers/gpu/drm/gma500/framebuffer.c | 7 ++++++- drivers/gpu/drm/radeon/radeon_object.c | 29 ++++++++++++----------------- drivers/gpu/drm/radeon/radeon_object.h | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 13 ++++++++++--- include/linux/dma-resv.h | 2 +- 6 files changed, 32 insertions(+), 24 deletions(-) -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer

1 0

[PATCH v6 00/16] drm/panfrost
by Boris Brezillon 01 Jul '21

01 Jul '21

Hello, Bunch of improvements to make the panfrost driver more robust and allow queuing jobs at the HW level. Changes in v6: * Collected acks/reviews * Got rid of the cancel_delayed_work() calls in the reset path Changes in this v5: * Document what's excepted in the ->timedout_job() hook * Add a patch increasing the AS_ACTIVE polling timeout * Fix a few minor things here and there (see each commit for a detailed changelog) and collect R-b/A-b tags Changes in this v4: * fixing the reset serialization * fixing a deadlock in the reset path * moving the exception enum to a private header Regards, Boris Boris Brezillon (15): drm/sched: Document what the timedout_job method should do drm/sched: Allow using a dedicated workqueue for the timeout/fault tdr drm/panfrost: Make ->run_job() return an ERR_PTR() when appropriate drm/panfrost: Get rid of the unused JS_STATUS_EVENT_ACTIVE definition drm/panfrost: Drop the pfdev argument passed to panfrost_exception_name() drm/panfrost: Do the exception -> string translation using a table drm/panfrost: Expose a helper to trigger a GPU reset drm/panfrost: Use a threaded IRQ for job interrupts drm/panfrost: Simplify the reset serialization logic drm/panfrost: Make sure job interrupts are masked before resetting drm/panfrost: Disable the AS on unhandled page faults drm/panfrost: Reset the GPU when the AS_ACTIVE bit is stuck drm/panfrost: Don't reset the GPU on job faults unless we really have to drm/panfrost: Kill in-flight jobs on FD close drm/panfrost: Increase the AS_ACTIVE polling timeout Steven Price (1): drm/panfrost: Queue jobs on the hardware drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_sched.c | 3 +- drivers/gpu/drm/lima/lima_sched.c | 3 +- drivers/gpu/drm/panfrost/panfrost_device.c | 139 +++-- drivers/gpu/drm/panfrost/panfrost_device.h | 91 ++- drivers/gpu/drm/panfrost/panfrost_gpu.c | 2 +- drivers/gpu/drm/panfrost/panfrost_job.c | 626 +++++++++++++++------ drivers/gpu/drm/panfrost/panfrost_mmu.c | 43 +- drivers/gpu/drm/panfrost/panfrost_regs.h | 3 - drivers/gpu/drm/scheduler/sched_main.c | 14 +- drivers/gpu/drm/v3d/v3d_sched.c | 10 +- include/drm/gpu_scheduler.h | 37 +- 12 files changed, 717 insertions(+), 256 deletions(-) -- 2.31.1

3 21

[pull] amdgpu, amdkfd, radeon drm-next-5.14
by Alex Deucher 01 Jul '21

01 Jul '21

Hi Dave, Daniel, Fixes for 5.14. The following changes since commit b322a50d17ede5cff6622040f345228afecdcc45: Merge tag 'amd-drm-next-5.14-2021-06-22-1' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-06-24 07:57:41 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.14-2021-07-01 for you to fetch changes up to 93c5bcd4eaaafd7c25c062089806c86d9b7890dd: drm/amdgpu: Conditionally reset SDMA RAS error counts (2021-07-01 00:05:41 -0400) ---------------------------------------------------------------- amd-drm-next-5.14-2021-07-01: amdgpu: - Misc Navi fixes - Powergating fix - Yellow Carp updates - Beige Goby updates - S0ix fix - Revert overlay validation fix - GPU reset fix for DC - PPC64 fix - Add new dimgrey cavefish DID - RAS fix amdkfd: - SVM fixes radeon: - Fix missing drm_gem_object_put in error path ---------------------------------------------------------------- Aaron Liu (2): drm/amdgpu: enable tmz on yellow carp drm/amdgpu: enable sdma0 tmz for Raven/Renoir(V2) Alex Deucher (2): drm/amdgpu/display: drop unused variable drm/amdgpu: add new dimgrey cavefish DID Alex Sierra (11): drm/amdkfd: inc counter on child ranges with xnack off drm/amdkfd: device pgmap owner at the svm migrate init drm/amdkfd: add owner ref param to get hmm pages drm/amdkfd: set owner ref to svm range prefault drm/amdgpu: get owner ref in validate and map drm/amdkfd: use hmm range fault to get both domain pfns drm/amdkfd: classify and map mixed svm range pages in GPU drm/amdkfd: skip invalid pages during migrations drm/amdkfd: skip migration for pages already in VRAM drm/amdkfd: add invalid pages debug at vram migration drm/amdkfd: Maintain svm_bo reference in page->zone_device_data Chengming Gui (1): drm/amd/amdgpu: enable gpu recovery for beige_goby Chengzhe Liu (1): drm/amdgpu: Power down VCN and JPEG before disabling SMU features Darren Powell (1): amdgpu/pm: remove code duplication in show_power_cap calls Evan Quan (7): drm/amdgpu: correct tcp harvest setting drm/amdgpu: fix Navi1x tcp power gating hang when issuing lightweight invalidaiton drm/amdgpu: fix NAK-G generation during PCI-e link width switch drm/amdgpu: fix the hang caused by PCIe link width switch drm/amdgpu: correct clock gating settings on feature unsupported drm/amdgpu: update GFX MGCG settings drm/amdgpu: update HDP LS settings Guchun Chen (2): drm/amd/display: fix incorrrect valid irq check drm/amd/display: fix null pointer access in gpu reset Huang Rui (1): drm/amdgpu: move apu flags initialization to the start of device init Jing Xiangfeng (1): drm/radeon: Add the missed drm_gem_object_put() in radeon_user_framebuffer_create() Joseph Greathouse (1): drm/amdgpu: Update NV SIMD-per-CU to 2 Michal Suchanek (1): drm/amdgpu/dc: Really fix DCN3.1 Makefile for PPC64 Mukul Joshi (1): drm/amdgpu: Conditionally reset SDMA RAS error counts Nicholas Kazlauskas (1): drm/amd/display: Extend DMUB diagnostic logging to DCN3.1 Oak Zeng (1): drm/amdgpu: Set ttm caching flags during bo allocation Philip Yang (4): drm/amdkfd: add helper function for kfd sysfs create drm/amdkfd: fix sysfs kobj leak drm/amdkfd: add sysfs counters for vm fault and migration drm/amdkfd: implement counters for vm fault and migration Reka Norman (1): drm/amd/display: Respect CONFIG_FRAME_WARN=0 in dml Makefile Rodrigo Siqueira (1): Revert "drm/amd/display: Fix overlay validation by considering cursors" Shyam Sundar S K (1): drm/amd/pm: skip PrepareMp1ForUnload message in s0ix Tiezhu Yang (1): drm/radeon: Call radeon_suspend_kms() in radeon_pci_shutdown() for Loongson64 Veerabadhran Gopalakrishnan (1): amdgpu/nv.c - Added codec query for Beige Goby Zhan Liu (1): drm/amd/display: Enabling eDP no power sequencing with DAL feature mask drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 37 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 5 + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 12 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 266 +++++++++++++++----- drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c | 85 ++++--- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 10 +- drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 51 +++- drivers/gpu/drm/amd/amdgpu/nv.c | 37 ++- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 11 +- drivers/gpu/drm/amd/amdgpu/smuio_v11_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 10 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 100 +++++--- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 9 + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 272 ++++++++++++--------- .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 236 ++++++++++++------ drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 19 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13 +- drivers/gpu/drm/amd/display/dc/dc.h | 1 + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 31 ++- drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 2 + drivers/gpu/drm/amd/display/dc/dml/Makefile | 8 +- drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 4 +- drivers/gpu/drm/amd/display/dc/irq_types.h | 2 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 60 +++++ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 16 +- drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 5 +- drivers/gpu/drm/amd/include/amd_shared.h | 10 +- drivers/gpu/drm/amd/include/navi10_enum.h | 2 +- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 95 ++----- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 8 +- .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 3 +- drivers/gpu/drm/radeon/radeon_display.c | 1 + drivers/gpu/drm/radeon/radeon_drv.c | 8 +- 40 files changed, 987 insertions(+), 464 deletions(-)

1 0

linux-next: manual merge of the drm tree with Linus' tree
by Stephen Rothwell 01 Jul '21

01 Jul '21

Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c between commit: da68547d3692 ("drm/amdgpu: use vma_lookup() in amdgpu_ttm_tt_get_user_pages()") from Linus' tree and commit: 04d8d73dbcbe ("drm/amdgpu: add common HMM get pages function") from the drm tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 61c4fb1b87fe,6a214a4dfe04..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@@ -689,30 -680,12 +680,12 @@@ int amdgpu_ttm_tt_get_user_pages(struc if (!mmget_not_zero(mm)) /* Happens during process shutdown */ return -ESRCH; - range = kzalloc(sizeof(*range), GFP_KERNEL); - if (unlikely(!range)) { - r = -ENOMEM; - goto out; - } - range->notifier = &bo->notifier; - range->start = bo->notifier.interval_tree.start; - range->end = bo->notifier.interval_tree.last + 1; - range->default_flags = HMM_PFN_REQ_FAULT; - if (!amdgpu_ttm_tt_is_readonly(ttm)) - range->default_flags |= HMM_PFN_REQ_WRITE; - - range->hmm_pfns = kvmalloc_array(ttm->num_pages, - sizeof(*range->hmm_pfns), GFP_KERNEL); - if (unlikely(!range->hmm_pfns)) { - r = -ENOMEM; - goto out_free_ranges; - } - mmap_read_lock(mm); - vma = find_vma(mm, start); + vma = vma_lookup(mm, start); + mmap_read_unlock(mm); - if (unlikely(!vma || start < vma->vm_start)) { + if (unlikely(!vma)) { r = -EFAULT; - goto out_unlock; + goto out_putmm; } if (unlikely((gtt->userflags & AMDGPU_GEM_USERPTR_ANONONLY) && vma->vm_file)) {

1 0

[PATCH 0/7] CT changes required for GuC submission
by Matthew Brost 01 Jul '21

01 Jul '21

As part of enabling GuC submission discussed in [1], [2], and [3] we need optimize and update the CT code as this is now in the critical path of submission. This series includes the patches to do that which is the first 7 patches from [3]. The patches should have addressed all the feedback in [3] and should be ready to merge once CI returns a we get a few more RBs. Signed-off-by: Matthew Brost <matthew.brost(a)intel.com> [1] https://patchwork.freedesktop.org/series/89844/ [2] https://patchwork.freedesktop.org/series/91417/ [3] https://patchwork.freedesktop.org/series/91840/ John Harrison (1): drm/i915/guc: Module load failure test for CT buffer creation Matthew Brost (6): drm/i915/guc: Relax CTB response timeout drm/i915/guc: Improve error message for unsolicited CT response drm/i915/guc: Increase size of CTB buffers drm/i915/guc: Add non blocking CTB send function drm/i915/guc: Add stall timer to non blocking CTB send function drm/i915/guc: Optimize CTB writes and reads .../gt/uc/abi/guc_communication_ctb_abi.h | 3 +- drivers/gpu/drm/i915/gt/uc/intel_guc.h | 11 +- drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 253 +++++++++++++++--- drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h | 14 +- 4 files changed, 235 insertions(+), 46 deletions(-) -- 2.28.0

2 11

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel July 2021