dri-devel January 2021

dri-devel@lists.freedesktop.org

322 participants
737 discussions

[PATCH v3 1/2] dma-fence: allow signaling drivers to set fence timestamp
by Veera Sundaram Sankaran 16 Jan '21

16 Jan '21

Some drivers have hardware capability to get the precise HW timestamp of certain events based on which the fences are triggered. The delta between the event HW timestamp & current HW reference timestamp can be used to calculate the timestamp in kernel's CLOCK_MONOTONIC time domain. This allows it to set accurate timestamp factoring out any software and IRQ latencies. Add a timestamp variant of fence signal function, dma_fence_signal_timestamp to allow drivers to update the precise timestamp for fences. Changes in v2: - Add a new fence signal variant instead of modifying fence struct Changes in v3: - Add timestamp domain information to commit-text and dma_fence_signal_timestamp documentation Signed-off-by: Veera Sundaram Sankaran <veeras(a)codeaurora.org> --- drivers/dma-buf/dma-fence.c | 70 ++++++++++++++++++++++++++++++++++++++++----- include/linux/dma-fence.h | 3 ++ 2 files changed, 66 insertions(+), 7 deletions(-) diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c index 7475e09..b83e9fa 100644 --- a/drivers/dma-buf/dma-fence.c +++ b/drivers/dma-buf/dma-fence.c @@ -312,22 +312,25 @@ void __dma_fence_might_wait(void) /** - * dma_fence_signal_locked - signal completion of a fence + * dma_fence_signal_timestamp_locked - signal completion of a fence * @fence: the fence to signal + * @timestamp: fence signal timestamp in kernel's CLOCK_MONOTONIC time domain * * Signal completion for software callbacks on a fence, this will unblock * dma_fence_wait() calls and run all the callbacks added with * dma_fence_add_callback(). Can be called multiple times, but since a fence * can only go from the unsignaled to the signaled state and not back, it will - * only be effective the first time. + * only be effective the first time. Set the timestamp provided as the fence + * signal timestamp. * - * Unlike dma_fence_signal(), this function must be called with &dma_fence.lock - * held. + * Unlike dma_fence_signal_timestamp(), this function must be called with + * &dma_fence.lock held. * * Returns 0 on success and a negative error value when @fence has been * signalled already. */ -int dma_fence_signal_locked(struct dma_fence *fence) +int dma_fence_signal_timestamp_locked(struct dma_fence *fence, + ktime_t timestamp) { struct dma_fence_cb *cur, *tmp; struct list_head cb_list; @@ -341,7 +344,7 @@ int dma_fence_signal_locked(struct dma_fence *fence) /* Stash the cb_list before replacing it with the timestamp */ list_replace(&fence->cb_list, &cb_list); - fence->timestamp = ktime_get(); + fence->timestamp = timestamp; set_bit(DMA_FENCE_FLAG_TIMESTAMP_BIT, &fence->flags); trace_dma_fence_signaled(fence); @@ -352,6 +355,59 @@ int dma_fence_signal_locked(struct dma_fence *fence) return 0; } +EXPORT_SYMBOL(dma_fence_signal_timestamp_locked); + +/** + * dma_fence_signal_timestamp - signal completion of a fence + * @fence: the fence to signal + * @timestamp: fence signal timestamp in kernel's CLOCK_MONOTONIC time domain + * + * Signal completion for software callbacks on a fence, this will unblock + * dma_fence_wait() calls and run all the callbacks added with + * dma_fence_add_callback(). Can be called multiple times, but since a fence + * can only go from the unsignaled to the signaled state and not back, it will + * only be effective the first time. Set the timestamp provided as the fence + * signal timestamp. + * + * Returns 0 on success and a negative error value when @fence has been + * signalled already. + */ +int dma_fence_signal_timestamp(struct dma_fence *fence, ktime_t timestamp) +{ + unsigned long flags; + int ret; + + if (!fence) + return -EINVAL; + + spin_lock_irqsave(fence->lock, flags); + ret = dma_fence_signal_timestamp_locked(fence, timestamp); + spin_unlock_irqrestore(fence->lock, flags); + + return ret; +} +EXPORT_SYMBOL(dma_fence_signal_timestamp); + +/** + * dma_fence_signal_locked - signal completion of a fence + * @fence: the fence to signal + * + * Signal completion for software callbacks on a fence, this will unblock + * dma_fence_wait() calls and run all the callbacks added with + * dma_fence_add_callback(). Can be called multiple times, but since a fence + * can only go from the unsignaled to the signaled state and not back, it will + * only be effective the first time. + * + * Unlike dma_fence_signal(), this function must be called with &dma_fence.lock + * held. + * + * Returns 0 on success and a negative error value when @fence has been + * signalled already. + */ +int dma_fence_signal_locked(struct dma_fence *fence) +{ + return dma_fence_signal_timestamp_locked(fence, ktime_get()); +} EXPORT_SYMBOL(dma_fence_signal_locked); /** @@ -379,7 +435,7 @@ int dma_fence_signal(struct dma_fence *fence) tmp = dma_fence_begin_signalling(); spin_lock_irqsave(fence->lock, flags); - ret = dma_fence_signal_locked(fence); + ret = dma_fence_signal_timestamp_locked(fence, ktime_get()); spin_unlock_irqrestore(fence->lock, flags); dma_fence_end_signalling(tmp); diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h index 09e23ad..9f12efa 100644 --- a/include/linux/dma-fence.h +++ b/include/linux/dma-fence.h @@ -372,6 +372,9 @@ static inline void __dma_fence_might_wait(void) {} int dma_fence_signal(struct dma_fence *fence); int dma_fence_signal_locked(struct dma_fence *fence); +int dma_fence_signal_timestamp(struct dma_fence *fence, ktime_t timestamp); +int dma_fence_signal_timestamp_locked(struct dma_fence *fence, + ktime_t timestamp); signed long dma_fence_default_wait(struct dma_fence *fence, bool intr, signed long timeout); int dma_fence_add_callback(struct dma_fence *fence, -- 2.7.4

3 7

[PATCH][next] drm/vkms: Fix missing kmalloc allocation failure check
by Colin King 15 Jan '21

15 Jan '21

From: Colin Ian King <colin.king(a)canonical.com> Currently the kmalloc allocation for config is not being null checked and could potentially lead to a null pointer dereference. Fix this by adding the missing null check. Addresses-Coverity: ("Dereference null return value") Fixes: 2df7af93fdad ("drm/vkms: Add vkms_config type") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- drivers/gpu/drm/vkms/vkms_drv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c index 708f7f54001d..2173b82606f6 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -188,7 +188,11 @@ static int vkms_create(struct vkms_config *config) static int __init vkms_init(void) { - struct vkms_config *config = kmalloc(sizeof(*config), GFP_KERNEL); + struct vkms_config *config; + + config = kmalloc(sizeof(*config), GFP_KERNEL); + if (!config) + return -ENOMEM; default_config = config; -- 2.29.2

3 2

[git pull] drm nouveau ampere modesetting support
by Dave Airlie 15 Jan '21

15 Jan '21

Hi Linus, As mentioned in the previous pull, Ben has requested if we can include Ampere modesetting support under fixes, it's for new GPUs and shouldn't affect existing hardware. It's a bit bigger than just adding a PCI ID, and I'm fine if you think we should hold it off until later. Dave. topic/nouveau-ampere-modeset-2021-01-15: drm nouveau ampere display support. This is a pull request to add display support for new Ampere hardware. It has no effect on older GPUs. The following changes since commit c8f6364f35f32786dd40336cfa35b9166d91b8ab: Merge branch '04.00-ampere-lite-fixes' of git://github.com/skeggsb/linux into drm-fixes (2021-01-15 13:26:44 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/topic/nouveau-ampere-modeset-2021-01-15 for you to fetch changes up to 584265dfec70e78ce2085b82ed389f27e06fbca0: Merge branch '04.01-ampere-lite' of git://github.com/skeggsb/linux into topic/nouveau-ampere-modeset (2021-01-15 14:48:18 +1000) ---------------------------------------------------------------- drm nouveau ampere display support. This is a pull request to add display support for new Ampere hardware. It has no effect on older GPUs. ---------------------------------------------------------------- Ben Skeggs (15): drm/nouveau/core: recognise GA10[024] drm/nouveau/pci/ga10[024]: initial support drm/nouveau/bios/ga10[024]: initial support drm/nouveau/devinit/ga10[024]: initial support drm/nouveau/mc/ga10[024]: initial support drm/nouveau/privring/ga10[024]: initial support drm/nouveau/imem/ga10[024]: initial support drm/nouveau/fb/ga10[024]: initial support drm/nouveau/timer/ga10[024]: initial support drm/nouveau/mmu/ga10[024]: initial support drm/nouveau/bar/ga10[024]: initial support drm/nouveau/gpio/ga10[024]: initial support drm/nouveau/i2c/ga10[024]: initial support drm/nouveau/dmaobj/ga10[24]: initial support drm/nouveau/disp/ga10[24]: initial support Dave Airlie (1): Merge branch '04.01-ampere-lite' of git://github.com/skeggsb/linux into topic/nouveau-ampere-modeset drivers/gpu/drm/nouveau/dispnv50/Kbuild | 1 + drivers/gpu/drm/nouveau/dispnv50/core.c | 1 + drivers/gpu/drm/nouveau/dispnv50/curs.c | 1 + drivers/gpu/drm/nouveau/dispnv50/wimm.c | 1 + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 1 + drivers/gpu/drm/nouveau/dispnv50/wndw.h | 8 ++ drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | 10 +- drivers/gpu/drm/nouveau/dispnv50/wndwc67e.c | 106 ++++++++++++++++ drivers/gpu/drm/nouveau/include/nvif/cl0080.h | 1 + drivers/gpu/drm/nouveau/include/nvif/class.h | 5 + drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 1 + drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h | 1 + .../gpu/drm/nouveau/include/nvkm/subdev/devinit.h | 1 + drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 2 + drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h | 1 + drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h | 1 + drivers/gpu/drm/nouveau/nouveau_backlight.c | 1 + drivers/gpu/drm/nouveau/nvif/disp.c | 1 + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 75 ++++++++++- drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 1 + drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild | 3 + drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 33 ++++- drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c | 46 +++++++ drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h | 4 + drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h | 2 + .../gpu/drm/nouveau/nvkm/engine/disp/rootga102.c | 52 ++++++++ .../gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h | 1 + .../gpu/drm/nouveau/nvkm/engine/disp/sorga102.c | 140 +++++++++++++++++++++ .../gpu/drm/nouveau/nvkm/engine/disp/sortu102.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/disp/tu102.c | 2 +- .../gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c | 3 + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/Kbuild | 1 + .../gpu/drm/nouveau/nvkm/subdev/devinit/ga100.c | 76 +++++++++++ drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h | 1 + .../gpu/drm/nouveau/nvkm/subdev/devinit/tu102.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 3 + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga100.c | 40 ++++++ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga102.c | 40 ++++++ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gv100.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 2 + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h | 1 + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramga102.c | 40 ++++++ drivers/gpu/drm/nouveau/nvkm/subdev/gpio/Kbuild | 1 + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/ga102.c | 118 +++++++++++++++++ drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild | 1 + drivers/gpu/drm/nouveau/nvkm/subdev/mc/ga100.c | 74 +++++++++++ 46 files changed, 892 insertions(+), 18 deletions(-) create mode 100644 drivers/gpu/drm/nouveau/dispnv50/wndwc67e.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/rootga102.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/sorga102.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/devinit/ga100.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga100.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga102.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramga102.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gpio/ga102.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mc/ga100.c

2 1

[PATCH] drm/amdgpu:this forword declear maybe not used
by ZhiJie.Zhang 15 Jan '21

15 Jan '21

Signed-off-by: ZhiJie.Zhang <zhangzhijie(a)loongson.cn> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h index 2ee6edb3df93..ef4acb1d4a80 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h @@ -58,10 +58,10 @@ /* Forward declarations */ struct amdgpu_device; struct drm_device; -struct amdgpu_dm_irq_handler_data; struct dc; struct amdgpu_bo; struct dmub_srv; +struct dc_plane_state; struct common_irq_params { struct amdgpu_device *adev; @@ -438,11 +438,6 @@ struct amdgpu_dm_connector { extern const struct amdgpu_ip_block_version dm_ip_block; -struct amdgpu_framebuffer; -struct amdgpu_display_manager; -struct dc_validation_set; -struct dc_plane_state; - struct dm_plane_state { struct drm_plane_state base; struct dc_plane_state *dc_state; -- 2.29.2

2 1

[pull] amdgpu drm-next-5.12
by Alex Deucher 15 Jan '21

15 Jan '21

Hi Dave, Daniel, More new stuff for 5.12. The following changes since commit 044a48f420b9d3c19a135b821c34de5b2bee4075: drm/amdgpu: fix DRM_INFO flood if display core is not supported (bug 210921) (2021-01-08 15:18:57 -0500) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.12-2021-01-14 for you to fetch changes up to df1f0560d28f4895e2d61af826728efb61976f9f: drm/amd/display: Simplify bool comparison (2021-01-14 13:20:21 -0500) ---------------------------------------------------------------- amd-drm-next-5.12-2021-01-14: amdgpu: - W=1 fixes from Lee Jones - Enable GPU reset on Navy Flounder - Kernel doc fixes - SMU workload profile fixes for APUs - Display updates - SR-IOV fixes - Vangogh SMU feature enablment and bug fixes - GPU reset support for Vangogh - Misc cleanups ---------------------------------------------------------------- Alex Deucher (5): MAINTAINERS: update radeon/amdgpu/amdkfd git trees drm/amdgpu: add mode2 reset support for vangogh drm/amdgpu/nv: add mode2 reset handling drm/amdgpu: fix mode2 reset sequence for vangogh drm/amdgpu: Enable GPU reset for vangogh Aric Cyr (2): drm/amd/display: 3.2.117 drm/amd/display: 3.2.118 Bhawanpreet Lakha (2): drm/amd/display: enable HUBP blank behaviour drm/amd/display: Fix deadlock during gpu reset v3 Charlene Liu (1): drm/amd/display: change SMU repsonse timeout to 2s Chiawen Huang (1): drm/amd/display: removed unnecessary check when dpp clock increasing Colin Ian King (1): drm/amdgpu: Add missing BOOTUP_DEFAULT to profile_name[] Emily.Deng (1): drm/amdgpu: Decrease compute timeout to 10 s for sriov multiple VF Huang Rui (10): drm/amd/pm: remove vcn/jpeg powergating feature checking for vangogh drm/amd/pm: enhance the real response for smu message (v2) drm/amd/pm: clean up get_allowed_feature_mask function drm/amd/pm: initial feature_enabled/feature_support bitmap for vangogh drm/amd/pm: don't mark all apu as true on feature mask drm/amdgpu: revise the mode2 reset for vangogh drm/amd/pm: fix the return value of pm message drm/amd/pm: implement the processor clocks which read by metric drm/amd/pm: implement processor fine grain feature for vangogh (v3) drm/amdgpu: fix vram type and bandwidth error for DDR5 and DDR4 Jack Zhang (1): drm/amdgpu/sriov Stop data exchange for wholegpu reset Jacky Liao (1): drm/amd/display: Fix assert being hit with GAMCOR memory shut down Jeremy Cline (1): drm/amdkfd: Fix out-of-bounds read in kdf_create_vcrat_image_cpu() Jiansong Chen (1): drm/amdgpu: enable gpu recovery for navy_flounder Jinzhou Su (4): drm/amd/pm: Add GFXOFF interface for Vangogh drm/amd/pm: Enable GfxOff for Vangogh drm/amdgpu: Add Secure Display TA header file drm/amdgpu: Add secure display TA interface Jun Lei (1): drm/amd/display: implement T12 compliance Lee Jones (90): drm/amd/amdgpu/amdgpu_ih: Update 'amdgpu_ih_decode_iv_helper()'s function header drm/amd/amdgpu/vega20_ih: Add missing descriptions for 'ih' and fix spelling error drm/amd/pm/powerplay/hwmgr/process_pptables_v1_0: Provide description of 'call_back_func' drm/amd/pm/powerplay/hwmgr/ppatomctrl: Fix documentation for 'mpll_param' drm/amd/pm/powerplay/hwmgr/vega12_hwmgr: Fix legacy function header formatting drm/amd/pm/powerplay/hwmgr/vega20_hwmgr: Fix legacy function header formatting drm/amd/pm/powerplay/hwmgr/smu7_hwmgr: Fix formatting and spelling issues drm/amd/pm/powerplay/hwmgr/hwmgr: Move prototype into shared header drm/amd/pm/powerplay/hwmgr/vega10_hwmgr: Fix a bunch of kernel-doc formatting issues drm/amd/display/dc/basics/conversion: Demote obvious kernel-doc abuse drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs: Demote non-kernel-doc comment blocks drm/amd/display/dc/bios/command_table_helper: Fix kernel-doc formatting drm/amd/display/dc/bios/command_table_helper2: Fix legacy formatting problems drm/amd/display/dc/bios/bios_parser: Make local functions static drm/amd/display/dc/bios/bios_parser: Fix a whole bunch of legacy doc formatting drm/amd/display/dc/bios/bios_parser2: Fix some formatting issues and missing parameter docs drm/amd/display/dc/dce/dce_audio: Make function invoked by reference static drm/amd/display/dc/dce/dce_stream_encoder: Remove unused variable 'regval' drm/amd/display/dc/dce/dce_link_encoder: Make functions invoked by reference static drm/amd/display/dc/dce/dce_clock_source: Fix formatting/spelling of worthy function headers drm/amd/pm/powerplay/hwmgr/vega10_hwmgr: Fix worthy function headers, demote barely documented one drm/amd/display/dc/dce/dce_transform: Remove 3 unused/legacy variables drm/amd/display/dc/dce/dce_dmcu: Staticify local function call 'dce_dmcu_load_iram' drm/amd/display/dc/dce/dce_dmcu: Move 'abm_gain_stepsize' to only source file it's used in drm/amd/display/dc/dce/dce_opp: Make local functions and ones invoked by reference static drm/amd/display/dc/dce/dce_aux: Remove unused function 'get_engine_type' drm/amd/display/dc/bios/bios_parser: Fix misspelling of function parameter drm/amd/display/dc/dce/dce_i2c_hw: Make functions called by reference static drm/amd/display/dc/dce/dce_i2c_sw: Make a bunch of local functions static drm/amd/display/dc/dce/dce_panel_cntl: Remove unused variables 'bl_pwm_cntl' and 'pwm_period_cntl' drm/amd/display/dc/dce/dmub_psr: Demote non-conformant kernel-doc headers drm/amd/display/dc/gpio/hw_factory: Delete unused function 'dal_hw_factory_destroy' drm/amd/display/dc/dce/dce_aux: Mark 'dce_aux_transfer_raw' as __maybe_unused drm/amd/display/dc/dce/dce_link_encoder: Remove unused variable 'value0' drm/amd/display/dc/gpio/hw_ddc: Remove unused variable 'reg2' drm/amd/display/dc/dce/dce_opp: Demote non-compliant kernel-doc headers drm/amd/display/dc/dce/dce_transform: Demote kernel-doc abuse drm/amd/display/dc/gpio/diagnostics/hw_translate_diag: Include our own header containing prototypes drm/amd/display/dc/irq/irq_service: Make local function static drm/amd/display/dc/gpio/diagnostics/hw_factory_diag: Fix struct declared inside parameter list error drm/amd/display/dc/gpio/diagnostics/hw_factory_diag: Include our own header containing prototypes drm/amd/display/dc/dce120/dce120_hw_sequencer: Encompass defines in same clause as their use drm/amd/display/dc/dce120/dce120_timing_generator: drm/amd/display/dc/dce120/Makefile: Ignore -Woverride-init warning drm/amd/display/dc/dce120/dce120_resource: Staticify local functions drm/amd/display/dc/dce120/dce120_timing_generator: Demote non-kerneldoc headers drm/amd/display/dc/dce/dce_aux: Remove duplicate line causing 'field overwritten' issue drm/amd/display/dc/dce112/Makefile: Ignore -Woverride-init warning drm/amd/display/dc/dce/dce_opp: Remove duplicate entries causing 'field overwritten' issues drm/amd/display/dc/dce110/dce110_timing_generator: Remove unused variable 'value_crtc_vtotal' drm/amd/display/dc/dce110/dce110_compressor: Remove unused function 'dce110_get_required_compressed_surfacesize drm/amd/display/dc/dce110/dce110_hw_sequencer: Demote non-conformant kernel-doc header drm/amd/display/dc/dce110/dce110_mem_input_v: Make local functions static drm/amd/display/dc/dce120/dce120_timing_generator: Remove unused function 'dce120_timing_generator_get_position' drm/amd/display/dc/dce110/dce110_timing_generator: Demote kernel-doc abuses to standard function headers drm/amd/display/dc/dce110/dce110_compressor: Strip out unused function 'controller_id_to_index' drm/amd/display/dc/dce112/dce112_resource: Make local functions and ones called by reference static drm/amd/display/dc/dce110/dce110_timing_generator_v: Demote kernel-doc abuse and line up comments drm/amd/display/dc/dce110/dce110_mem_input_v: Include our own header, containing prototypes drm/amd/display/dc/dce110/Makefile: Ignore -Woverride-init warning drm/amd/display/dc/dce110/dce110_resource: Make local functions invoked by reference static drm/amd/display/dc/dce110/dce110_transform_v: Demote kernel-doc abuse drm/amd/display/dc/dce60/dce60_timing_generator: Make 'dce60_configure_crc' invoked by reference static drm/amd/display/dc/dce100/dce100_resource: Make local functions and ones called by reference static drm/amd/display/dc/dce60/dce60_resource: Make local functions static drm/amd/display/dc/core/dc_surface: Demote kernel-doc abuse drm/amd/display/dc/core/dc_stream: Demote non-conformant kernel-doc headers drm/amd/display/dc/calcs/dce_calcs: Remove unused variables 'v_filter_init_mode' and 'sclk_lvl' drm/amd/display/dc/calcs/dce_calcs: Demote non-conformant kernel-doc function headers drm/amd/display/dc/dc_helper: Include our own header, containing prototypes drm/amd/include/renoir_ip_offset: Mark top-level IP_BASE as __maybe_unused drm/amd/display/dmub/src/dmub_dcn30: Include our own header containing prototypes drm/amd/display/modules/power/power_helpers: Staticify local functions drm/amd/display/modules/info_packet/info_packet: Correct kernel-doc formatting drm/amd/display/dc/core/dc_resource: Staticify local functions drm/amd/display/dc/core/dc_link: Remove unused variable 'status' drm/amd/display/dc/core/dc_link_dp: Staticify local function 'linkRateInKHzToLinkRateMultiplier' drm/amd/display/dc/dce112/dce112_resource: Include our own header file containing prototypes drm/amd/display/dc/core/dc: Staticise local function 'apply_ctx_interdependent_lock' drm/amd/display/dc/dce100/Makefile: Ignore -Woverride-init warning drm/amd/display/dc/dce100/dce100_resource: Include our own header containing prototypes drm/amd/display/dc/dce60/Makefile: Ignore -Woverride-init warning drm/amd/display/dc/dce80/Makefile: Ignore -Woverride-init warning drm/amd/display/dc/dce80/dce80_resource: Include our own header containing prototypes drm/amd/display/dc/dce60/dce60_resource: Include our own header containing prototypes drm/amd/display/dc/core/dc_link: Move some local data from the stack to the heap drm/amd/display/dc/core/dc_link_dp: Mark 'result_write_min_hblank' as __maybe_unused drm/amd/display/dc/core/dc: Fix a bunch of documentation misdemeanours drm/amd/display/dc/core/dc_resource: Demote some kernel-doc abuses drm/amd/display/dc/core/dc_link: Fix a couple of function documentation issues Lewis Huang (1): drm/amd/display: Separate fec debug flag and monitor patch Li, Roman (1): drm/amd/display: disable dcn10 pipe split by default Likun Gao (1): drm/amdgpu: set power brake sequence Lukas Bulwahn (1): drm/amd/display: tweak the kerneldoc for active_vblank_irq_count Mike Hsieh (1): drm/amd/display: Remove unused P010 debug flag Nikola Cornij (1): drm/amd/display: Add a missing DCN3.01 API mapping Prike Liang (1): drm/amdgpu: add green_sardine device id (v2) Qingqing Zhuo (1): drm/amd/display: NULL pointer hang Raymond Yang (1): drm/amd/display: fix seamless boot stream adding algorithm Rodrigo Siqueira (4): Revert "drm/amd/display: Fixed Intermittent blue screen on OLED panel" Revert "drm/amd/display: Fix unused variable warning" Revert "drm/amdgpu/disply: fix documentation warnings in display manager" Revert "drm/amd/display: Expose new CRC window property" Souptick Joarder (1): drm: amdgpu: pm: Mark vangogh_clk_dpm_is_enabled() as static Wayne Lin (1): drm/amd/display: Fix to be able to stop crc calculation Wesley Chalmers (5): drm/amd/display: Initialize stack variable drm/amd/display: HUBP_IN_BLANK for DCN30 drm/amd/display: Unblank hubp based on plane visibility drm/amd/display: New path for enabling DPG drm/amd/display: New sequence for HUBP blank Xiaojian Du (5): drm/amd/pm: support the function to change power profile mode for vangogh drm/amd/pm: fix one superfluous error for renoir drm/amd/pm: add the workload map for vangogh drm/amd/pm: modify the fine grain tuning function for Renoir drm/amd/pm: modify the fine grain tuning function for vangogh Yang Li (4): drm/amd/display: Simplify bool comparison drm/amd/display: Simplify bool comparison drm/amd/display: Simplify bool comparison drm/amd/display: Simplify bool comparison Yu-ting Shen (1): drm/amd/display: doesn't reprogram AMD OUI ZhiJie.Zhang (1): drm/amdgpu: Repeat assignment to max_slave_planes chen gong (1): drm/amdgpu/gfx10: add updated GOLDEN_TSC_COUNT_UPPER/LOWER register offsets for VGH mengwang (1): drm/amdgpu: add new device id for Renior MAINTAINERS | 4 +- drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 53 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 191 +++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 17 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 176 ++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h | 36 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 48 +++- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 1 + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 1 + drivers/gpu/drm/amd/amdgpu/nv.c | 46 ++- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 12 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h | 154 ++++++++++ drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 5 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 11 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 152 ++-------- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 40 +-- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 54 +--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 5 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 +- drivers/gpu/drm/amd/display/dc/basics/conversion.c | 9 +- drivers/gpu/drm/amd/display/dc/basics/dc_common.c | 20 +- drivers/gpu/drm/amd/display/dc/basics/dc_common.h | 4 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 119 ++++---- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 29 +- .../drm/amd/display/dc/bios/command_table_helper.c | 20 +- .../amd/display/dc/bios/command_table_helper2.c | 20 +- drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 13 +- .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 3 +- .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 48 ++-- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 62 ++-- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 53 ++-- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 42 ++- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 5 +- drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 2 +- drivers/gpu/drm/amd/display/dc/dc.h | 3 +- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 3 + drivers/gpu/drm/amd/display/dc/dc_helper.c | 1 + drivers/gpu/drm/amd/display/dc/dc_link.h | 8 + drivers/gpu/drm/amd/display/dc/dc_stream.h | 11 + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 8 +- drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 1 - .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 57 ++-- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 2 - drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 4 +- drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 9 +- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 9 +- drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 24 +- drivers/gpu/drm/amd/display/dc/dce/dce_opp.h | 2 - .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 8 +- .../drm/amd/display/dc/dce/dce_stream_encoder.c | 3 +- drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 15 +- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 22 +- drivers/gpu/drm/amd/display/dc/dce100/Makefile | 2 + .../drm/amd/display/dc/dce100/dce100_resource.c | 18 +- drivers/gpu/drm/amd/display/dc/dce110/Makefile | 2 + .../drm/amd/display/dc/dce110/dce110_compressor.c | 55 ---- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 33 ++- .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 17 +- .../drm/amd/display/dc/dce110/dce110_resource.c | 17 +- .../display/dc/dce110/dce110_timing_generator.c | 76 +++-- .../display/dc/dce110/dce110_timing_generator_v.c | 19 +- .../drm/amd/display/dc/dce110/dce110_transform_v.c | 19 +- drivers/gpu/drm/amd/display/dc/dce112/Makefile | 2 + .../drm/amd/display/dc/dce112/dce112_resource.c | 20 +- drivers/gpu/drm/amd/display/dc/dce120/Makefile | 2 + .../amd/display/dc/dce120/dce120_hw_sequencer.c | 2 +- .../drm/amd/display/dc/dce120/dce120_resource.c | 6 +- .../display/dc/dce120/dce120_timing_generator.c | 99 ++----- drivers/gpu/drm/amd/display/dc/dce60/Makefile | 2 + .../gpu/drm/amd/display/dc/dce60/dce60_resource.c | 18 +- .../amd/display/dc/dce60/dce60_timing_generator.c | 4 +- drivers/gpu/drm/amd/display/dc/dce80/Makefile | 2 + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 2 + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 2 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 36 ++- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 5 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 11 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 1 + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 12 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 + .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c | 7 - drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 1 + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 70 ++++- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 4 + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 2 + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 1 + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 1 + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 1 + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 2 +- .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 11 +- .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 44 +-- .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 6 +- .../display/dc/gpio/diagnostics/hw_factory_diag.c | 1 + .../display/dc/gpio/diagnostics/hw_factory_diag.h | 2 + .../dc/gpio/diagnostics/hw_translate_diag.c | 1 + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 7 +- drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 14 - drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 + .../drm/amd/display/dc/inc/hw/timing_generator.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 5 + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 1 + .../amd/display/modules/info_packet/info_packet.c | 13 +- .../drm/amd/display/modules/power/power_helpers.c | 6 +- drivers/gpu/drm/amd/include/kgd_pp_interface.h | 2 + drivers/gpu/drm/amd/include/renoir_ip_offset.h | 2 +- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 30 +- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 9 +- drivers/gpu/drm/amd/pm/inc/smu_types.h | 1 + drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c | 2 +- .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 4 +- .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c | 1 + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 4 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 137 +++++---- .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.h | 1 + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 11 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 11 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 20 +- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 1 + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 314 ++++++++++++++++----- drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 24 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 58 ++-- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 2 + 138 files changed, 1923 insertions(+), 1091 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h create mode 100644 drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h

2 3

[PATCH v4 0/7] dt-bindings: display: Convert DWC HDMI TX bindings to YAML
by Laurent Pinchart 15 Jan '21

15 Jan '21

Hello, This patch series attempts a conversion of the DWC HDMI TX DT bindings to YAML. The DWC HDMI TX is an HDMI transmitter IP core from Synopsys, integrated in various SoCs with different glue layers. As such, some properties are defined in a common document, but sometimes need to be overridden by platform-specific bindings. Compared to v3, the series incorporates small review feedback, and has gained patch 1/7 that updated the imx6q(dl) device trees to use 'ports' nodes. Patch 2/7 then adds a base schema for the common properties, based on the existing dw_hdmi.txt document. Patches 3/7 to 5/7 then convert the platform-specific bindings for Renesas, NXP and Rockchip SoCs. Patch 6/7 replaces the reference to dw_hdmi.txt in the Allwinner bindings with a reference to the YAML base schema, and patch 7/7 drops dw_hdmi.txt. I have volunteered Philipp Zabel and Mark Yao as maintainers for the i.MX6 and Rockchip bindings respectively. Could you please let me know if you would prefer a different maintainer, or ack the respective patch if this is fine with you ? It seems to be difficult to find a maintainer for the RockChip bindings. In the event that no maintainer can be found, Rob has recommended to simply delete the text-based bindings, which I would prefer not being forced to do in a v5. Laurent Pinchart (7): ARM: dts: imx6q(dl): Move 'port' nodes under 'ports' for HDMI encoder dt-bindings: display: bridge: Add YAML schema for Synopsys DW-HDMI dt-bindings: display: bridge: renesas,dw-hdmi: Convert binding to YAML dt-bindings: display: imx: hdmi: Convert binding to YAML dt-bindings: display: rockchip: dw-hdmi: Convert binding to YAML dt-bindings: display: sun8i-a83t-dw-hdmi: Reference dw-hdmi YAML schema dt-bindings: display: bridge: Remove deprecated dw_hdmi.txt .../display/allwinner,sun8i-a83t-dw-hdmi.yaml | 4 +- .../bindings/display/bridge/dw_hdmi.txt | 33 ---- .../display/bridge/renesas,dw-hdmi.txt | 88 ---------- .../display/bridge/renesas,dw-hdmi.yaml | 125 ++++++++++++++ .../display/bridge/synopsys,dw-hdmi.yaml | 55 ++++++ .../bindings/display/imx/fsl,imx6-hdmi.yaml | 126 ++++++++++++++ .../devicetree/bindings/display/imx/hdmi.txt | 65 -------- .../display/rockchip/dw_hdmi-rockchip.txt | 74 --------- .../display/rockchip/rockchip,dw-hdmi.yaml | 156 ++++++++++++++++++ MAINTAINERS | 2 +- arch/arm/boot/dts/imx6q.dtsi | 20 ++- arch/arm/boot/dts/imx6qdl.dtsi | 25 +-- 12 files changed, 490 insertions(+), 283 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt delete mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt create mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.yaml create mode 100644 Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi.yaml create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx6-hdmi.yaml delete mode 100644 Documentation/devicetree/bindings/display/imx/hdmi.txt delete mode 100644 Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml -- Regards, Laurent Pinchart

4 10

[PATCH] drm/tegra: fix reference leak when pm_runtime_get_sync fails
by Qinglang Miao 15 Jan '21

15 Jan '21

The PM reference count is not expected to be incremented on return in these tegra functions. However, pm_runtime_get_sync will increment the PM reference count even failed. Forgetting to putting operation will result in a reference leak here. Replace it with pm_runtime_resume_and_get to keep usage counter balanced. Fixes: fd67e9c6ed5a ("drm/tegra: Do not implement runtime PM") Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Qinglang Miao <miaoqinglang(a)huawei.com> --- drivers/gpu/drm/tegra/dc.c | 2 +- drivers/gpu/drm/tegra/dsi.c | 2 +- drivers/gpu/drm/tegra/hdmi.c | 2 +- drivers/gpu/drm/tegra/hub.c | 2 +- drivers/gpu/drm/tegra/sor.c | 2 +- drivers/gpu/drm/tegra/vic.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 424ad60b4..b2c8c68b7 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -2184,7 +2184,7 @@ static int tegra_dc_runtime_resume(struct host1x_client *client) struct device *dev = client->dev; int err; - err = pm_runtime_get_sync(dev); + err = pm_runtime_resume_and_get(dev); if (err < 0) { dev_err(dev, "failed to get runtime PM: %d\n", err); return err; diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c index 5691ef1b0..f46d377f0 100644 --- a/drivers/gpu/drm/tegra/dsi.c +++ b/drivers/gpu/drm/tegra/dsi.c @@ -1111,7 +1111,7 @@ static int tegra_dsi_runtime_resume(struct host1x_client *client) struct device *dev = client->dev; int err; - err = pm_runtime_get_sync(dev); + err = pm_runtime_resume_and_get(dev); if (err < 0) { dev_err(dev, "failed to get runtime PM: %d\n", err); return err; diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index d09a24931..e5d2a4026 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c @@ -1510,7 +1510,7 @@ static int tegra_hdmi_runtime_resume(struct host1x_client *client) struct device *dev = client->dev; int err; - err = pm_runtime_get_sync(dev); + err = pm_runtime_resume_and_get(dev); if (err < 0) { dev_err(dev, "failed to get runtime PM: %d\n", err); return err; diff --git a/drivers/gpu/drm/tegra/hub.c b/drivers/gpu/drm/tegra/hub.c index 22a03f7ff..5ce771cba 100644 --- a/drivers/gpu/drm/tegra/hub.c +++ b/drivers/gpu/drm/tegra/hub.c @@ -789,7 +789,7 @@ static int tegra_display_hub_runtime_resume(struct host1x_client *client) unsigned int i; int err; - err = pm_runtime_get_sync(dev); + err = pm_runtime_resume_and_get(dev); if (err < 0) { dev_err(dev, "failed to get runtime PM: %d\n", err); return err; diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index e88a17c29..fa1272155 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -3214,7 +3214,7 @@ static int tegra_sor_runtime_resume(struct host1x_client *client) struct device *dev = client->dev; int err; - err = pm_runtime_get_sync(dev); + err = pm_runtime_resume_and_get(dev); if (err < 0) { dev_err(dev, "failed to get runtime PM: %d\n", err); return err; diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index ade56b860..b77f72630 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -314,7 +314,7 @@ static int vic_open_channel(struct tegra_drm_client *client, struct vic *vic = to_vic(client); int err; - err = pm_runtime_get_sync(vic->dev); + err = pm_runtime_resume_and_get(vic->dev); if (err < 0) return err; -- 2.23.0

2 1

[PATCH] drm/tegra: Use PTR_ERR_OR_ZERO() to simplify code
by Tian Tao 15 Jan '21

15 Jan '21

Fixes coccicheck warning: drivers/gpu/drm/tegra/drm.c:350:1-3: WARNING: PTR_ERR_OR_ZERO can be used Signed-off-by: Tian Tao <tiantao6(a)hisilicon.com> --- drivers/gpu/drm/tegra/drm.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 19ffb06..245b468 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -347,10 +347,7 @@ static int tegra_gem_create(struct drm_device *drm, void *data, bo = tegra_bo_create_with_handle(file, drm, args->size, args->flags, &args->handle); - if (IS_ERR(bo)) - return PTR_ERR(bo); - - return 0; + return PTR_ERR_OR_ZERO(bo); } static int tegra_gem_mmap(struct drm_device *drm, void *data, -- 2.7.4

2 1

[PATCH v1 0/3] Activate Tegra114 SoC support by Tegra DRM driver
by Dmitry Osipenko 15 Jan '21

15 Jan '21

This series enables Tegra DRM driver for Tegra114 SoC and corrects GR2D compatible entries, which is a minor correction, but it conflicts with the Tegra114 enablement if applied separately, so I included it all in a single small series. Patches are tested by Anton Bambura on his ASUS TF701T tablet device, which is powered by Tegra114 SoC. Display panel now works on Tegra114. Dmitry Osipenko (3): drm/tegra: dc: Enable display controller driver for Tegra114 drm/tegra: gr2d: Correct swapped device-tree compatibles drm/tegra: gr2d: Add compatible for Tegra114 drivers/gpu/drm/tegra/drm.c | 2 ++ drivers/gpu/drm/tegra/gr2d.c | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) -- 2.29.2

2 6

[PATCH 1/2] drm/tegra: falcon: Support newer VIC firmware
by Mikko Perttunen 15 Jan '21

15 Jan '21

Support newer VIC firmware by accepting the new magic number 0x10fe, loading the full code segment instead of just the first page at boot time, and skipping FCE setup if the firmware header indicates that FCE is handled internally by the firmware. Signed-off-by: Mikko Perttunen <mperttunen(a)nvidia.com> --- drivers/gpu/drm/tegra/falcon.c | 9 +++++---- drivers/gpu/drm/tegra/vic.c | 21 +++++++++++++-------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/tegra/falcon.c b/drivers/gpu/drm/tegra/falcon.c index 56edef06c48e..223ab2ceb7e6 100644 --- a/drivers/gpu/drm/tegra/falcon.c +++ b/drivers/gpu/drm/tegra/falcon.c @@ -72,7 +72,7 @@ static int falcon_parse_firmware_image(struct falcon *falcon) struct falcon_fw_os_header_v1 *os; /* endian problems would show up right here */ - if (bin->magic != PCI_VENDOR_ID_NVIDIA) { + if (bin->magic != PCI_VENDOR_ID_NVIDIA && bin->magic != 0x10fe) { dev_err(falcon->dev, "incorrect firmware magic\n"); return -EINVAL; } @@ -178,9 +178,10 @@ int falcon_boot(struct falcon *falcon) falcon->firmware.data.offset + offset, offset, FALCON_MEMORY_DATA); - /* copy the first code segment into Falcon internal memory */ - falcon_copy_chunk(falcon, falcon->firmware.code.offset, - 0, FALCON_MEMORY_IMEM); + /* copy the code segment into Falcon internal memory */ + for (offset = 0; offset < falcon->firmware.code.size; offset += 256) + falcon_copy_chunk(falcon, falcon->firmware.code.offset + offset, + offset, FALCON_MEMORY_IMEM); /* setup falcon interrupts */ falcon_writel(falcon, FALCON_IRQMSET_EXT(0xff) | diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index ade56b860cf9..a3dbb8813faf 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -135,16 +135,21 @@ static int vic_boot(struct vic *vic) hdr = vic->falcon.firmware.virt; fce_bin_data_offset = *(u32 *)(hdr + VIC_UCODE_FCE_DATA_OFFSET); - hdr = vic->falcon.firmware.virt + - *(u32 *)(hdr + VIC_UCODE_FCE_HEADER_OFFSET); - fce_ucode_size = *(u32 *)(hdr + FCE_UCODE_SIZE_OFFSET); falcon_execute_method(&vic->falcon, VIC_SET_APPLICATION_ID, 1); - falcon_execute_method(&vic->falcon, VIC_SET_FCE_UCODE_SIZE, - fce_ucode_size); - falcon_execute_method(&vic->falcon, VIC_SET_FCE_UCODE_OFFSET, - (vic->falcon.firmware.iova + fce_bin_data_offset) - >> 8); + + /* Old VIC firmware needs kernel help with setting up FCE microcode. */ + if (fce_bin_data_offset != 0x0 && fce_bin_data_offset != 0xa5a5a5a5) { + hdr = vic->falcon.firmware.virt + + *(u32 *)(hdr + VIC_UCODE_FCE_HEADER_OFFSET); + fce_ucode_size = *(u32 *)(hdr + FCE_UCODE_SIZE_OFFSET); + + falcon_execute_method(&vic->falcon, VIC_SET_FCE_UCODE_SIZE, + fce_ucode_size); + falcon_execute_method( + &vic->falcon, VIC_SET_FCE_UCODE_OFFSET, + (vic->falcon.firmware.iova + fce_bin_data_offset) >> 8); + } err = falcon_wait_idle(&vic->falcon); if (err < 0) { -- 2.30.0

2 2

← Newer
1
...
46
47
48
49
50
51
52
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel January 2021