dri-devel July 2021

dri-devel@lists.freedesktop.org

321 participants
829 discussions

[PATCH] Fix cursor plane didn't update
by jason-jh.lin 19 Jul '21

19 Jul '21

The cursor plane should use the current plane state in atomic_async_update because it would not be the new plane state in the global atomic state since _swap_state happened when those hook are run. Fix cursor plane issue by below modification: 1. Remove plane_helper_funcs->atomic_update(plane, state) in mtk_drm_crtc_async_update. 2. Add mtk_drm_update_new_state in to mtk_plane_atomic_async_update to update the cursor plane by current plan hook and update the normal plane by the new_state. Fixes: 37418bf14c13 ("drm: Use state helper instead of the plane state pointer") Signed-off-by: jason-jh.lin <jason-jh.lin(a)mediatek.com> --- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 1 - drivers/gpu/drm/mediatek/mtk_drm_plane.c | 60 ++++++++++++++---------- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c index 474efb844249..063c75bab3a8 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c @@ -538,7 +538,6 @@ void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane, if (!mtk_crtc->enabled) return; - plane_helper_funcs->atomic_update(plane, state); mtk_drm_crtc_update_config(mtk_crtc, false); } diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c index b5582dcf564c..e6dcb34d3052 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c @@ -110,6 +110,35 @@ static int mtk_plane_atomic_async_check(struct drm_plane *plane, true, true); } +static void mtk_plane_update_new_state(struct drm_plane_state *new_state, + struct mtk_plane_state *mtk_plane_state) +{ + struct drm_framebuffer *fb = new_state->fb; + struct drm_gem_object *gem; + struct mtk_drm_gem_obj *mtk_gem; + unsigned int pitch, format; + dma_addr_t addr; + + gem = fb->obj[0]; + mtk_gem = to_mtk_gem_obj(gem); + addr = mtk_gem->dma_addr; + pitch = fb->pitches[0]; + format = fb->format->format; + + addr += (new_state->src.x1 >> 16) * fb->format->cpp[0]; + addr += (new_state->src.y1 >> 16) * pitch; + + mtk_plane_state->pending.enable = true; + mtk_plane_state->pending.pitch = pitch; + mtk_plane_state->pending.format = format; + mtk_plane_state->pending.addr = addr; + mtk_plane_state->pending.x = new_state->dst.x1; + mtk_plane_state->pending.y = new_state->dst.y1; + mtk_plane_state->pending.width = drm_rect_width(&new_state->dst); + mtk_plane_state->pending.height = drm_rect_height(&new_state->dst); + mtk_plane_state->pending.rotation = new_state->rotation; +} + static void mtk_plane_atomic_async_update(struct drm_plane *plane, struct drm_atomic_state *state) { @@ -126,8 +155,10 @@ static void mtk_plane_atomic_async_update(struct drm_plane *plane, plane->state->src_h = new_state->src_h; plane->state->src_w = new_state->src_w; swap(plane->state->fb, new_state->fb); - new_plane_state->pending.async_dirty = true; + mtk_plane_update_new_state(new_state, new_plane_state); + wmb(); /* Make sure the above parameters are set before update */ + new_plane_state->pending.async_dirty = true; mtk_drm_crtc_async_update(new_state->crtc, plane, state); } @@ -189,14 +220,8 @@ static void mtk_plane_atomic_update(struct drm_plane *plane, struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state, plane); struct mtk_plane_state *mtk_plane_state = to_mtk_plane_state(new_state); - struct drm_crtc *crtc = new_state->crtc; - struct drm_framebuffer *fb = new_state->fb; - struct drm_gem_object *gem; - struct mtk_drm_gem_obj *mtk_gem; - unsigned int pitch, format; - dma_addr_t addr; - if (!crtc || WARN_ON(!fb)) + if (!new_state->crtc || WARN_ON(!new_state->fb)) return; if (!new_state->visible) { @@ -204,24 +229,7 @@ static void mtk_plane_atomic_update(struct drm_plane *plane, return; } - gem = fb->obj[0]; - mtk_gem = to_mtk_gem_obj(gem); - addr = mtk_gem->dma_addr; - pitch = fb->pitches[0]; - format = fb->format->format; - - addr += (new_state->src.x1 >> 16) * fb->format->cpp[0]; - addr += (new_state->src.y1 >> 16) * pitch; - - mtk_plane_state->pending.enable = true; - mtk_plane_state->pending.pitch = pitch; - mtk_plane_state->pending.format = format; - mtk_plane_state->pending.addr = addr; - mtk_plane_state->pending.x = new_state->dst.x1; - mtk_plane_state->pending.y = new_state->dst.y1; - mtk_plane_state->pending.width = drm_rect_width(&new_state->dst); - mtk_plane_state->pending.height = drm_rect_height(&new_state->dst); - mtk_plane_state->pending.rotation = new_state->rotation; + mtk_plane_update_new_state(new_state, mtk_plane_state); wmb(); /* Make sure the above parameters are set before update */ mtk_plane_state->pending.dirty = true; } -- 2.18.0

1 0

[PATCH v1] drm/mediatek: add dither 6 setting
by Yongqiang Niu 19 Jul '21

19 Jul '21

Yongqiang Niu (1): drm/mediatek: add dither 6 setting drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 ++ 1 file changed, 2 insertions(+) mode change 100644 => 100755 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c -- 1.8.1.1.dirty

1 1

[git pull] drm fixes for 5.14-rc2
by Dave Airlie 19 Jul '21

19 Jul '21

Hi Linus, Regular rc2 fixes though a bit more than usual at rc2 stage, people must have been testing early or else some fixes from last week got a bit laggy. There is one larger change in the amd fixes to amalgamate some power management code on the newer chips with the code from the older chips, it should only affects chips where support was introduced in rc1 and it should make future fixes easier to maintain probably a good idea to merge it now. Otherwise it's mostly fixes across the board. Dave. drm-fixes-2021-07-16: drm fixes for 5.14-rc2 dma-buf: - Fix fence leak in sync_file_merge() error code drm/panel: - nt35510: Don't fail on DSI reads fbdev: - Avoid use-after-free by not deleting current video mode ttm: - Avoid NULL-ptr deref in ttm_range_man_fini() vmwgfx: - Fix a merge commit qxl: - fix a TTM regression amdgpu: - SR-IOV fixes - RAS fixes - eDP fixes - SMU13 code unification to facilitate fixes in the future - Add new renoir DID - Yellow Carp fixes - Beige Goby fixes - Revert a bunch of TLB fixes that caused regressions - Revert an LTTPR display regression amdkfd - Fix VRAM access regression - SVM fixes i915: - Fix -EDEADLK handling regression - Drop the page table optimisation The following changes since commit e73f0f0ee7541171d89f2e2491130c7771ba58d3: Linux 5.14-rc1 (2021-07-11 15:07:40 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2021-07-16 for you to fetch changes up to 876d98e5511d8cfd12fc617a6717e7a8ea07be17: Merge tag 'drm-intel-fixes-2021-07-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2021-07-16 10:53:02 +1000) ---------------------------------------------------------------- drm fixes for 5.14-rc2 dma-buf: - Fix fence leak in sync_file_merge() error code drm/panel: - nt35510: Don't fail on DSI reads fbdev: - Avoid use-after-free by not deleting current video mode ttm: - Avoid NULL-ptr deref in ttm_range_man_fini() vmwgfx: - Fix a merge commit qxl: - fix a TTM regression amdgpu: - SR-IOV fixes - RAS fixes - eDP fixes - SMU13 code unification to facilitate fixes in the future - Add new renoir DID - Yellow Carp fixes - Beige Goby fixes - Revert a bunch of TLB fixes that caused regressions - Revert an LTTPR display regression amdkfd - Fix VRAM access regression - SVM fixes i915: - Fix -EDEADLK handling regression - Drop the page table optimisation ---------------------------------------------------------------- Aaron Liu (1): drm/amd/pm: Add waiting for response of mode-reset message for yellow carp Chengming Gui (1): drm/amd/pm: Fix BACO state setting for Beige_Goby Christian König (1): drm/qxl: add NULL check for bo->resource Daniel Vetter (1): Merge tag 'drm-misc-fixes-2021-07-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Dave Airlie (3): Merge tag 'amd-drm-fixes-5.14-2021-07-14' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge tag 'drm-misc-fixes-2021-07-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2021-07-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Dmytro Laktyushkin (1): drm/amd/display: remove faulty assert Emily Deng (1): drm/amdgpu: Correct the irq numbers for virtual crtc Emily.Deng (1): drm/amdgpu: Restore msix after FLR Eric Huang (5): Revert "drm/amdkfd: Add memory sync before TLB flush on unmap" Revert "drm/amdgpu: Fix warning of Function parameter or member not described" Revert "drm/amdkfd: Make TLB flush conditional on mapping" Revert "drm/amdgpu: Add table_freed parameter to amdgpu_vm_bo_update" Revert "drm/amdkfd: Add heavy-weight TLB flush after unmapping" Felix Kuehling (1): drm/amdkfd: Allow CPU access for all VRAM BOs Jason Ekstrand (1): dma-buf/sync_file: Don't leak fences on merge failure Jingwen Chen (1): drm/amdgpu: SRIOV flr_work should take write_lock Jinzhou Su (1): drm/amdgpu: add another Renoir DID Linus Walleij (1): drm/panel: nt35510: Do not fail if DSI read fails Luben Tuikov (1): drm/amdgpu: Return error if no RAS Matthew Auld (1): drm/i915/gtt: drop the page table optimisation Nicholas Kazlauskas (1): drm/amd/display: Fix updating infoframe for DCN3.1 eDP Philip Yang (1): drm/amdkfd: handle fault counters on invalid address Thomas Zimmermann (1): Merge remote-tracking branch 'drm-misc/drm-misc-next-fixes' into drm-misc-fixes Ville Syrjälä (1): drm/i915/gt: Fix -EDEADLK handling regression Wesley Chalmers (1): Revert "drm/amd/display: Always write repeater mode regardless of LTTPR" Xiaomeng Hou (2): drm/amd/pm: drop smu_v13_0_1.c|h files for yellow carp drm/amd/display: update header file name Zack Rusin (2): drm/vmwgfx: Fix implicit declaration error drm/vmwgfx: Fix a bad merge in otable batch takedown Zhan Liu (1): drm/amdgpu/display - only update eDP's backlight level when necessary Zhen Lei (1): fbmem: Do not delete the mode that is still in use Zheyu Ma (1): drm/ttm: add a check against null pointer dereference drivers/dma-buf/sync_file.c | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 22 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 18 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 49 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 4 +- drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 45 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 30 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 4 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 2 +- .../drm/amd/include/asic_reg/mp/mp_13_0_1_offset.h | 355 -------------- .../amd/include/asic_reg/mp/mp_13_0_1_sh_mask.h | 531 --------------------- drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 1 + drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h | 57 --- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 1 + drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 2 +- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 24 + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c | 311 ------------ .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 49 +- drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 5 +- drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 +- drivers/gpu/drm/panel/panel-novatek-nt35510.c | 4 +- drivers/gpu/drm/qxl/qxl_ttm.c | 2 +- drivers/gpu/drm/ttm/ttm_range_manager.c | 3 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 1 - drivers/video/fbdev/core/fbmem.c | 12 +- 38 files changed, 202 insertions(+), 1395 deletions(-) delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_offset.h delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_sh_mask.h delete mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h delete mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c

4 3

[PATCH] drm/exynos: Convert from atomic_t to refcount_t on g2d_cmdlist_userptr->refcount
by Xiyu Yang 19 Jul '21

19 Jul '21

refcount_t type and corresponding API can protect refcounters from accidental underflow and overflow and further use-after-free situations. Signed-off-by: Xiyu Yang <xiyuyang19(a)fudan.edu.cn> Signed-off-by: Xin Tan <tanxin.ctf(a)gmail.com> --- drivers/gpu/drm/exynos/exynos_drm_g2d.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c index cab4d2c370a7..4921e84c374d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c @@ -4,6 +4,7 @@ * Authors: Joonyoung Shim <jy0922.shim(a)samsung.com> */ +#include <linux/refcount.h> #include <linux/clk.h> #include <linux/component.h> #include <linux/delay.h> @@ -208,7 +209,7 @@ struct g2d_cmdlist_userptr { struct page **pages; unsigned int npages; struct sg_table *sgt; - atomic_t refcount; + refcount_t refcount; bool in_pool; bool out_of_list; }; @@ -386,9 +387,9 @@ static void g2d_userptr_put_dma_addr(struct g2d_data *g2d, if (force) goto out; - atomic_dec(&g2d_userptr->refcount); + refcount_dec(&g2d_userptr->refcount); - if (atomic_read(&g2d_userptr->refcount) > 0) + if (refcount_read(&g2d_userptr->refcount) > 0) return; if (g2d_userptr->in_pool) @@ -436,7 +437,7 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct g2d_data *g2d, * and different size. */ if (g2d_userptr->size == size) { - atomic_inc(&g2d_userptr->refcount); + refcount_inc(&g2d_userptr->refcount); *obj = g2d_userptr; return &g2d_userptr->dma_addr; @@ -461,7 +462,7 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct g2d_data *g2d, if (!g2d_userptr) return ERR_PTR(-ENOMEM); - atomic_set(&g2d_userptr->refcount, 1); + refcount_set(&g2d_userptr->refcount, 1); g2d_userptr->size = size; start = userptr & PAGE_MASK; -- 2.7.4

1 0

[PATCH v3 0/7] drm/msm/dpu: add support for independent DSI config
by Dmitry Baryshkov 17 Jul '21

17 Jul '21

This patchseries adds support for independent DSI config to DPU1 display subdriver. Also drop one of msm_kms_funcs callbacks, made unnecessary now. Tested on RB5 (dpu, dsi). Previous iteration was tested by Alexey Minnekhanov. Changes since v2: - Removed Reviewed-By tags from changed patches (1, 2) - Changed more dual DSI mentions in the patch 1 - Added msm_dsi_is_master_dsi() helper - Rewrote dsi encoder setup function again basing on review by Abhinav Cahanges since v1: - Rewrote dsi encoder setup function by separating common code sequence and calling it either for the bonded interface or twice for each of the DSI hosts. Changes since RFC: - renamed dual DSI to bonded DSI as suggsted by Abhinav - added comments to _dpu_kms_initialize_dsi() regarding encoders usage

3 12

[Bug 213569] New: Amdgpu temperature reaching dangerous levels
by bugzilla-daemon＠bugzilla.kernel.org 17 Jul '21

17 Jul '21

https://bugzilla.kernel.org/show_bug.cgi?id=213569 Bug ID: 213569 Summary: Amdgpu temperature reaching dangerous levels Product: Drivers Version: 2.5 Kernel Version: 5.12, 5.11 Hardware: x86-64 OS: Linux Tree: Mainline Status: NEW Severity: blocking Priority: P1 Component: Video(DRI - non Intel) Assignee: drivers_video-dri(a)kernel-bugs.osdl.org Reporter: martin.tk(a)gmx.com Regression: No Ever since going to 5.11 version and later 5.12 the fan speed on my Radeon RX550 is erratic causing the temperature to reach dangerous level. sensors output: amdgpu-pci-0100 Adapter: PCI adapter vddgfx: 825.00 mV fan1: 200 RPM (min = 0 RPM, max = 3500 RPM) edge: +69.0°C (crit = +97.0°C, hyst = -273.1°C) power1: 7.03 W (cap = 36.00 W) I'm afraid it'll eventually kill my gpu. I've already reported another bug for 5.11: https://bugzilla.kernel.org/show_bug.cgi?id=212107 >From what I gather there were changes in fan control in 5.11. Is it possible to disable those changes? There were no issues on 5.10. Fan went to roughly 1000rpm, it was cool and quiet. The behaviour from 5.11 onward is dangerous, can cause hardware destruction. -- You may reply to this email to add a comment. You are receiving this mail because: You are watching the assignee of the bug.

1 6

[PATCH] drm/tegra: Fix compilation of variadic macro
by Jon Hunter 16 Jul '21

16 Jul '21

Commit 43636451db8c ("drm/tegra: Implement job submission part of new UAPI") added the macro 'SUBMIT_ERR' that in turns makes use of the macro '__VA_OPT__'. The '__VA_OPT__' macro is not supported by older versions of GCC and so causes build failures when using older versions of GCC. Fix this by using the '##__VA_ARGS__' macro instead. Fixes: 43636451db8c ("drm/tegra: Implement job submission part of new UAPI") Reported-by: Linux Kernel Functional Testing <lkft(a)linaro.org> Signed-off-by: Jon Hunter <jonathanh(a)nvidia.com> --- drivers/gpu/drm/tegra/submit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/tegra/submit.c b/drivers/gpu/drm/tegra/submit.c index c53b7207c478..e49630089149 100644 --- a/drivers/gpu/drm/tegra/submit.c +++ b/drivers/gpu/drm/tegra/submit.c @@ -24,7 +24,7 @@ #define SUBMIT_ERR(context, fmt, ...) \ dev_err_ratelimited(context->client->base.dev, \ "%s: job submission failed: " fmt "\n", \ - current->comm __VA_OPT__(,) __VA_ARGS__) + current->comm, ##__VA_ARGS__) static struct tegra_drm_mapping * tegra_drm_mapping_get(struct tegra_drm_context *context, u32 id) -- 2.25.1

3 2

[PATCH v2] dt-bindings: display: renesas, du: Make resets optional on R-Car H1
by Geert Uytterhoeven 16 Jul '21

16 Jul '21

The "resets" property is not present on R-Car Gen1 SoCs. Supporting it would require migrating from renesas,cpg-clocks to renesas,cpg-mssr. Reflect this in the DT bindings by removing the global "required: resets". All SoCs that do have "resets" properties already have SoC-specific rules making it required. Fixes: 99d66127fad25ebb ("dt-bindings: display: renesas,du: Convert binding to YAML") Signed-off-by: Geert Uytterhoeven <geert+renesas(a)glider.be> Reviewed-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> --- v2: - Add Reviewed-by. --- Documentation/devicetree/bindings/display/renesas,du.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/devicetree/bindings/display/renesas,du.yaml b/Documentation/devicetree/bindings/display/renesas,du.yaml index 5f4345d43020fd53..e3ca5389c17d34e9 100644 --- a/Documentation/devicetree/bindings/display/renesas,du.yaml +++ b/Documentation/devicetree/bindings/display/renesas,du.yaml @@ -92,7 +92,6 @@ required: - reg - clocks - interrupts - - resets - ports allOf: -- 2.25.1

2 1

[PATCH] drm/mipi: set fwnode when a mipi_dsi_device registers itself
by Will McVicker 16 Jul '21

16 Jul '21

This is needed for fw_devlink to work properly with MIPI DSI devices. Without setting the device's fwnode, the sync state framework isn't able to properly track device links between the MIPI DSI device and its suppliers which may result in its supplier probing before the mipi device. Suggested-by: Saravana Kannan <saravanak(a)google.com> Signed-off-by: Will McVicker <willmcvicker(a)google.com> --- drivers/gpu/drm/drm_mipi_dsi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c index 5dd475e82995..469d56cf2a50 100644 --- a/drivers/gpu/drm/drm_mipi_dsi.c +++ b/drivers/gpu/drm/drm_mipi_dsi.c @@ -222,6 +222,7 @@ mipi_dsi_device_register_full(struct mipi_dsi_host *host, } dsi->dev.of_node = info->node; + dsi->dev.fwnode = of_fwnode_handle(info->node); dsi->channel = info->channel; strlcpy(dsi->name, info->type, sizeof(dsi->name)); -- 2.32.0.93.g670b81a890-goog

2 1

[PATCH] drm/amd/display: Fix identical code for different branches
by Len Baker 16 Jul '21

16 Jul '21

The branches of the "if" statement are the same. So remove the unnecessary if and goto statements. Addresses-Coverity-ID: 1456916 ("Identical code for different branches") Fixes: 4c283fdac08ab ("drm/amd/display: Add HDCP module") Signed-off-by: Len Baker <len.baker(a)gmx.com> --- drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c index de872e7958b0..d0c565567102 100644 --- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c +++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c @@ -305,10 +305,8 @@ static enum mod_hdcp_status wait_for_ready(struct mod_hdcp *hdcp, hdcp, "bcaps_read")) goto out; } - if (!mod_hdcp_execute_and_set(check_ksv_ready, - &input->ready_check, &status, - hdcp, "ready_check")) - goto out; + mod_hdcp_execute_and_set(check_ksv_ready, &input->ready_check, &status, + hdcp, "ready_check"); out: return status; } -- 2.25.1

2 2

← Newer
1
...
50
51
52
53
54
55
56
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel July 2021