dri-devel April 2022

dri-devel@lists.freedesktop.org

351 participants
951 discussions

[PATCH] omapfb: simplify the return expression of nec_8048_connect()
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> --- .../fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c index be9910ff6e62..b407173e27b1 100644 --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c @@ -117,16 +117,11 @@ static int nec_8048_connect(struct omap_dss_device *dssdev) { struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; - int r; if (omapdss_device_is_connected(dssdev)) return 0; - r = in->ops.dpi->connect(in, dssdev); - if (r) - return r; - - return 0; + return in->ops.dpi->connect(in, dssdev); } static void nec_8048_disconnect(struct omap_dss_device *dssdev) -- 2.25.1

1 0

[PATCH] drm/virtio: simplify the return expression
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/virtio/virtgpu_prime.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c index 55d80b77d9b0..44425f20d91a 100644 --- a/drivers/gpu/drm/virtio/virtgpu_prime.c +++ b/drivers/gpu/drm/virtio/virtgpu_prime.c @@ -90,7 +90,6 @@ static const struct virtio_dma_buf_ops virtgpu_dmabuf_ops = { int virtio_gpu_resource_assign_uuid(struct virtio_gpu_device *vgdev, struct virtio_gpu_object *bo) { - int ret; struct virtio_gpu_object_array *objs; objs = virtio_gpu_array_alloc(1); @@ -98,11 +97,8 @@ int virtio_gpu_resource_assign_uuid(struct virtio_gpu_device *vgdev, return -ENOMEM; virtio_gpu_array_add_obj(objs, &bo->base.base); - ret = virtio_gpu_cmd_resource_assign_uuid(vgdev, objs); - if (ret) - return ret; - return 0; + return virtio_gpu_cmd_resource_assign_uuid(vgdev, objs); } struct dma_buf *virtgpu_gem_prime_export(struct drm_gem_object *obj, -- 2.25.1

1 0

[PATCH] drm/i915: remove unnecessary spin_lock_irq
by Zhenneng Li 29 Apr '22

29 Apr '22

This code will not be called by interrupt handler, so change it to spin_lock. Signed-off-by: Zhenneng Li <lizhenneng(a)kylinos.cn> --- drivers/gpu/drm/i915/i915_scheduler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_scheduler.c b/drivers/gpu/drm/i915/i915_scheduler.c index 762127dd56c5..6615102a1568 100644 --- a/drivers/gpu/drm/i915/i915_scheduler.c +++ b/drivers/gpu/drm/i915/i915_scheduler.c @@ -288,9 +288,9 @@ static void __i915_schedule(struct i915_sched_node *node, void i915_schedule(struct i915_request *rq, const struct i915_sched_attr *attr) { - spin_lock_irq(&schedule_lock); + spin_lock(&schedule_lock); __i915_schedule(&rq->sched, attr); - spin_unlock_irq(&schedule_lock); + spin_unlock(&schedule_lock); } void i915_sched_node_init(struct i915_sched_node *node) -- 2.25.1

1 0

[PATCH v4, 0/1] drm/mediatek: add lut diff flag for new gamma hardware
by Yongqiang Niu 29 Apr '22

29 Apr '22

base v5.17-rc1 change since v3: -fix type error Yongqiang Niu (1): drm/mediatek: add lut diff flag for new gamma hardware support drivers/gpu/drm/mediatek/mtk_disp_aal.c | 2 +- drivers/gpu/drm/mediatek/mtk_disp_drv.h | 2 +- drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 34 +++++++++++++++++++---- 3 files changed, 30 insertions(+), 8 deletions(-) -- 2.25.1

3 3

[git pull] drm fixes for 5.18-rc5
by Dave Airlie 29 Apr '22

29 Apr '22

Hi Linus, Another relatively quiet week, amdgpu leads the way, some i915 display fixes, and a single sunxi fix. Regards, Dave. drm-fixes-2022-04-29: drm fixes for 5.18-rc5 amdgpu: - Runtime pm fix - DCN memory leak fix in error path - SI DPM deadlock fix - S0ix fix amdkfd: - GWS fix - GWS support for CRIU i915: - Fix #5284: Backlight control regression on XMG Core 15 e21 - Fix black display plane on Acer One AO532h - Two smaller display fixes sunxi: - Single fix removing applying PHYS_OFFSET twice The following changes since commit af2d861d4cd2a4da5137f795ee3509e6f944a25b: Linux 5.18-rc4 (2022-04-24 14:51:22 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2022-04-29 for you to fetch changes up to 9d9f720733b7e8d11e4cc53b53f461b117dab839: Merge tag 'amd-drm-fixes-5.18-2022-04-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2022-04-29 10:27:05 +1000) ---------------------------------------------------------------- drm fixes for 5.18-rc5 amdgpu: - Runtime pm fix - DCN memory leak fix in error path - SI DPM deadlock fix - S0ix fix amdkfd: - GWS fix - GWS support for CRIU i915: - Fix #5284: Backlight control regression on XMG Core 15 e21 - Fix black display plane on Acer One AO532h - Two smaller display fixes sunxi: - Single fix removing applying PHYS_OFFSET twice ---------------------------------------------------------------- Alex Deucher (1): drm/amdgpu: don't runtime suspend if there are displays attached (v3) Dave Airlie (3): Merge tag 'drm-misc-fixes-2022-04-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2022-04-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'amd-drm-fixes-5.18-2022-04-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes David Yat Sin (2): drm/amdkfd: Fix GWS queue count drm/amdkfd: CRIU add support for GWS queues Evan Quan (1): drm/amd/pm: fix the deadlock issue observed on SI Hans de Goede (1): drm/i915: Fix DISP_POS_Y and DISP_HEIGHT defines Imre Deak (1): drm/i915: Fix SEL_FETCH_PLANE_*(PIPE_B+) register addresses Jouni Högander (1): drm/i915: Check EDID for HDR static metadata when choosing blc Miaoqian Lin (1): drm/amd/display: Fix memory leak in dcn21_clock_source_create Prike Liang (1): drm/amdgpu: keep mmhub clock gating being enabled during s2idle suspend Samuel Holland (1): drm/sun4i: Remove obsolete references to PHYS_OFFSET Ville Syrjälä (1): drm/i915/fbc: Consult hw.crtc instead of uapi.crtc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 105 ++++++++++++++------- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 10 ++ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 83 ++++++++-------- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 10 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 1 + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 39 ++++++++ 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 -- .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 34 +++++-- drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 6 +- drivers/gpu/drm/sun4i/sun4i_frontend.c | 3 - 14 files changed, 195 insertions(+), 155 deletions(-)

2 1

linux-next: manual merge of the amdgpu tree with the drm tree
by Stephen Rothwell 29 Apr '22

29 Apr '22

Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c between commit: 047a1b877ed4 ("dma-buf & drm/amdgpu: remove dma_resv workaround") from the drm tree and commit: 3da2c38231a4 ("drm/amdgpu: Free user pages if amdgpu_cs_parser_bos failed") from the amdgpu 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_cs.c index 01853431249d,67bd506fa141..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@@ -636,9 -642,26 +636,21 @@@ static int amdgpu_cs_parser_bos(struct } error_validate: - if (r) { - amdgpu_bo_list_for_each_entry(e, p->bo_list) { - dma_fence_chain_free(e->chain); - e->chain = NULL; - } + if (r) ttm_eu_backoff_reservation(&p->ticket, &p->validated); - out: - } + + out_free_user_pages: + if (r) { + amdgpu_bo_list_for_each_userptr_entry(e, p->bo_list) { + struct amdgpu_bo *bo = ttm_to_amdgpu_bo(e->tv.bo); + + if (!e->user_pages) + continue; + amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm); + kvfree(e->user_pages); + e->user_pages = NULL; + } + } return r; }

1 0

[PATCH 0/4] etnaviv drm/sched stragglers
by Daniel Vetter 28 Apr '22

28 Apr '22

Hi all, The only changes compared to the previous version is that the 2nd etnaviv patch has an improved commit message. Previous discussion is here: https://lore.kernel.org/dri-devel/20210706101209.3034092-1-daniel.vetter@ff… Would be great if I can finally stuff these into drm-misc-next together with the code removal. It's the last driver patches for the drm/sched dependency tracking conversion. Thanks, Daniel Daniel Vetter (4): drm/etnaviv: Use scheduler dependency handling drm/gem: Delete gem array fencing helpers drm/sched: Check locking in drm_sched_job_add_implicit_dependencies drm/etnaviv: Don't break exclusive fence ordering drivers/gpu/drm/drm_gem.c | 80 -------------------- drivers/gpu/drm/etnaviv/etnaviv_gem.h | 4 +- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 57 ++++++++------ drivers/gpu/drm/etnaviv/etnaviv_sched.c | 53 +------------ drivers/gpu/drm/etnaviv/etnaviv_sched.h | 3 +- drivers/gpu/drm/scheduler/sched_main.c | 2 + include/drm/drm_gem.h | 5 -- 7 files changed, 41 insertions(+), 163 deletions(-) -- 2.34.1

5 12

[PULL] gvt-next
by Wang, Zhi A 28 Apr '22

28 Apr '22

Hi folks: Here is the pull of gvt-next which fixs the compilation error when i915 debug is open after the GVT-g refactor patches. Thanks so much for the efforts. Thanks, Zhi. The following changes since commit 2917f53113be3b7a0f374e02cebe6d6b749366b5: vfio/mdev: Remove mdev drvdata (2022-04-21 07:36:56 -0400) are available in the Git repository at: https://github.com/intel/gvt-linux tags/gvt-next-2022-04-26 for you to fetch changes up to 2da299cee780ea797b3f72558687868072cf5eb5: drm/i915/gvt: Add missing export of symbols. (2022-04-25 18:03:04 -0400) ---------------------------------------------------------------- gvt-next-2022-04-26 - Add two missing exports of symbols when i915 debug is enabled. ---------------------------------------------------------------- Zhi Wang (1): drm/i915/gvt: Add missing export of symbols. drivers/gpu/drm/i915/intel_gvt.c | 2 ++ 1 file changed, 2 insertions(+)

5 9

[PATCH v2] drm/msm/dpu: remove unused refcount for encoder_phys_wb
by Abhinav Kumar 28 Apr '22

28 Apr '22

Remove the unused local variable refcount for encoder_phys_wb as the one part of wb_enc is used directly. changes in v2: - remove usage of ret variable also - remove the if (ret) code as it was dead-code anyway Fixes: 0ce51f19453e ("drm/msm/dpu: introduce the dpu_encoder_phys_* for writeback") Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Abhinav Kumar <quic_abhinavk(a)quicinc.com> --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c index cb5c7da53c29..f4a79715a02e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c @@ -406,22 +406,13 @@ static void dpu_encoder_phys_wb_irq_ctrl( { struct dpu_encoder_phys_wb *wb_enc = to_dpu_encoder_phys_wb(phys); - int ret = 0; - int refcount; - - refcount = atomic_read(&wb_enc->wbirq_refcount); - if (enable && atomic_inc_return(&wb_enc->wbirq_refcount) == 1) { + if (enable && atomic_inc_return(&wb_enc->wbirq_refcount) == 1) dpu_core_irq_register_callback(phys->dpu_kms, phys->irq[INTR_IDX_WB_DONE], dpu_encoder_phys_wb_done_irq, phys); - if (ret) - atomic_dec_return(&wb_enc->wbirq_refcount); - } else if (!enable && - atomic_dec_return(&wb_enc->wbirq_refcount) == 0) { + else if (!enable && + atomic_dec_return(&wb_enc->wbirq_refcount) == 0) dpu_core_irq_unregister_callback(phys->dpu_kms, phys->irq[INTR_IDX_WB_DONE]); - if (ret) - atomic_inc_return(&wb_enc->wbirq_refcount); - } } static void dpu_encoder_phys_wb_atomic_mode_set( -- 2.7.4

2 1

[PATCH v5 0/6] drm/i915: ttm for stolen region
by Robert Beckett 28 Apr '22

28 Apr '22

This series refactors i915's stolen memory region to use ttm. v2: handle disabled stolen similar to legacy version. relying on ttm to fail allocs works fine, but is dmesg noisy and causes testing dmesg warning regressions. v3: rebase to latest drm-tip. fix v2 code refactor which could leave a buffer pinned. locally passes fftl again now. v4: - Allow memory regions creators to do allocation. Allows stolen region to track it's own reservations. - Pre-reserve first page of stolen mem (add back WaSkipStolenMemoryFirstPage:bdw+) - Improve commit descritpion for "drm/i915: sanitize mem_flags for stolen buffers" - replace i915_gem_object_pin_pages_unlocked() call with manual locking and pinning. this avoids ww ctx class reuse during context creation -> ring vma obj alloc. v5: - detect both types of stolen as stolen buffers in "drm/i915: sanitize mem_flags for stolen buffers" - in stolen_object_init limit page size to mem region minimum. The range allocator expects the page_size to define the alignment Robert Beckett (6): drm/i915: instantiate ttm ranger manager for stolen memory drm/i915: sanitize mem_flags for stolen buffers drm/i915: ttm move/clear logic fix drm/i915: ttm backend dont provide mmap_offset for kernel buffers drm/i915: allow memory region creators to alloc and free the region drm/i915: stolen memory use ttm backend drivers/gpu/drm/i915/display/intel_fbc.c | 78 +-- .../gpu/drm/i915/gem/i915_gem_object_types.h | 2 - drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 453 ++++++++---------- drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 21 +- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 35 +- drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 7 + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 34 +- drivers/gpu/drm/i915/gt/intel_rc6.c | 4 +- drivers/gpu/drm/i915/gt/selftest_reset.c | 16 +- drivers/gpu/drm/i915/i915_debugfs.c | 7 +- drivers/gpu/drm/i915/i915_drv.h | 5 - drivers/gpu/drm/i915/intel_memory_region.c | 16 +- drivers/gpu/drm/i915/intel_memory_region.h | 2 + drivers/gpu/drm/i915/intel_region_ttm.c | 67 ++- drivers/gpu/drm/i915/intel_region_ttm.h | 8 +- drivers/gpu/drm/i915/selftests/mock_region.c | 3 +- 16 files changed, 400 insertions(+), 358 deletions(-) -- 2.25.1

1 6

← Newer
1
...
18
19
20
21
22
23
24
...
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