dri-devel September 2021

dri-devel@lists.freedesktop.org

348 participants
817 discussions

linux-next: build warning after merge of the drm-misc tree
by Stephen Rothwell 27 Sep '21

27 Sep '21

Hi all, After merging the drm-misc tree, today's linux-next build (htmldocs) produced these warnings: include/drm/drm_edid.h:530: warning: Function parameter or member 'vend_chr_1' not described in 'drm_edid_encode_panel_id' include/drm/drm_edid.h:530: warning: Excess function parameter 'vend_chr_3' description in 'drm_edid_encode_panel_id' Introduced by commit 7d1be0a09fa6 ("drm/edid: Fix EDID quirk compile error on older compilers") -- Cheers, Stephen Rothwell

2 1

[PATCH] drm/i915/audio: Use BIOS provided value for RKL HDA link
by Kai-Heng Feng 27 Sep '21

27 Sep '21

Commit 989634fb49ad ("drm/i915/audio: set HDA link parameters in driver") makes HDMI audio on Lenovo P350 disappear. So in addition to TGL, extend the logic to RKL to use BIOS provided value to fix the regression. Fixes: 989634fb49ad ("drm/i915/audio: set HDA link parameters in driver") Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> --- drivers/gpu/drm/i915/display/intel_audio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c index 532237588511..4e0f96bf6158 100644 --- a/drivers/gpu/drm/i915/display/intel_audio.c +++ b/drivers/gpu/drm/i915/display/intel_audio.c @@ -1308,8 +1308,9 @@ static void i915_audio_component_init(struct drm_i915_private *dev_priv) else aud_freq = aud_freq_init; - /* use BIOS provided value for TGL unless it is a known bad value */ - if (IS_TIGERLAKE(dev_priv) && aud_freq_init != AUD_FREQ_TGL_BROKEN) + /* use BIOS provided value for TGL and RKL unless it is a known bad value */ + if ((IS_TIGERLAKE(dev_priv) || IS_ROCKETLAKE(dev_priv)) && + aud_freq_init != AUD_FREQ_TGL_BROKEN) aud_freq = aud_freq_init; drm_dbg_kms(&dev_priv->drm, "use AUD_FREQ_CNTRL of 0x%x (init value 0x%x)\n", -- 2.32.0

3 2

[PATCH] [RESEND] drm/amdgpu: fix enum odm_combine_mode mismatch
by Arnd Bergmann 27 Sep '21

27 Sep '21

From: Arnd Bergmann <arnd(a)arndb.de> A conversion from 'bool' to 'enum odm_combine_mode' was incomplete, and gcc warns about this with many instances of display/dc/dml/dcn20/display_mode_vba_20.c:3899:44: warning: implicit conversion from 'enum <anonymous>' to 'enum odm_combine_mode' [-Wenum-conversion] 3899 | locals->ODMCombineEnablePerState[i][k] = false; Change the ones that we get a warning for, using the same numerical values to leave the behavior unchanged. Fixes: 5fc11598166d ("drm/amd/display: expand dml structs") Link: https://lore.kernel.org/all/20201026210039.3884312-3-arnd@kernel.org/ Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- I cannot tell if this is the correct conversion, please review carefully. Tested on v5.15-rc2, please just ignore if a patch is already pending for v5.15. I got now reply to this patch when I originally sent it. With -Werror being the default now, it is still needed to make the driver build, please have another look. --- .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 8 ++++---- .../amd/display/dc/dml/dcn20/display_mode_vba_20v2.c | 10 +++++----- .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c index f34bc3c8da41..69c41e3e3ba2 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c @@ -3901,14 +3901,14 @@ void dml20_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine = mode_lib->vba.PixelClock[k] / 2 * (1 + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading / 100.0); - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithoutODMCombine; if (mode_lib->vba.ODMCapability) { if (locals->PlaneRequiredDISPCLKWithoutODMCombine > mode_lib->vba.MaxDispclkRoundedDownToDFSGranularity) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } else if (locals->HActive[k] > DCN20_MAX_420_IMAGE_WIDTH && locals->OutputFormat[k] == dm_420) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } } @@ -3961,7 +3961,7 @@ void dml20_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l locals->RequiredDISPCLK[i][j] = 0.0; locals->DISPCLK_DPPCLK_Support[i][j] = true; for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) { - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled; if (locals->SwathWidthYSingleDPP[k] <= locals->MaximumSwathWidth[k]) { locals->NoOfDPP[i][j][k] = 1; locals->RequiredDPPCLK[i][j][k] = locals->MinDPPCLKUsingSingleDPP[k] diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c index 719949ad49ed..3c8c03496611 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c @@ -4012,17 +4012,17 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine = mode_lib->vba.PixelClock[k] / 2 * (1 + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading / 100.0); - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithoutODMCombine; if (mode_lib->vba.ODMCapability) { if (locals->PlaneRequiredDISPCLKWithoutODMCombine > MaxMaxDispclkRoundedDown) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } else if (locals->DSCEnabled[k] && (locals->HActive[k] > DCN20_MAX_DSC_IMAGE_WIDTH)) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } else if (locals->HActive[k] > DCN20_MAX_420_IMAGE_WIDTH && locals->OutputFormat[k] == dm_420) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } } @@ -4075,7 +4075,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode locals->RequiredDISPCLK[i][j] = 0.0; locals->DISPCLK_DPPCLK_Support[i][j] = true; for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) { - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled; if (locals->SwathWidthYSingleDPP[k] <= locals->MaximumSwathWidth[k]) { locals->NoOfDPP[i][j][k] = 1; locals->RequiredDPPCLK[i][j][k] = locals->MinDPPCLKUsingSingleDPP[k] diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c index ffbe93b4d0c0..971a5af92118 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c @@ -3983,17 +3983,17 @@ void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine = mode_lib->vba.PixelClock[k] / 2 * (1 + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading / 100.0); - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithoutODMCombine; if (mode_lib->vba.ODMCapability) { if (locals->PlaneRequiredDISPCLKWithoutODMCombine > MaxMaxDispclkRoundedDown) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } else if (locals->DSCEnabled[k] && (locals->HActive[k] > DCN21_MAX_DSC_IMAGE_WIDTH)) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } else if (locals->HActive[k] > DCN21_MAX_420_IMAGE_WIDTH && locals->OutputFormat[k] == dm_420) { - locals->ODMCombineEnablePerState[i][k] = true; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_2to1; mode_lib->vba.PlaneRequiredDISPCLK = mode_lib->vba.PlaneRequiredDISPCLKWithODMCombine; } } @@ -4046,7 +4046,7 @@ void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l locals->RequiredDISPCLK[i][j] = 0.0; locals->DISPCLK_DPPCLK_Support[i][j] = true; for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) { - locals->ODMCombineEnablePerState[i][k] = false; + locals->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_disabled; if (locals->SwathWidthYSingleDPP[k] <= locals->MaximumSwathWidth[k]) { locals->NoOfDPP[i][j][k] = 1; locals->RequiredDPPCLK[i][j][k] = locals->MinDPPCLKUsingSingleDPP[k] @@ -5222,7 +5222,7 @@ void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.ODMCombineEnabled[k] = locals->ODMCombineEnablePerState[mode_lib->vba.VoltageLevel][k]; } else { - mode_lib->vba.ODMCombineEnabled[k] = false; + mode_lib->vba.ODMCombineEnabled[k] = dm_odm_combine_mode_disabled; } mode_lib->vba.DSCEnabled[k] = locals->RequiresDSC[mode_lib->vba.VoltageLevel][k]; -- 2.29.2

1 0

[PATCH] drm/gma500: Fix error code in probe()
by Dan Carpenter 27 Sep '21

27 Sep '21

The error code is stored in "dev_priv", not "dev". The "dev" pointer isn't initialized yet. Fixes: c2f17e60cbe1 ("drm/gma500: Embed struct drm_device in struct drm_psb_private") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- drivers/gpu/drm/gma500/psb_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index 3d036d2a3b29..7a10bb39ef0b 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@ -454,7 +454,7 @@ static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) dev_priv = devm_drm_dev_alloc(&pdev->dev, &driver, struct drm_psb_private, dev); if (IS_ERR(dev_priv)) - return PTR_ERR(dev); + return PTR_ERR(dev_priv); dev = &dev_priv->dev; pci_set_drvdata(pdev, dev); -- 2.20.1

3 2

[PATCH 1/4] dma-buf: add dma_fence_describe and dma_resv_describe
by Christian König 27 Sep '21

27 Sep '21

Add functions to dump dma_fence and dma_resv objects into a seq_file and use them for printing the debugfs informations. Signed-off-by: Christian König <christian.koenig(a)amd.com> --- drivers/dma-buf/dma-buf.c | 11 +---------- drivers/dma-buf/dma-fence.c | 16 ++++++++++++++++ drivers/dma-buf/dma-resv.c | 23 +++++++++++++++++++++++ include/linux/dma-fence.h | 1 + include/linux/dma-resv.h | 1 + 5 files changed, 42 insertions(+), 10 deletions(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index d35c71743ccb..4975c9289b02 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -1368,8 +1368,6 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused) { struct dma_buf *buf_obj; struct dma_buf_attachment *attach_obj; - struct dma_resv_iter cursor; - struct dma_fence *fence; int count = 0, attach_count; size_t size = 0; int ret; @@ -1397,14 +1395,7 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused) file_inode(buf_obj->file)->i_ino, buf_obj->name ?: ""); - dma_resv_for_each_fence(&cursor, buf_obj->resv, true, fence) { - seq_printf(s, "\t%s fence: %s %s %ssignalled\n", - dma_resv_iter_is_exclusive(&cursor) ? - "Exclusive" : "Shared", - fence->ops->get_driver_name(fence), - fence->ops->get_timeline_name(fence), - dma_fence_is_signaled(fence) ? "" : "un"); - } + dma_resv_describe(buf_obj->resv, s); seq_puts(s, "\tAttached Devices:\n"); attach_count = 0; diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c index 1e82ecd443fa..5175adf58644 100644 --- a/drivers/dma-buf/dma-fence.c +++ b/drivers/dma-buf/dma-fence.c @@ -907,6 +907,22 @@ dma_fence_wait_any_timeout(struct dma_fence **fences, uint32_t count, } EXPORT_SYMBOL(dma_fence_wait_any_timeout); +/** + * dma_fence_describe - Dump fence describtion into seq_file + * @fence: the 6fence to describe + * @seq: the seq_file to put the textual description into + * + * Dump a textual description of the fence and it's state into the seq_file. + */ +void dma_fence_describe(struct dma_fence *fence, struct seq_file *seq) +{ + seq_printf(seq, "%s %s seq %llu %ssignalled\n", + fence->ops->get_driver_name(fence), + fence->ops->get_timeline_name(fence), fence->seqno, + dma_fence_is_signaled(fence) ? "" : "un"); +} +EXPORT_SYMBOL(dma_fence_describe); + /** * dma_fence_init - Initialize a custom fence. * @fence: the fence to initialize diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c index 266ec9e3caef..6bb25d53e702 100644 --- a/drivers/dma-buf/dma-resv.c +++ b/drivers/dma-buf/dma-resv.c @@ -38,6 +38,7 @@ #include <linux/mm.h> #include <linux/sched/mm.h> #include <linux/mmu_notifier.h> +#include <linux/seq_file.h> /** * DOC: Reservation Object Overview @@ -654,6 +655,28 @@ bool dma_resv_test_signaled(struct dma_resv *obj, bool test_all) } EXPORT_SYMBOL_GPL(dma_resv_test_signaled); +/** + * dma_resv_describe - Dump description of the resv object into seq_file + * @obj: the reservation object + * @seq: the seq_file to dump the description into + * + * Dump a textual description of the fences inside an dma_resv object into the + * seq_file. + */ +void dma_resv_describe(struct dma_resv *obj, struct seq_file *seq) +{ + struct dma_resv_iter cursor; + struct dma_fence *fence; + + dma_resv_for_each_fence(&cursor, obj, true, fence) { + seq_printf(seq, "\t%s fence:", + dma_resv_iter_is_exclusive(&cursor) ? + "Exclusive" : "Shared"); + dma_fence_describe(fence, seq); + } +} +EXPORT_SYMBOL_GPL(dma_resv_describe); + #if IS_ENABLED(CONFIG_LOCKDEP) static int __init dma_resv_lockdep(void) { diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h index a706b7bf51d7..1ea691753bd3 100644 --- a/include/linux/dma-fence.h +++ b/include/linux/dma-fence.h @@ -264,6 +264,7 @@ void dma_fence_init(struct dma_fence *fence, const struct dma_fence_ops *ops, void dma_fence_release(struct kref *kref); void dma_fence_free(struct dma_fence *fence); +void dma_fence_describe(struct dma_fence *fence, struct seq_file *seq); /** * dma_fence_put - decreases refcount of the fence diff --git a/include/linux/dma-resv.h b/include/linux/dma-resv.h index d4b4cd43f0f1..49c0152073fd 100644 --- a/include/linux/dma-resv.h +++ b/include/linux/dma-resv.h @@ -486,5 +486,6 @@ int dma_resv_copy_fences(struct dma_resv *dst, struct dma_resv *src); long dma_resv_wait_timeout(struct dma_resv *obj, bool wait_all, bool intr, unsigned long timeout); bool dma_resv_test_signaled(struct dma_resv *obj, bool test_all); +void dma_resv_describe(struct dma_resv *obj, struct seq_file *seq); #endif /* _LINUX_RESERVATION_H */ -- 2.25.1

2 5

[PATCH 0/2] drm/vc4: hdmi: Get rid of encoder->crtc, take 2
by Maxime Ripard 26 Sep '21

26 Sep '21

Hi, Following the report from Sudip Mukherjee, the previous version of that patch got reverted until a fix was found. While it's not clear yet why we end up in that situation, the culprit is that the original patch in its ASoC prepare hook was calling the vc4_hdmi_set_n_cts function that in turned relied on the connector->state->crtc pointer being non-NULL. However, no particular caution was being done to make sure that was the case, eventually leading to a NULL pointer dereference under the "right" circumstances. We did however had some checks for the pointers sanity in the original patch, but they were only enforced when the device was opened, and we were only checking for the connector->state pointer. The fix is then two-fold: First, we check that we can actually perform audio operations in both startup and prepare, since the situation could have changed between the time the device was opened and the time when we actually start streaming. Then, the encoder->crtc conversion patch has been changed to check on connector->state->crtc as well in that sanity check to avoid dereferencing it if it's NULL. Let me know what you think, Maxime Maxime Ripard (2): drm/vc4: hdmi: Check the device state in prepare() drm/vc4: hdmi: Remove drm_encoder->crtc usage drivers/gpu/drm/vc4/vc4_hdmi.c | 75 ++++++++++++++++++++++++++-------- 1 file changed, 57 insertions(+), 18 deletions(-) -- 2.31.1

2 4

Re: [PATCH] drm/msm/mdp5: fix cursor-related warnings
by Yassine Oudjana 26 Sep '21

26 Sep '21

On Sat, 2021-09-25 at 22:28 +0300, Dmitry Baryshkov wrote: > Since f35a2a99100f ("drm/encoder: make encoder control functions > optional") drm_mode_config_validate would print warnings if both cursor > plane and cursor functions are provided. Restore separate set of > drm_crtc_funcs to be used if separate cursor plane is provided. > > [ 6.556046] ------------[ cut here ]------------ > [ 6.556071] [CRTC:93:crtc-0] must not have both a cursor plane and a cursor_set func > [ 6.556091] WARNING: CPU: 1 PID: 76 at drivers/gpu/drm/drm_mode_config.c:648 drm_mode_config_validate+0x238/0x4d0 > [ 6.567453] Modules linked in: > [ 6.577604] CPU: 1 PID: 76 Comm: kworker/u8:2 Not tainted 5.15.0-rc1-dirty #43 > [ 6.580557] Hardware name: Qualcomm Technologies, Inc. DB820c (DT) > [ 6.587763] Workqueue: events_unbound deferred_probe_work_func > [ 6.593926] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) > [ 6.599740] pc : drm_mode_config_validate+0x238/0x4d0 > [ 6.606596] lr : drm_mode_config_validate+0x238/0x4d0 > [ 6.611804] sp : ffff8000121b3980 > [ 6.616838] x29: ffff8000121b3990 x28: 0000000000000000 x27: 0000000000000001 > [ 6.620140] x26: ffff8000114cde50 x25: ffff8000114cdd40 x24: ffff0000987282d8 > [ 6.627258] x23: 0000000000000000 x22: 0000000000000000 x21: 0000000000000001 > [ 6.634376] x20: ffff000098728000 x19: ffff000080a39000 x18: ffffffffffffffff > [ 6.641494] x17: 3136564e3631564e x16: 0000000000000324 x15: ffff800011c78709 > [ 6.648613] x14: 0000000000000000 x13: ffff800011a22850 x12: 00000000000009ab > [ 6.655730] x11: 0000000000000339 x10: ffff800011a22850 x9 : ffff800011a22850 > [ 6.662848] x8 : 00000000ffffefff x7 : ffff800011a7a850 x6 : ffff800011a7a850 > [ 6.669966] x5 : 000000000000bff4 x4 : 40000000fffff339 x3 : 0000000000000000 > [ 6.677084] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff00008093b800 > [ 6.684205] Call trace: > [ 6.691319] drm_mode_config_validate+0x238/0x4d0 > [ 6.693577] drm_dev_register+0x17c/0x210 > [ 6.698435] msm_drm_bind+0x4b4/0x694 > [ 6.702429] try_to_bring_up_master+0x164/0x1d0 > [ 6.706075] __component_add+0xa0/0x170 > [ 6.710415] component_add+0x14/0x20 > [ 6.714234] msm_hdmi_dev_probe+0x1c/0x2c > [ 6.718053] platform_probe+0x68/0xe0 > [ 6.721959] really_probe.part.0+0x9c/0x30c > [ 6.725606] __driver_probe_device+0x98/0x144 > [ 6.729600] driver_probe_device+0xc8/0x15c > [ 6.734114] __device_attach_driver+0xb4/0x120 > [ 6.738106] bus_for_each_drv+0x78/0xd0 > [ 6.742619] __device_attach+0xdc/0x184 > [ 6.746351] device_initial_probe+0x14/0x20 > [ 6.750172] bus_probe_device+0x9c/0xa4 > [ 6.754337] deferred_probe_work_func+0x88/0xc0 > [ 6.758158] process_one_work+0x1d0/0x370 > [ 6.762671] worker_thread+0x2c8/0x470 > [ 6.766839] kthread+0x15c/0x170 > [ 6.770483] ret_from_fork+0x10/0x20 > [ 6.773870] ---[ end trace 5884eb76cd26d274 ]--- > [ 6.777500] ------------[ cut here ]------------ > [ 6.782043] [CRTC:93:crtc-0] must not have both a cursor plane and a cursor_move func > [ 6.782063] WARNING: CPU: 1 PID: 76 at drivers/gpu/drm/drm_mode_config.c:654 drm_mode_config_validate+0x290/0x4d0 > [ 6.794362] Modules linked in: > [ 6.804600] CPU: 1 PID: 76 Comm: kworker/u8:2 Tainted: G W 5.15.0-rc1-dirty #43 > [ 6.807555] Hardware name: Qualcomm Technologies, Inc. DB820c (DT) > [ 6.816148] Workqueue: events_unbound deferred_probe_work_func > [ 6.822311] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) > [ 6.828126] pc : drm_mode_config_validate+0x290/0x4d0 > [ 6.834981] lr : drm_mode_config_validate+0x290/0x4d0 > [ 6.840189] sp : ffff8000121b3980 > [ 6.845223] x29: ffff8000121b3990 x28: 0000000000000000 x27: 0000000000000001 > [ 6.848525] x26: ffff8000114cde50 x25: ffff8000114cdd40 x24: ffff0000987282d8 > [ 6.855643] x23: 0000000000000000 x22: 0000000000000000 x21: 0000000000000001 > [ 6.862763] x20: ffff000098728000 x19: ffff000080a39000 x18: ffffffffffffffff > [ 6.869879] x17: 3136564e3631564e x16: 0000000000000324 x15: ffff800011c790c2 > [ 6.876998] x14: 0000000000000000 x13: ffff800011a22850 x12: 0000000000000a2f > [ 6.884116] x11: 0000000000000365 x10: ffff800011a22850 x9 : ffff800011a22850 > [ 6.891234] x8 : 00000000ffffefff x7 : ffff800011a7a850 x6 : ffff800011a7a850 > [ 6.898351] x5 : 000000000000bff4 x4 : 40000000fffff365 x3 : 0000000000000000 > [ 6.905470] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff00008093b800 > [ 6.912590] Call trace: > [ 6.919702] drm_mode_config_validate+0x290/0x4d0 > [ 6.921960] drm_dev_register+0x17c/0x210 > [ 6.926821] msm_drm_bind+0x4b4/0x694 > [ 6.930813] try_to_bring_up_master+0x164/0x1d0 > [ 6.934459] __component_add+0xa0/0x170 > [ 6.938799] component_add+0x14/0x20 > [ 6.942619] msm_hdmi_dev_probe+0x1c/0x2c > [ 6.946438] platform_probe+0x68/0xe0 > [ 6.950345] really_probe.part.0+0x9c/0x30c > [ 6.953991] __driver_probe_device+0x98/0x144 > [ 6.957984] driver_probe_device+0xc8/0x15c > [ 6.962498] __device_attach_driver+0xb4/0x120 > [ 6.966492] bus_for_each_drv+0x78/0xd0 > [ 6.971004] __device_attach+0xdc/0x184 > [ 6.974737] device_initial_probe+0x14/0x20 > [ 6.978556] bus_probe_device+0x9c/0xa4 > [ 6.982722] deferred_probe_work_func+0x88/0xc0 > [ 6.986543] process_one_work+0x1d0/0x370 > [ 6.991057] worker_thread+0x2c8/0x470 > [ 6.995223] kthread+0x15c/0x170 > [ 6.998869] ret_from_fork+0x10/0x20 > [ 7.002255] ---[ end trace 5884eb76cd26d275 ]--- > > Fixes: aa649e875daf ("drm/msm/mdp5: mdp5_crtc: Restore cursor state only if LM cursors are enabled") > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> > --- > drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c > index f482e0911d03..bb7d066618e6 100644 > --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c > +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c > @@ -1125,6 +1125,20 @@ static void mdp5_crtc_reset(struct drm_crtc *crtc) > __drm_atomic_helper_crtc_reset(crtc, &mdp5_cstate->base); > } > > +static const struct drm_crtc_funcs mdp5_crtc_no_lm_cursor_funcs = { > + .set_config = drm_atomic_helper_set_config, > + .destroy = mdp5_crtc_destroy, > + .page_flip = drm_atomic_helper_page_flip, > + .reset = mdp5_crtc_reset, > + .atomic_duplicate_state = mdp5_crtc_duplicate_state, > + .atomic_destroy_state = mdp5_crtc_destroy_state, > + .atomic_print_state = mdp5_crtc_atomic_print_state, > + .get_vblank_counter = mdp5_crtc_get_vblank_counter, > + .enable_vblank = msm_crtc_enable_vblank, > + .disable_vblank = msm_crtc_disable_vblank, > + .get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp, > +}; > + > static const struct drm_crtc_funcs mdp5_crtc_funcs = { > .set_config = drm_atomic_helper_set_config, > .destroy = mdp5_crtc_destroy, > @@ -1313,6 +1327,8 @@ struct drm_crtc *mdp5_crtc_init(struct drm_device *dev, > mdp5_crtc->lm_cursor_enabled = cursor_plane ? false : true; > > drm_crtc_init_with_planes(dev, crtc, plane, cursor_plane, > + cursor_plane ? > + &mdp5_crtc_no_lm_cursor_funcs : > &mdp5_crtc_funcs, NULL); > > drm_flip_work_init(&mdp5_crtc->unref_cursor_work, On msm8996-xiaomi-scorpio: Tested-by: Yassine Oudjana <y.oudjana(a)protonmail.com>

1 0

[PATCH V6 00/12] PCI/VGA: Rework default VGA device selection
by Huacai Chen 26 Sep '21

26 Sep '21

My original work is at [1]. Current default VGA device selection fails in some cases: - On BMC system, the AST2500 bridge [1a03:1150] does not implement PCI_BRIDGE_CTL_VGA [1]. This is perfectly legal but means the legacy VGA resources won't reach downstream devices unless they're included in the usual bridge windows. - vga_arb_select_default_device() will set a device below such a bridge as the default VGA device as long as it has PCI_COMMAND_IO and PCI_COMMAND_MEMORY enabled. - vga_arbiter_add_pci_device() is called for every VGA device, either at boot-time or at hot-add time, and it will also set the device as the default VGA device, but ONLY if all bridges leading to it implement PCI_BRIDGE_CTL_VGA. - This difference between vga_arb_select_default_device() and vga_arbiter_add_pci_device() means that a device below an AST2500 or similar bridge can only be set as the default if it is enumerated before vga_arb_device_init(). - On ACPI-based systems, PCI devices are enumerated by acpi_init(), which runs before vga_arb_device_init(). - On non-ACPI systems, like on MIPS system, they are enumerated by pcibios_init(), which typically runs *after* vga_arb_device_init(). So I made vga_arb_update_default_device() to replace the current vga_ arb_select_default_device(), which will be call from vga_arbiter_add_ pci_device(), set the default device even if it does not own the VGA resources because an upstream bridge doesn't implement PCI_BRIDGE_CTL_ VGA. And the default VGA device is updated if a better one is found (device with legacy resources enabled is better, device owns the firmware framebuffer is even better). Bjorn do some rework and extension in V2. It moves the VGA arbiter to the PCI subsystem, fixes a few nits, and breaks a few pieces to make the main patch a little smaller. V3 rewrite the commit log of the last patch (which is also summarized by Bjorn). V4 split the last patch to two steps. V5 split Patch-9 again and sort the patches. V5 split Patch-5 again and sort the patches again. All comments welcome! [1] https://lore.kernel.org/dri-devel/20210705100503.1120643-1-chenhuacai@loong… Huacai Chen (8): PCI/VGA: Prefer vga_default_device() PCI/VGA: Move vga_arb_integrated_gpu() earlier in file PCI/VGA: Split out vga_arb_update_default_device() PCI/VGA: Prefer VGA device with legacy I/O enabled PCI/VGA: Prefer VGA device belongs to integrated GPU PCI/VGA: Prefer VGA device owns the firmware framebuffer PCI/VGA: Remove vga_arb_select_default_device() PCI/VGA: Log bridge control messages when adding devices Bjorn Helgaas (4): PCI/VGA: Remove empty vga_arb_device_card_gone() PCI/VGA: Use unsigned format string to print lock counts PCI/VGA: Replace full MIT license text with SPDX identifier PCI/VGA: Move vgaarb to drivers/pci Signed-off-by: Huacai Chen <chenhuacai(a)loongson.cn> Signed-off-by: Bjorn Helgaas <bhelgaas(a)google.com> --- drivers/gpu/vga/Kconfig | 19 --- drivers/gpu/vga/Makefile | 1 - drivers/pci/Kconfig | 19 +++ drivers/pci/Makefile | 1 + drivers/{gpu/vga => pci}/vgaarb.c | 269 ++++++++++++------------------ 5 files changed, 126 insertions(+), 183 deletions(-) rename drivers/{gpu/vga => pci}/vgaarb.c (90%) -- 2.27.0

2 13

[PATCH] video: fbdev: pxa168fb: Initialize pointers with NULL and not plain integer 0
by Colin King 25 Sep '21

25 Sep '21

From: Colin Ian King <colin.king(a)canonical.com> Pointers info and fbi are being initialized with plain integer zeros. Fix this by initializing them with NULLs. Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- drivers/video/fbdev/pxa168fb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/pxa168fb.c b/drivers/video/fbdev/pxa168fb.c index 47e6a1d0d229..461fedf9bf24 100644 --- a/drivers/video/fbdev/pxa168fb.c +++ b/drivers/video/fbdev/pxa168fb.c @@ -593,8 +593,8 @@ static void pxa168fb_init_mode(struct fb_info *info, static int pxa168fb_probe(struct platform_device *pdev) { struct pxa168fb_mach_info *mi; - struct fb_info *info = 0; - struct pxa168fb_info *fbi = 0; + struct fb_info *info = NULL; + struct pxa168fb_info *fbi = NULL; struct resource *res; struct clk *clk; int irq, ret; -- 2.32.0

1 0

[PATCH] drm/i915/gt: return NULL rather than a plain 0 integer
by Colin King 25 Sep '21

25 Sep '21

From: Colin Ian King <colin.king(a)canonical.com> Function gen7_ctx_vma returns a pointer to struct i915_vma, so returning a plain 0 integer isn't good practice. Fix this by returning a NULL instead. Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c index 2958e2fae380..3c65efcb7bed 100644 --- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c +++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c @@ -1265,7 +1265,7 @@ static struct i915_vma *gen7_ctx_vma(struct intel_engine_cs *engine) int size, err; if (GRAPHICS_VER(engine->i915) != 7 || engine->class != RENDER_CLASS) - return 0; + return NULL; err = gen7_ctx_switch_bb_setup(engine, NULL /* probe size */); if (err < 0) -- 2.32.0

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel September 2021