dri-devel April 2022

dri-devel@lists.freedesktop.org

351 participants
951 discussions

[PATCH] gpu: drm: remove redundant dma_fence_put() when drm_sched_job_add_dependency() fails
by Hangyu Hua 29 Apr '22

29 Apr '22

When drm_sched_job_add_dependency() fails, dma_fence_put() will be called internally. Calling it again after drm_sched_job_add_dependency() finishes may result in a dangling pointer. Fix this by removing redundant dma_fence_put(). Signed-off-by: Hangyu Hua <hbh25y(a)gmail.com> --- drivers/gpu/drm/lima/lima_gem.c | 1 - drivers/gpu/drm/scheduler/sched_main.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_gem.c index 55bb1ec3c4f7..99c8e7f6bb1c 100644 --- a/drivers/gpu/drm/lima/lima_gem.c +++ b/drivers/gpu/drm/lima/lima_gem.c @@ -291,7 +291,6 @@ static int lima_gem_add_deps(struct drm_file *file, struct lima_submit *submit) err = drm_sched_job_add_dependency(&submit->task->base, fence); if (err) { - dma_fence_put(fence); return err; } } diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index b81fceb0b8a2..ebab9eca37a8 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -708,7 +708,6 @@ int drm_sched_job_add_implicit_dependencies(struct drm_sched_job *job, dma_fence_get(fence); ret = drm_sched_job_add_dependency(job, fence); if (ret) { - dma_fence_put(fence); return ret; } } -- 2.25.1

2 10

[PATCH v2 00/19] xen: simplify frontend side ring setup
by Juergen Gross 29 Apr '22

29 Apr '22

Many Xen PV frontends share similar code for setting up a ring page (allocating and granting access for the backend) and for tearing it down. Create new service functions doing all needed steps in one go. This requires all frontends to use a common value for an invalid grant reference in order to make the functions idempotent. Changes in V2: - new patch 9 and related changes in patches 10-18 Juergen Gross (19): xen/blkfront: switch blkfront to use INVALID_GRANT_REF xen/netfront: switch netfront to use INVALID_GRANT_REF xen/scsifront: remove unused GRANT_INVALID_REF definition xen/usb: switch xen-hcd to use INVALID_GRANT_REF xen/drm: switch xen_drm_front to use INVALID_GRANT_REF xen/sound: switch xen_snd_front to use INVALID_GRANT_REF xen/dmabuf: switch gntdev-dmabuf to use INVALID_GRANT_REF xen/shbuf: switch xen-front-pgdir-shbuf to use INVALID_GRANT_REF xen: update ring.h xen/xenbus: add xenbus_setup_ring() service function xen/blkfront: use xenbus_setup_ring() and xenbus_teardown_ring() xen/netfront: use xenbus_setup_ring() and xenbus_teardown_ring() xen/tpmfront: use xenbus_setup_ring() and xenbus_teardown_ring() xen/drmfront: use xenbus_setup_ring() and xenbus_teardown_ring() xen/pcifront: use xenbus_setup_ring() and xenbus_teardown_ring() xen/scsifront: use xenbus_setup_ring() and xenbus_teardown_ring() xen/usbfront: use xenbus_setup_ring() and xenbus_teardown_ring() xen/sndfront: use xenbus_setup_ring() and xenbus_teardown_ring() xen/xenbus: eliminate xenbus_grant_ring() drivers/block/xen-blkfront.c | 57 +++++--------- drivers/char/tpm/xen-tpmfront.c | 18 +---- drivers/gpu/drm/xen/xen_drm_front.h | 9 --- drivers/gpu/drm/xen/xen_drm_front_evtchnl.c | 43 +++-------- drivers/net/xen-netfront.c | 85 +++++++-------------- drivers/pci/xen-pcifront.c | 19 +---- drivers/scsi/xen-scsifront.c | 31 ++------ drivers/usb/host/xen-hcd.c | 65 ++++------------ drivers/xen/gntdev-dmabuf.c | 13 +--- drivers/xen/xen-front-pgdir-shbuf.c | 17 +---- drivers/xen/xenbus/xenbus_client.c | 82 +++++++++++++++----- include/xen/interface/io/ring.h | 19 +++-- include/xen/xenbus.h | 4 +- sound/xen/xen_snd_front_evtchnl.c | 44 +++-------- sound/xen/xen_snd_front_evtchnl.h | 9 --- 15 files changed, 179 insertions(+), 336 deletions(-) -- 2.34.1

2 3

[PATCH] gpu/drm/radeon: Fix spelling typo in comments
by pengfuyuan 29 Apr '22

29 Apr '22

Fix spelling typo in comments. Signed-off-by: pengfuyuan <pengfuyuan(a)kylinos.cn> --- drivers/gpu/drm/radeon/atombios.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/atombios.h b/drivers/gpu/drm/radeon/atombios.h index bd5dc09e860f..da35a970fcc0 100644 --- a/drivers/gpu/drm/radeon/atombios.h +++ b/drivers/gpu/drm/radeon/atombios.h @@ -3599,7 +3599,7 @@ typedef struct _ATOM_LCD_RTS_RECORD UCHAR ucRTSValue; }ATOM_LCD_RTS_RECORD; -//!! If the record below exits, it shoud always be the first record for easy use in command table!!! +//!! If the record below exists, it should always be the first record for easy use in command table!!! // The record below is only used when LVDS_Info is present. From ATOM_LVDS_INFO_V12, use ucLCDPanel_SpecialHandlingCap instead. typedef struct _ATOM_LCD_MODE_CONTROL_CAP { @@ -3823,7 +3823,7 @@ typedef struct _ATOM_DPCD_INFO // Note1: This table is filled by SetBiosReservationStartInFB in CoreCommSubs.asm // at running time. // note2: From RV770, the memory is more than 32bit addressable, so we will change -// ucTableFormatRevision=1,ucTableContentRevision=4, the strcuture remains +// ucTableFormatRevision=1,ucTableContentRevision=4, the structure remains // exactly same as 1.1 and 1.2 (1.3 is never in use), but ulStartAddrUsedByFirmware // (in offset to start of memory address) is KB aligned instead of byte aligend. /***********************************************************************************/ @@ -3858,7 +3858,7 @@ typedef struct _ATOM_VRAM_USAGE_BY_FIRMWARE ATOM_FIRMWARE_VRAM_RESERVE_INFO asFirmwareVramReserveInfo[ATOM_MAX_FIRMWARE_VRAM_USAGE_INFO]; }ATOM_VRAM_USAGE_BY_FIRMWARE; -// change verion to 1.5, when allow driver to allocate the vram area for command table access. +// change version to 1.5, when allow driver to allocate the vram area for command table access. typedef struct _ATOM_FIRMWARE_VRAM_RESERVE_INFO_V1_5 { ULONG ulStartAddrUsedByFirmware; @@ -5973,7 +5973,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO_V3 #define CLEAR_ATOM_S7_DOS_8BIT_DAC_EN ((ATOM_DOS_MODE_INFO_DEF << 8 )|ATOM_S7_DOS_8BIT_DAC_EN_SHIFT | ATOM_FLAG_CLEAR ) /****************************************************************************/ -//Portion II: Definitinos only used in Driver +//Portion II: Definitions only used in Driver /****************************************************************************/ // Macros used by driver @@ -7162,7 +7162,7 @@ typedef struct _DP_ENCODER_SERVICE_PARAMETERS // ucAction #define ATOM_DP_ACTION_GET_SINK_TYPE 0x01 -/* obselete */ +/* obsolete */ #define ATOM_DP_ACTION_TRAINING_START 0x02 #define ATOM_DP_ACTION_TRAINING_COMPLETE 0x03 #define ATOM_DP_ACTION_TRAINING_PATTERN_SEL 0x04 -- 2.25.1

2 1

[PATCH] drm/amdgpu: simplify the return expression of navi10_ih_hw_init()
by cgel.zte＠gmail.com 29 Apr '22

29 Apr '22

From: Minghao Chi <chi.minghao(a)zte.com.cn> Simplify the return expression. Reported-by: Zeal Robot <zealci(a)zte.com.cn> Signed-off-by: Minghao Chi <chi.minghao(a)zte.com.cn> --- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c index 97201ab0965e..4b5396d3e60f 100644 --- a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c @@ -593,14 +593,9 @@ static int navi10_ih_sw_fini(void *handle) static int navi10_ih_hw_init(void *handle) { - int r; struct amdgpu_device *adev = (struct amdgpu_device *)handle; - r = navi10_ih_irq_init(adev); - if (r) - return r; - - return 0; + return navi10_ih_irq_init(adev); } static int navi10_ih_hw_fini(void *handle) -- 2.25.1

2 1

[PATCH] drm/amdgpu: simplify the return expression of iceland_ih_hw_init
by cgel.zte＠gmail.com 29 Apr '22

29 Apr '22

From: Minghao Chi <chi.minghao(a)zte.com.cn> Simplify the return expression. Reported-by: Zeal Robot <zealci(a)zte.com.cn> Signed-off-by: Minghao Chi <chi.minghao(a)zte.com.cn> --- drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c index ddfe4eaeea05..aecad530b10a 100644 --- a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c @@ -308,14 +308,9 @@ static int iceland_ih_sw_fini(void *handle) static int iceland_ih_hw_init(void *handle) { - int r; struct amdgpu_device *adev = (struct amdgpu_device *)handle; - r = iceland_ih_irq_init(adev); - if (r) - return r; - - return 0; + return iceland_ih_irq_init(adev); } static int iceland_ih_hw_fini(void *handle) -- 2.25.1

2 1

[pull] amdgpu, amdkfd, radeon drm-next-5.19
by Alex Deucher 29 Apr '22

29 Apr '22

Hi Dave, Daniel, More stuff for 5.19. The following changes since commit e15c9d06e9ad70df41285ca41d535de6215e0b21: drm/amd/amdgpu: Update PF2VF header (2022-04-21 16:00:14 -0400) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.19-2022-04-29 for you to fetch changes up to 3da2c38231a4c62dafdbd762a199cfacaccd0533: drm/amdgpu: Free user pages if amdgpu_cs_parser_bos failed (2022-04-28 17:49:04 -0400) ---------------------------------------------------------------- amd-drm-next-5.19-2022-04-29: amdgpu - RAS updates - SI dpm deadlock fix - Misc code cleanups - HDCP fixes - PSR fixes - DSC fixes - SDMA doorbell cleanups - S0ix fix - DC FP fix - Zen dom0 regression fix for APUs - IP discovery updates - Initial SoC21 support - Support for new vbios tables - Runtime PM fixes - Add PSP TA debugfs interface amdkfd: - Misc code cleanups - Ignore bogus MEC signals more efficiently - SVM fixes - Use bitmap helpers radeon: - Misc code cleanups - Spelling/grammer fixes ---------------------------------------------------------------- Alex Deucher (11): drm/amdgpu/display: Make dcn31_set_low_power_state static drm/amdgpu: update latest IP discovery table structures drm/amdgpu/discovery: populate additional GC info drm/amdgpu/discovery: fix byteswapping in gc info parsing drm/amdgpu: store the mall size in the gmc structure drm/amdgpu/discovery: store the number of UMC IPs on the asic drm/amdgpu/discovery: handle UMC harvesting in IP discovery drm/amdgpu/discovery: add a function to get the mall_size drm/amdgpu/discovery: add additional validation drm/amdgpu/discovery: add a function to parse the vcn info table drm/amdgpu/discovery: move all table parsing into amdgpu_discovery.c Aric Cyr (2): drm/amd/display: 3.2.182 drm/amd/display: 3.2.183 Candice Li (1): drm/amdgpu: Fix build warning for TA debugfs interface Christophe JAILLET (2): drm/amdkfd: Use bitmap_zalloc() when applicable drm/amdkfd: Use non-atomic bitmap functions when possible Dan Carpenter (2): drm/amdgpu: debugfs: fix error codes in write functions drm/amdgpu: debugfs: fix NULL dereference in ta_if_invoke_debugfs_write() David Yu (1): drm/amdgpu: Ta fw needs to be loaded for SRIOV aldebaran David Zhang (2): drm/amd/display: read PSR-SU cap DPCD for specific panel drm/amd: add dc feature mask flags for PSR allow smu and multi-display optimizations Dillon Varone (1): drm/amd/display: Remove unused integer Dmytro Laktyushkin (1): drm/amd/display: update dcn315 clk table read Evan Quan (2): drm/amd/pm: fix the deadlock issue observed on SI drm/amd/pm: fix the compile warning Evgenii Krasnikov (1): drm/amd/display: Reset cached PSR parameters after hibernate Felix Kuehling (1): drm/amdkfd: Ignore bogus signals from MEC efficiently Gary Li (1): drm/amd/display: Maintain current link settings in link loss interrupt Guchun Chen (1): drm/amdgpu: disable runtime pm on several sienna cichlid cards(v2) Guo Zhengkui (1): drm/amd/display: fix if == else warning Haohui Mai (3): drm/amdgpu/sdma: Fix incorrect calculations of the wptr of the doorbells drm/amdgpu/sdma: Remove redundant lower_32_bits() calls when settings SDMA doorbell drm/amdgpu: Fix out-of-bound access for gfx_v10_0_ring_test_ib() Haowen Bai (1): drm/amdgpu: Remove useless kfree Hawking Zhang (10): drm/amdgpu: add helper to execute atomfirmware asic_init drm/amdgpu: switch to atomfirmware_asic_init drm/amdgpu: add vram_info v3_0 structure drm/amdgpu: support query vram_info v3_0 drm/amdgpu: add atom_gfx_info_v3_0 structure drm/amdgpu: update gc info from bios table drm/amdgpu: update query ref clk from bios drm/amdgpu: add mp v13_0_0 ip headers v7 drm/amdgpu: add gc v11_0_0 ip headers v11 drm/amdgpu: add nbio callback to query rom offset Ilya Bakoulin (2): drm/amd/display: Add Audio readback registers drm/amd/display: Keep track of DSC packed PPS Leo Ma (1): drm/amd/display: Remove ddc write and read size checking Likun Gao (2): drm/amdgpu: increase HWIP MAX INSTANCE drm/amdgpu: add function to decode ip version Marek Marczykowski-Górecki (1): drm/amdgpu: do not use passthrough mode in Xen dom0 Melissa Wen (1): drm/amd/display: protect remaining FPU-code calls on dcn3.1.x Michael Strauss (1): drm/amd/display: Don't pass HostVM by default on DCN3.1 Mukul Joshi (2): drm/amdkfd: Fix updating IO links during device removal drm/amdkfd: Fix circular lock dependency warning Mustapha Ghaddar (1): drm/amd/display: Fix HDCP QUERY Error for eDP and Tiled Oliver Logush (1): drm/amd/display: Insert smu busy status before sending another request Philip Yang (3): drm/amdkfd: Add SVM range mapped_to_gpu flag drm/amdkfd: Update mapping if range attributes changed drm/amdgpu: Free user pages if amdgpu_cs_parser_bos failed Prike Liang (1): drm/amdgpu: keep mmhub clock gating being enabled during s2idle suspend Randy Dunlap (1): drm/amd/display: fix non-kernel-doc comment warnings Rongguang Wei (1): drm/amdgpu: fix typo Stanley.Yang (2): drm/amdgpu: add new write field for soc21 drm/amdgpu: add soc21 common ip block v2 Tao Zhou (3): drm/amdgpu: add RAS poison creation handler (v2) drm/amdgpu: add RAS poison consumption handler (v2) drm/amdgpu: add RAS fatal error interrupt handler Tom Rix (2): drm/radeon: change cik_default_state table from global to static drm/radeon: change cac_weights_* to static Yang Wang (1): drm/amdkfd: use kvcalloc() instead of kvmalloc() in kfd_migrate Zhenneng Li (1): gpu/drm/radeon: Fix typo in comments oushixiong (1): drm/amd: Fix spelling typo in comment drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 371 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 291 +- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 4 - drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 11 + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 5 + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 62 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 125 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 33 + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 28 + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 +- drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 13 - drivers/gpu/drm/amd/amdgpu/soc15_common.h | 8 + drivers/gpu/drm/amd/amdgpu/soc21.c | 620 + drivers/gpu/drm/amd/amdgpu/soc21.h | 30 + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 7 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 30 +- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 22 +- drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 33 + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 15 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 10 +- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 66 +- drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 1 + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 17 +- .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 2 + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 2 +- .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 114 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 15 +- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 6 - drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 15 + drivers/gpu/drm/amd/display/dc/dc.h | 10 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 +- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 2 +- .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 1 + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 8 + .../gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.c | 2 - .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 4 + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 34 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h | 9 + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 4 +- .../drm/amd/display/dc/dcn316/dcn316_resource.c | 4 +- .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 145 +- drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 1 + .../drm/amd/display/include/ddc_service_types.h | 2 + drivers/gpu/drm/amd/include/amd_shared.h | 2 + .../amd/include/asic_reg/gc/gc_11_0_0_default.h | 6114 +++ .../drm/amd/include/asic_reg/gc/gc_11_0_0_offset.h | 11670 ++++++ .../amd/include/asic_reg/gc/gc_11_0_0_sh_mask.h | 41635 +++++++++++++++++++ .../drm/amd/include/asic_reg/mp/mp_13_0_0_offset.h | 461 + .../amd/include/asic_reg/mp/mp_13_0_0_sh_mask.h | 682 + drivers/gpu/drm/amd/include/atombios.h | 2 +- drivers/gpu/drm/amd/include/atomfirmware.h | 80 +- drivers/gpu/drm/amd/include/discovery.h | 114 +- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 39 + drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 14 +- drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 10 - drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 35 - drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 10 - drivers/gpu/drm/radeon/Makefile | 2 +- drivers/gpu/drm/radeon/atombios.h | 6 +- drivers/gpu/drm/radeon/cik_blit_shaders.c | 246 - drivers/gpu/drm/radeon/cik_blit_shaders.h | 219 +- drivers/gpu/drm/radeon/si_dpm.c | 4 +- 86 files changed, 62821 insertions(+), 851 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/soc21.c create mode 100644 drivers/gpu/drm/amd/amdgpu/soc21.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_0_default.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_0_sh_mask.h delete mode 100644 drivers/gpu/drm/radeon/cik_blit_shaders.c

1 0

[PATCH 31/37] drm: handle HAS_IOPORT dependencies
by Niklas Schnelle 29 Apr '22

29 Apr '22

In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them. There is also a direct and hard coded use in cirrus.c which according to the comment is only necessary during resume. Let's just skip this as for example s390 which doesn't have I/O port support also doesen't support suspend/resume. Co-developed-by: Arnd Bergmann <arnd(a)kernel.org> Signed-off-by: Niklas Schnelle <schnelle(a)linux.ibm.com> --- drivers/gpu/drm/qxl/Kconfig | 1 + drivers/gpu/drm/tiny/Kconfig | 1 + drivers/gpu/drm/tiny/cirrus.c | 2 ++ 3 files changed, 4 insertions(+) diff --git a/drivers/gpu/drm/qxl/Kconfig b/drivers/gpu/drm/qxl/Kconfig index ca3f51c2a8fe..d0e0d440c8d9 100644 --- a/drivers/gpu/drm/qxl/Kconfig +++ b/drivers/gpu/drm/qxl/Kconfig @@ -2,6 +2,7 @@ config DRM_QXL tristate "QXL virtual GPU" depends on DRM && PCI && MMU + depends on HAS_IOPORT select DRM_KMS_HELPER select DRM_TTM select DRM_TTM_HELPER diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig index 627d637a1e7e..7102783809c3 100644 --- a/drivers/gpu/drm/tiny/Kconfig +++ b/drivers/gpu/drm/tiny/Kconfig @@ -13,6 +13,7 @@ config DRM_ARCPGU config DRM_BOCHS tristate "DRM Support for bochs dispi vga interface (qemu stdvga)" depends on DRM && PCI && MMU + depends on HAS_IOPORT select DRM_KMS_HELPER select DRM_VRAM_HELPER select DRM_TTM diff --git a/drivers/gpu/drm/tiny/cirrus.c b/drivers/gpu/drm/tiny/cirrus.c index c8e791840862..0dc4788c5399 100644 --- a/drivers/gpu/drm/tiny/cirrus.c +++ b/drivers/gpu/drm/tiny/cirrus.c @@ -306,8 +306,10 @@ static int cirrus_mode_set(struct cirrus_device *cirrus, cirrus_set_start_address(cirrus, 0); +#ifdef CONFIG_HAS_IOPORT /* Unblank (needed on S3 resume, vgabios doesn't do it then) */ outb(0x20, 0x3c0); +#endif drm_dev_exit(idx); return 0; -- 2.32.0

1 1

[PATCH] drm/sun4i: dsi: delete unnecessary IS_ERR() checks
by Dan Carpenter 29 Apr '22

29 Apr '22

The "dsi->bus_clk" pointer cannot be an error pointer at this point. The check is confusing and unnecessary. Delete it. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c index 527c7b2474da..b4dfa166eccd 100644 --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c @@ -1193,8 +1193,8 @@ static int sun6i_dsi_probe(struct platform_device *pdev) err_unprotect_clk: clk_rate_exclusive_put(dsi->mod_clk); err_attach_clk: - if (!IS_ERR(dsi->bus_clk)) - regmap_mmio_detach_clk(dsi->regs); + regmap_mmio_detach_clk(dsi->regs); + return ret; } @@ -1207,8 +1207,7 @@ static int sun6i_dsi_remove(struct platform_device *pdev) mipi_dsi_host_unregister(&dsi->host); clk_rate_exclusive_put(dsi->mod_clk); - if (!IS_ERR(dsi->bus_clk)) - regmap_mmio_detach_clk(dsi->regs); + regmap_mmio_detach_clk(dsi->regs); return 0; } -- 2.35.1

2 1

[PATCH] drm/vc4: simplify the return expression of vc4_prepare_fb()
by cgel.zte＠gmail.com 29 Apr '22

29 Apr '22

From: Minghao Chi <chi.minghao(a)zte.com.cn> Simplify the return expression. Reported-by: Zeal Robot <zealci(a)zte.com.cn> Signed-off-by: Minghao Chi <chi.minghao(a)zte.com.cn> --- drivers/gpu/drm/vc4/vc4_plane.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 920a9eefe426..b3438f4a81ce 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -1350,7 +1350,6 @@ static int vc4_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state) { struct vc4_bo *bo; - int ret; if (!state->fb) return 0; @@ -1362,11 +1361,7 @@ static int vc4_prepare_fb(struct drm_plane *plane, if (plane->state->fb == state->fb) return 0; - ret = vc4_bo_inc_usecnt(bo); - if (ret) - return ret; - - return 0; + return vc4_bo_inc_usecnt(bo); } static void vc4_cleanup_fb(struct drm_plane *plane, -- 2.25.1

2 1

[PATCH] drm/vc4: simplify the return expression of vc4_grab_bin_bo()
by cgel.zte＠gmail.com 29 Apr '22

29 Apr '22

From: Minghao Chi <chi.minghao(a)zte.com.cn> Simplify the return expression. Reported-by: Zeal Robot <zealci(a)zte.com.cn> Signed-off-by: Minghao Chi <chi.minghao(a)zte.com.cn> --- drivers/gpu/drm/vc4/vc4_bo.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c index e451cc5bcfac..49c0f2ac868b 100644 --- a/drivers/gpu/drm/vc4/vc4_bo.c +++ b/drivers/gpu/drm/vc4/vc4_bo.c @@ -738,19 +738,13 @@ static const struct drm_gem_object_funcs vc4_gem_object_funcs = { static int vc4_grab_bin_bo(struct vc4_dev *vc4, struct vc4_file *vc4file) { - int ret; - if (!vc4->v3d) return -ENODEV; if (vc4file->bin_bo_used) return 0; - ret = vc4_v3d_bin_bo_get(vc4, &vc4file->bin_bo_used); - if (ret) - return ret; - - return 0; + return vc4_v3d_bin_bo_get(vc4, &vc4file->bin_bo_used); } int vc4_create_bo_ioctl(struct drm_device *dev, void *data, -- 2.25.1

2 1

← Newer
1
...
15
16
17
18
19
20
21
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel April 2022