dri-devel September 2019

dri-devel@lists.freedesktop.org

315 participants
2278 discussions

[PATCH] drm/bridge: sii902x: Variable status in sii902x_connector_detect() could be uninitialized if regmap_read() fails
by Yizhuo 04 Oct '19

04 Oct '19

In function sii902x_connector_detect(), variable "status" could be initialized if regmap_read() fails. However, "status" is used to decide the return value, which is potentially unsafe. Signed-off-by: Yizhuo <yzhai003(a)ucr.edu> --- drivers/gpu/drm/bridge/sii902x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c index 38f75ac580df..afce64f51ff2 100644 --- a/drivers/gpu/drm/bridge/sii902x.c +++ b/drivers/gpu/drm/bridge/sii902x.c @@ -246,7 +246,7 @@ static enum drm_connector_status sii902x_connector_detect(struct drm_connector *connector, bool force) { struct sii902x *sii902x = connector_to_sii902x(connector); - unsigned int status; + unsigned int status = 0; mutex_lock(&sii902x->mutex); -- 2.17.1

2 1

[PATCH] drm/komeda: Adds more check in mode_valid
by Lowry Li (Arm Technology China) 03 Oct '19

03 Oct '19

This patch adds the checks for vrefresh, crtc_hdisplay and crtc_vdisplay. Signed-off-by: Lowry Li (Arm Technology China) <lowry.li(a)arm.com> --- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 28 +++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c index 2fed1f6..017f6b6 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -403,11 +403,37 @@ unsigned long komeda_crtc_get_aclk(struct komeda_crtc_state *kcrtc_st) struct komeda_dev *mdev = crtc->dev->dev_private; struct komeda_crtc *kcrtc = to_kcrtc(crtc); struct komeda_pipeline *master = kcrtc->master; - unsigned long min_pxlclk, min_aclk; + struct komeda_compiz *compiz = master->compiz; + unsigned long min_pxlclk, min_aclk, delta, full_frame; + int hdisplay = m->hdisplay; if (m->flags & DRM_MODE_FLAG_INTERLACE) return MODE_NO_INTERLACE; + full_frame = m->htotal * m->vtotal; + delta = abs(m->clock * 1000 - m->vrefresh * full_frame); + if (m->vrefresh && (delta > full_frame)) { + DRM_DEBUG_ATOMIC("mode clock check error!\n"); + return MODE_CLOCK_RANGE; + } + + if (kcrtc->side_by_side) + hdisplay /= 2; + + if (!in_range(&compiz->hsize, hdisplay)) { + DRM_DEBUG_ATOMIC("hdisplay[%u] is out of range[%u, %u]!\n", + hdisplay, compiz->hsize.start, + compiz->hsize.end); + return MODE_BAD_HVALUE; + } + + if (!in_range(&compiz->vsize, m->vdisplay)) { + DRM_DEBUG_ATOMIC("vdisplay[%u] is out of range[%u, %u]!\n", + m->vdisplay, compiz->vsize.start, + compiz->vsize.end); + return MODE_BAD_VVALUE; + } + min_pxlclk = m->clock * 1000; if (master->dual_link) min_pxlclk /= 2; -- 1.9.1

2 1

[PATCH 1/2] dma-fence: Serialise signal enabling (dma_fence_enable_sw_signaling)
by Chris Wilson 03 Oct '19

03 Oct '19

Make dma_fence_enable_sw_signaling() behave like its dma_fence_add_callback() and dma_fence_default_wait() counterparts and perform the test to enable signaling under the fence->lock, along with the action to do so. This ensure that should an implementation be trying to flush the cb_list (by signaling) on retirement before freeing the fence, it can do so in a race-free manner. See also 0fc89b6802ba ("dma-fence: Simply wrap dma_fence_signal_locked with dma_fence_signal"). Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> --- drivers/dma-buf/dma-fence.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c index 2c136aee3e79..587727089134 100644 --- a/drivers/dma-buf/dma-fence.c +++ b/drivers/dma-buf/dma-fence.c @@ -285,19 +285,18 @@ void dma_fence_enable_sw_signaling(struct dma_fence *fence) { unsigned long flags; + if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) + return; + + spin_lock_irqsave(fence->lock, flags); if (!test_and_set_bit(DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT, &fence->flags) && - !test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags) && fence->ops->enable_signaling) { trace_dma_fence_enable_signal(fence); - - spin_lock_irqsave(fence->lock, flags); - if (!fence->ops->enable_signaling(fence)) dma_fence_signal_locked(fence); - - spin_unlock_irqrestore(fence->lock, flags); } + spin_unlock_irqrestore(fence->lock, flags); } EXPORT_SYMBOL(dma_fence_enable_sw_signaling); -- 2.23.0

3 6

[PATCH v2] drm/fourcc: Add Arm 16x16 block modifier
by Ayan Halder 03 Oct '19

03 Oct '19

Add the DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED modifier to denote the 16x16 block u-interleaved format used in Arm Utgard and Midgard GPUs. Changes from v1:- 1. Reserved the upper four bits (out of the 56 bits assigned to each vendor) to denote the category of Arm specific modifiers. Currently, we have two categories ie AFBC and MISC. Signed-off-by: Raymond Smith <raymond.smith(a)arm.com> Signed-off-by: Ayan kumar halder <ayan.halder(a)arm.com> --- include/uapi/drm/drm_fourcc.h | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h index 3feeaa3f987a..b1d3de961109 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -648,7 +648,21 @@ extern "C" { * Further information on the use of AFBC modifiers can be found in * Documentation/gpu/afbc.rst */ -#define DRM_FORMAT_MOD_ARM_AFBC(__afbc_mode) fourcc_mod_code(ARM, __afbc_mode) + +/* + * The top 4 bits (out of the 56 bits alloted for specifying vendor specific + * modifiers) denote the category for modifiers. Currently we have only two + * categories of modifiers ie AFBC and MISC. We can have a maximum of sixteen + * different categories. + */ +#define DRM_FORMAT_MOD_ARM_CODE(type, val) \ + fourcc_mod_code(ARM, ((__u64)type << 52) | ((val) & 0x000fffffffffffffULL)) + +#define DRM_FORMAT_MOD_ARM_TYPE_AFBC 0x00 +#define DRM_FORMAT_MOD_ARM_TYPE_MISC 0x01 + +#define DRM_FORMAT_MOD_ARM_AFBC(__afbc_mode) \ + DRM_FORMAT_MOD_ARM_CODE(DRM_FORMAT_MOD_ARM_TYPE_AFBC, __afbc_mode) /* * AFBC superblock size @@ -742,6 +756,17 @@ extern "C" { */ #define AFBC_FORMAT_MOD_BCH (1ULL << 11) +/* + * Arm 16x16 Block U-Interleaved modifier + * + * This is used by Arm Mali Utgard and Midgard GPUs. It divides the image + * into 16x16 pixel blocks. Blocks are stored linearly in order, but pixels + * in the block are reordered. + */ +#define DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED \ + DRM_FORMAT_MOD_ARM_CODE(DRM_FORMAT_MOD_ARM_TYPE_MISC, 1ULL) + + /* * Allwinner tiled modifier * -- 2.23.0

3 3

[PATCH] drm: sun8i-ui/vi: Fix layer zpos change/atomic modesetting
by megous＠megous.com 03 Oct '19

03 Oct '19

From: Ondrej Jirman <megous(a)megous.com> There are various issues that this re-work of sun8i_[uv]i_layer_enable function fixes: - Make sure that we re-initialize zpos on reset - Minimize register updates by doing them only when state changes - Fix issue where DE pipe might get disabled even if it is no longer used by the layer that's currently calling sun8i_ui_layer_enable - .atomic_disable callback is not really needed because .atomic_update can do the disable too, so drop the duplicate code Signed-off-by: Ondrej Jirman <megous(a)megous.com> --- drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 112 ++++++++++++++++--------- drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 112 ++++++++++++++++--------- 2 files changed, 142 insertions(+), 82 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c index dd2a1c851939..b88e8ac5ad1c 100644 --- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c +++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c @@ -24,10 +24,11 @@ #include "sun8i_ui_scaler.h" static void sun8i_ui_layer_enable(struct sun8i_mixer *mixer, int channel, - int overlay, bool enable, unsigned int zpos, - unsigned int old_zpos) + int overlay, bool was_enabled, bool enable, + unsigned int zpos, unsigned int old_zpos) { u32 val, bld_base, ch_base; + unsigned int old_pipe_ch; bld_base = sun8i_blender_base(mixer); ch_base = sun8i_channel_base(mixer, channel); @@ -35,28 +36,57 @@ static void sun8i_ui_layer_enable(struct sun8i_mixer *mixer, int channel, DRM_DEBUG_DRIVER("%sabling channel %d overlay %d\n", enable ? "En" : "Dis", channel, overlay); - if (enable) - val = SUN8I_MIXER_CHAN_UI_LAYER_ATTR_EN; - else - val = 0; + if (!was_enabled != !enable) { + val = enable ? SUN8I_MIXER_CHAN_UI_LAYER_ATTR_EN : 0; - regmap_update_bits(mixer->engine.regs, - SUN8I_MIXER_CHAN_UI_LAYER_ATTR(ch_base, overlay), - SUN8I_MIXER_CHAN_UI_LAYER_ATTR_EN, val); - - if (!enable || zpos != old_zpos) { regmap_update_bits(mixer->engine.regs, - SUN8I_MIXER_BLEND_PIPE_CTL(bld_base), - SUN8I_MIXER_BLEND_PIPE_CTL_EN(old_zpos), - 0); + SUN8I_MIXER_CHAN_UI_LAYER_ATTR(ch_base, overlay), + SUN8I_MIXER_CHAN_UI_LAYER_ATTR_EN, val); + } - regmap_update_bits(mixer->engine.regs, + /* + * If this layer was enabled and is being disabled or if it is + * enabled and just changing zpos, clear the old route, if it is + * still configured to this layer in HW. + */ + if ((was_enabled && !enable) || (enable && zpos != old_zpos)) { + /* get channel the pipe for old_zpos is routed to from the HW */ + regmap_read(mixer->engine.regs, SUN8I_MIXER_BLEND_ROUTE(bld_base), - SUN8I_MIXER_BLEND_ROUTE_PIPE_MSK(old_zpos), - 0); + &old_pipe_ch); + old_pipe_ch &= SUN8I_MIXER_BLEND_ROUTE_PIPE_MSK(old_zpos); + old_pipe_ch >>= SUN8I_MIXER_BLEND_ROUTE_PIPE_SHIFT(old_zpos); + + /* + * Check that pipe for old_zpos is still routed to our layer, + * and clear/disable it if it is. + */ + + if (old_pipe_ch == channel) { + DRM_DEBUG_DRIVER("chan=%d en=%d->%d zpos=%d->%d\n", + channel, was_enabled, enable, old_zpos, zpos); + + DRM_DEBUG_DRIVER(" disable pipe %d\n", old_zpos); + + regmap_update_bits(mixer->engine.regs, + SUN8I_MIXER_BLEND_ROUTE(bld_base), + SUN8I_MIXER_BLEND_ROUTE_PIPE_MSK(old_zpos), + 0); + + regmap_update_bits(mixer->engine.regs, + SUN8I_MIXER_BLEND_PIPE_CTL(bld_base), + SUN8I_MIXER_BLEND_PIPE_CTL_EN(old_zpos), + 0); + } } - if (enable) { + /* + * If enabling this layer or changin zpos, set route to this layer. + */ + if ((enable && !was_enabled) || (enable && zpos != old_zpos)) { + DRM_DEBUG_DRIVER("chan=%d en=%d->%d zpos=%d->%d\n", + channel, was_enabled, enable, old_zpos, zpos); + val = SUN8I_MIXER_BLEND_PIPE_CTL_EN(zpos); regmap_update_bits(mixer->engine.regs, @@ -69,6 +99,8 @@ static void sun8i_ui_layer_enable(struct sun8i_mixer *mixer, int channel, SUN8I_MIXER_BLEND_ROUTE(bld_base), SUN8I_MIXER_BLEND_ROUTE_PIPE_MSK(zpos), val); + + DRM_DEBUG_DRIVER(" enable pipe %d <- ch %d\n", zpos, channel); } } @@ -261,45 +293,43 @@ static int sun8i_ui_layer_atomic_check(struct drm_plane *plane, true, true); } -static void sun8i_ui_layer_atomic_disable(struct drm_plane *plane, - struct drm_plane_state *old_state) +static void sun8i_ui_layer_atomic_update(struct drm_plane *plane, + struct drm_plane_state *old_state) { struct sun8i_ui_layer *layer = plane_to_sun8i_ui_layer(plane); + unsigned int zpos = plane->state->normalized_zpos; unsigned int old_zpos = old_state->normalized_zpos; struct sun8i_mixer *mixer = layer->mixer; + bool was_enabled = old_state->crtc && old_state->visible; + bool enable = plane->state->crtc && plane->state->visible; - sun8i_ui_layer_enable(mixer, layer->channel, layer->overlay, false, 0, - old_zpos); + if (enable) { + sun8i_ui_layer_update_coord(mixer, layer->channel, + layer->overlay, plane, zpos); + sun8i_ui_layer_update_formats(mixer, layer->channel, + layer->overlay, plane); + sun8i_ui_layer_update_buffer(mixer, layer->channel, + layer->overlay, plane); + } + + sun8i_ui_layer_enable(mixer, layer->channel, layer->overlay, + was_enabled, enable, zpos, old_zpos); } -static void sun8i_ui_layer_atomic_update(struct drm_plane *plane, - struct drm_plane_state *old_state) +void sun8i_ui_layer_plane_reset(struct drm_plane *plane) { struct sun8i_ui_layer *layer = plane_to_sun8i_ui_layer(plane); - unsigned int zpos = plane->state->normalized_zpos; - unsigned int old_zpos = old_state->normalized_zpos; - struct sun8i_mixer *mixer = layer->mixer; - if (!plane->state->visible) { - sun8i_ui_layer_enable(mixer, layer->channel, - layer->overlay, false, 0, old_zpos); + drm_atomic_helper_plane_reset(plane); + if (!plane->state) return; - } - sun8i_ui_layer_update_coord(mixer, layer->channel, - layer->overlay, plane, zpos); - sun8i_ui_layer_update_formats(mixer, layer->channel, - layer->overlay, plane); - sun8i_ui_layer_update_buffer(mixer, layer->channel, - layer->overlay, plane); - sun8i_ui_layer_enable(mixer, layer->channel, layer->overlay, - true, zpos, old_zpos); + plane->state->zpos = layer->channel; } static struct drm_plane_helper_funcs sun8i_ui_layer_helper_funcs = { .prepare_fb = drm_gem_fb_prepare_fb, .atomic_check = sun8i_ui_layer_atomic_check, - .atomic_disable = sun8i_ui_layer_atomic_disable, .atomic_update = sun8i_ui_layer_atomic_update, }; @@ -308,7 +338,7 @@ static const struct drm_plane_funcs sun8i_ui_layer_funcs = { .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, .destroy = drm_plane_cleanup, .disable_plane = drm_atomic_helper_disable_plane, - .reset = drm_atomic_helper_plane_reset, + .reset = sun8i_ui_layer_plane_reset, .update_plane = drm_atomic_helper_update_plane, }; diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c index bd0e6a52d1d8..675ebcdac00b 100644 --- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c +++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c @@ -18,10 +18,11 @@ #include "sun8i_vi_scaler.h" static void sun8i_vi_layer_enable(struct sun8i_mixer *mixer, int channel, - int overlay, bool enable, unsigned int zpos, - unsigned int old_zpos) + int overlay, bool was_enabled, bool enable, + unsigned int zpos, unsigned int old_zpos) { u32 val, bld_base, ch_base; + unsigned int old_pipe_ch; bld_base = sun8i_blender_base(mixer); ch_base = sun8i_channel_base(mixer, channel); @@ -29,28 +30,57 @@ static void sun8i_vi_layer_enable(struct sun8i_mixer *mixer, int channel, DRM_DEBUG_DRIVER("%sabling VI channel %d overlay %d\n", enable ? "En" : "Dis", channel, overlay); - if (enable) - val = SUN8I_MIXER_CHAN_VI_LAYER_ATTR_EN; - else - val = 0; - - regmap_update_bits(mixer->engine.regs, - SUN8I_MIXER_CHAN_VI_LAYER_ATTR(ch_base, overlay), - SUN8I_MIXER_CHAN_VI_LAYER_ATTR_EN, val); + if (!was_enabled != !enable) { + val = enable ? SUN8I_MIXER_CHAN_VI_LAYER_ATTR_EN : 0; - if (!enable || zpos != old_zpos) { regmap_update_bits(mixer->engine.regs, - SUN8I_MIXER_BLEND_PIPE_CTL(bld_base), - SUN8I_MIXER_BLEND_PIPE_CTL_EN(old_zpos), - 0); + SUN8I_MIXER_CHAN_VI_LAYER_ATTR(ch_base, overlay), + SUN8I_MIXER_CHAN_VI_LAYER_ATTR_EN, val); + } - regmap_update_bits(mixer->engine.regs, + /* + * If this layer was enabled and is being disabled or if it is + * enabled and just changing zpos, clear the old route, if it is + * still configured to this layer in HW. + */ + if ((was_enabled && !enable) || (enable && zpos != old_zpos)) { + /* get channel the pipe for old_zpos is routed to from the HW */ + regmap_read(mixer->engine.regs, SUN8I_MIXER_BLEND_ROUTE(bld_base), - SUN8I_MIXER_BLEND_ROUTE_PIPE_MSK(old_zpos), - 0); + &old_pipe_ch); + old_pipe_ch &= SUN8I_MIXER_BLEND_ROUTE_PIPE_MSK(old_zpos); + old_pipe_ch >>= SUN8I_MIXER_BLEND_ROUTE_PIPE_SHIFT(old_zpos); + + /* + * Check that pipe for old_zpos is still routed to our layer, + * and clear/disable it if it is. + */ + + if (old_pipe_ch == channel) { + DRM_DEBUG_DRIVER("chan=%d en=%d->%d zpos=%d->%d\n", + channel, was_enabled, enable, old_zpos, zpos); + + DRM_DEBUG_DRIVER(" disable pipe %d\n", old_zpos); + + regmap_update_bits(mixer->engine.regs, + SUN8I_MIXER_BLEND_ROUTE(bld_base), + SUN8I_MIXER_BLEND_ROUTE_PIPE_MSK(old_zpos), + 0); + + regmap_update_bits(mixer->engine.regs, + SUN8I_MIXER_BLEND_PIPE_CTL(bld_base), + SUN8I_MIXER_BLEND_PIPE_CTL_EN(old_zpos), + 0); + } } - if (enable) { + /* + * If enabling this layer or changin zpos, set route to this layer. + */ + if ((enable && !was_enabled) || (enable && zpos != old_zpos)) { + DRM_DEBUG_DRIVER("chan=%d en=%d->%d zpos=%d->%d\n", + channel, was_enabled, enable, old_zpos, zpos); + val = SUN8I_MIXER_BLEND_PIPE_CTL_EN(zpos); regmap_update_bits(mixer->engine.regs, @@ -63,6 +93,8 @@ static void sun8i_vi_layer_enable(struct sun8i_mixer *mixer, int channel, SUN8I_MIXER_BLEND_ROUTE(bld_base), SUN8I_MIXER_BLEND_ROUTE_PIPE_MSK(zpos), val); + + DRM_DEBUG_DRIVER(" enable pipe %d <- ch %d\n", zpos, channel); } } @@ -345,45 +377,43 @@ static int sun8i_vi_layer_atomic_check(struct drm_plane *plane, true, true); } -static void sun8i_vi_layer_atomic_disable(struct drm_plane *plane, - struct drm_plane_state *old_state) +static void sun8i_vi_layer_atomic_update(struct drm_plane *plane, + struct drm_plane_state *old_state) { struct sun8i_vi_layer *layer = plane_to_sun8i_vi_layer(plane); + unsigned int zpos = plane->state->normalized_zpos; unsigned int old_zpos = old_state->normalized_zpos; struct sun8i_mixer *mixer = layer->mixer; + bool was_enabled = old_state->crtc && old_state->visible; + bool enable = plane->state->crtc && plane->state->visible; - sun8i_vi_layer_enable(mixer, layer->channel, layer->overlay, false, 0, - old_zpos); + if (enable) { + sun8i_vi_layer_update_coord(mixer, layer->channel, + layer->overlay, plane, zpos); + sun8i_vi_layer_update_formats(mixer, layer->channel, + layer->overlay, plane); + sun8i_vi_layer_update_buffer(mixer, layer->channel, + layer->overlay, plane); + } + + sun8i_vi_layer_enable(mixer, layer->channel, layer->overlay, + was_enabled, enable, zpos, old_zpos); } -static void sun8i_vi_layer_atomic_update(struct drm_plane *plane, - struct drm_plane_state *old_state) +void sun8i_vi_layer_plane_reset(struct drm_plane *plane) { struct sun8i_vi_layer *layer = plane_to_sun8i_vi_layer(plane); - unsigned int zpos = plane->state->normalized_zpos; - unsigned int old_zpos = old_state->normalized_zpos; - struct sun8i_mixer *mixer = layer->mixer; - if (!plane->state->visible) { - sun8i_vi_layer_enable(mixer, layer->channel, - layer->overlay, false, 0, old_zpos); + drm_atomic_helper_plane_reset(plane); + if (!plane->state) return; - } - sun8i_vi_layer_update_coord(mixer, layer->channel, - layer->overlay, plane, zpos); - sun8i_vi_layer_update_formats(mixer, layer->channel, - layer->overlay, plane); - sun8i_vi_layer_update_buffer(mixer, layer->channel, - layer->overlay, plane); - sun8i_vi_layer_enable(mixer, layer->channel, layer->overlay, - true, zpos, old_zpos); + plane->state->zpos = layer->channel; } static struct drm_plane_helper_funcs sun8i_vi_layer_helper_funcs = { .prepare_fb = drm_gem_fb_prepare_fb, .atomic_check = sun8i_vi_layer_atomic_check, - .atomic_disable = sun8i_vi_layer_atomic_disable, .atomic_update = sun8i_vi_layer_atomic_update, }; @@ -392,7 +422,7 @@ static const struct drm_plane_funcs sun8i_vi_layer_funcs = { .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, .destroy = drm_plane_cleanup, .disable_plane = drm_atomic_helper_disable_plane, - .reset = drm_atomic_helper_plane_reset, + .reset = sun8i_vi_layer_plane_reset, .update_plane = drm_atomic_helper_update_plane, }; -- 2.23.0

3 10

[RFC PATCH] pci: prevent putting pcie devices into lower device states on certain intel bridges
by Karol Herbst 03 Oct '19

03 Oct '19

Fixes runpm breakage mainly on Nvidia GPUs as they are not able to resume. Works perfectly with this workaround applied. RFC comment: We are quite sure that there is a higher amount of bridges affected by this, but I was only testing it on my own machine for now. I've stresstested runpm by doing 5000 runpm cycles with that patch applied and never saw it fail. I mainly wanted to get a discussion going on if that's a feasable workaround indeed or if we need something better. I am also sure, that the nouveau driver itself isn't at fault as I am able to reproduce the same issue by poking into some PCI registers on the PCIe bridge to put the GPU into D3cold as it's done in ACPI code. I've written a little python script to reproduce this issue without the need of loading nouveau: https://raw.githubusercontent.com/karolherbst/pci-stub-runpm/master/nv_runp… Signed-off-by: Karol Herbst <kherbst(a)redhat.com> Cc: Bjorn Helgaas <bhelgaas(a)google.com> Cc: Lyude Paul <lyude(a)redhat.com> Cc: linux-pci(a)vger.kernel.org Cc: dri-devel(a)lists.freedesktop.org Cc: nouveau(a)lists.freedesktop.org --- drivers/pci/pci.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 088fcdc8d2b4..9dbd29ced1ac 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -799,6 +799,42 @@ static inline bool platform_pci_bridge_d3(struct pci_dev *dev) return pci_platform_pm ? pci_platform_pm->bridge_d3(dev) : false; } +/* + * some intel bridges cause serious issues with runpm if the client device + * is put into D1/D2/D3hot before putting the client into D3cold via + * platform means (generally ACPI). + * + * skipping this makes runpm work perfectly fine on such devices. + * + * As far as we know only skylake and kaby lake SoCs are affected. + */ +static unsigned short intel_broken_d3_bridges[] = { + /* kbl */ + 0x1901, +}; + +static inline bool intel_broken_pci_pm(struct pci_bus *bus) +{ + struct pci_dev *bridge; + int i; + + if (!bus || !bus->self) + return false; + + bridge = bus->self; + if (bridge->vendor != PCI_VENDOR_ID_INTEL) + return false; + + for (i = 0; i < ARRAY_SIZE(intel_broken_d3_bridges); i++) { + if (bridge->device == intel_broken_d3_bridges[i]) { + pci_err(bridge, "found broken intel bridge\n"); + return true; + } + } + + return false; +} + /** * pci_raw_set_power_state - Use PCI PM registers to set the power state of * given PCI device @@ -827,6 +863,9 @@ static int pci_raw_set_power_state(struct pci_dev *dev, pci_power_t state) if (state < PCI_D0 || state > PCI_D3hot) return -EINVAL; + if (state != PCI_D0 && intel_broken_pci_pm(dev->bus)) + return 0; + /* * Validate current state: * Can enter D0 from any state, but if we can only go deeper -- 2.21.0

5 17

Xorg indefinitely hangs in kernelspace
by Jaak Ristioja 03 Oct '19

03 Oct '19

Hello! I'm writing to report a crash in the QXL / DRM code in the Linux kernel. I originally filed the issue on LaunchPad and more details can be found there, although I doubt whether these details are useful. https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1813620 I first experienced these issues with: * Ubuntu 18.04 (probably kernel 4.15.something) * Ubuntu 18.10 (kernel 4.18.0-13) * Ubuntu 19.04 (kernel 5.0.0-13-generic) * Ubuntu 19.04 (mainline kernel 5.1-rc7) * Ubuntu 19.04 (mainline kernel 5.2.0-050200rc1-generic) Here is the crash output from dmesg: [354073.713350] INFO: task Xorg:920 blocked for more than 120 seconds. [354073.717755] Not tainted 5.2.0-050200rc1-generic #201905191930 [354073.722277] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [354073.738332] Xorg D 0 920 854 0x00404004 [354073.738334] Call Trace: [354073.738340] __schedule+0x2ba/0x650 [354073.738342] schedule+0x2d/0x90 [354073.738343] schedule_preempt_disabled+0xe/0x10 [354073.738345] __ww_mutex_lock.isra.11+0x3e0/0x750 [354073.738346] __ww_mutex_lock_slowpath+0x16/0x20 [354073.738347] ww_mutex_lock+0x34/0x50 [354073.738352] ttm_eu_reserve_buffers+0x1f9/0x2e0 [ttm] [354073.738356] qxl_release_reserve_list+0x67/0x150 [qxl] [354073.738358] ? qxl_bo_pin+0xaa/0x190 [qxl] [354073.738359] qxl_cursor_atomic_update+0x1b0/0x2e0 [qxl] [354073.738367] drm_atomic_helper_commit_planes+0xb9/0x220 [drm_kms_helper] [354073.738371] drm_atomic_helper_commit_tail+0x2b/0x70 [drm_kms_helper] [354073.738374] commit_tail+0x67/0x70 [drm_kms_helper] [354073.738378] drm_atomic_helper_commit+0x113/0x120 [drm_kms_helper] [354073.738390] drm_atomic_commit+0x4a/0x50 [drm] [354073.738394] drm_atomic_helper_update_plane+0xe9/0x100 [drm_kms_helper] [354073.738402] __setplane_atomic+0xd3/0x120 [drm] [354073.738410] drm_mode_cursor_universal+0x142/0x270 [drm] [354073.738418] drm_mode_cursor_common+0xcb/0x220 [drm] [354073.738425] ? drm_mode_cursor_ioctl+0x60/0x60 [drm] [354073.738432] drm_mode_cursor2_ioctl+0xe/0x10 [drm] [354073.738438] drm_ioctl_kernel+0xb0/0x100 [drm] [354073.738440] ? ___sys_recvmsg+0x16c/0x200 [354073.738445] drm_ioctl+0x233/0x410 [drm] [354073.738452] ? drm_mode_cursor_ioctl+0x60/0x60 [drm] [354073.738454] ? timerqueue_add+0x57/0x90 [354073.738456] ? enqueue_hrtimer+0x3c/0x90 [354073.738458] do_vfs_ioctl+0xa9/0x640 [354073.738459] ? fput+0x13/0x20 [354073.738461] ? __sys_recvmsg+0x88/0xa0 [354073.738462] ksys_ioctl+0x67/0x90 [354073.738463] __x64_sys_ioctl+0x1a/0x20 [354073.738465] do_syscall_64+0x5a/0x140 [354073.738467] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [354073.738468] RIP: 0033:0x7ffad14d3417 [354073.738472] Code: Bad RIP value. [354073.738472] RSP: 002b:00007ffdd5679978 EFLAGS: 00003246 ORIG_RAX: 0000000000000010 [354073.738473] RAX: ffffffffffffffda RBX: 000056428a474610 RCX: 00007ffad14d3417 [354073.738474] RDX: 00007ffdd56799b0 RSI: 00000000c02464bb RDI: 000000000000000e [354073.738474] RBP: 00007ffdd56799b0 R08: 0000000000000040 R09: 0000000000000010 [354073.738475] R10: 000000000000003f R11: 0000000000003246 R12: 00000000c02464bb [354073.738475] R13: 000000000000000e R14: 0000000000000000 R15: 000056428a4721d0 [354073.738511] INFO: task kworker/1:0:27625 blocked for more than 120 seconds. [354073.745154] Not tainted 5.2.0-050200rc1-generic #201905191930 [354073.751900] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [354073.762197] kworker/1:0 D 0 27625 2 0x80004000 [354073.762205] Workqueue: events qxl_client_monitors_config_work_func [qxl] [354073.762206] Call Trace: [354073.762211] __schedule+0x2ba/0x650 [354073.762214] schedule+0x2d/0x90 [354073.762215] schedule_preempt_disabled+0xe/0x10 [354073.762216] __ww_mutex_lock.isra.11+0x3e0/0x750 [354073.762217] ? __switch_to_asm+0x34/0x70 [354073.762218] ? __switch_to_asm+0x40/0x70 [354073.762219] ? __switch_to_asm+0x40/0x70 [354073.762220] __ww_mutex_lock_slowpath+0x16/0x20 [354073.762221] ww_mutex_lock+0x34/0x50 [354073.762235] drm_modeset_lock+0x35/0xb0 [drm] [354073.762243] drm_modeset_lock_all_ctx+0x5d/0xe0 [drm] [354073.762251] drm_modeset_lock_all+0x5e/0xb0 [drm] [354073.762252] qxl_display_read_client_monitors_config+0x1e1/0x370 [qxl] [354073.762254] qxl_client_monitors_config_work_func+0x15/0x20 [qxl] [354073.762256] process_one_work+0x20f/0x410 [354073.762257] worker_thread+0x34/0x400 [354073.762259] kthread+0x120/0x140 [354073.762260] ? process_one_work+0x410/0x410 [354073.762261] ? __kthread_parkme+0x70/0x70 [354073.762262] ret_from_fork+0x35/0x40 [354194.557095] INFO: task Xorg:920 blocked for more than 241 seconds. [354194.558311] Not tainted 5.2.0-050200rc1-generic #201905191930 [354194.559484] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [354194.560936] Xorg D 0 920 854 0x00404004 [354194.560938] Call Trace: [354194.560944] __schedule+0x2ba/0x650 [354194.560946] schedule+0x2d/0x90 [354194.560947] schedule_preempt_disabled+0xe/0x10 [354194.560948] __ww_mutex_lock.isra.11+0x3e0/0x750 [354194.560950] __ww_mutex_lock_slowpath+0x16/0x20 [354194.560950] ww_mutex_lock+0x34/0x50 [354194.560956] ttm_eu_reserve_buffers+0x1f9/0x2e0 [ttm] [354194.560959] qxl_release_reserve_list+0x67/0x150 [qxl] [354194.560961] ? qxl_bo_pin+0xaa/0x190 [qxl] [354194.560963] qxl_cursor_atomic_update+0x1b0/0x2e0 [qxl] [354194.560971] drm_atomic_helper_commit_planes+0xb9/0x220 [drm_kms_helper] [354194.560975] drm_atomic_helper_commit_tail+0x2b/0x70 [drm_kms_helper] [354194.560979] commit_tail+0x67/0x70 [drm_kms_helper] [354194.560982] drm_atomic_helper_commit+0x113/0x120 [drm_kms_helper] [354194.560993] drm_atomic_commit+0x4a/0x50 [drm] [354194.560997] drm_atomic_helper_update_plane+0xe9/0x100 [drm_kms_helper] [354194.561011] __setplane_atomic+0xd3/0x120 [drm] [354194.561019] drm_mode_cursor_universal+0x142/0x270 [drm] [354194.561027] drm_mode_cursor_common+0xcb/0x220 [drm] [354194.561034] ? drm_mode_cursor_ioctl+0x60/0x60 [drm] [354194.561041] drm_mode_cursor2_ioctl+0xe/0x10 [drm] [354194.561047] drm_ioctl_kernel+0xb0/0x100 [drm] [354194.561049] ? ___sys_recvmsg+0x16c/0x200 [354194.561057] drm_ioctl+0x233/0x410 [drm] [354194.561080] ? drm_mode_cursor_ioctl+0x60/0x60 [drm] [354194.561082] ? timerqueue_add+0x57/0x90 [354194.561084] ? enqueue_hrtimer+0x3c/0x90 [354194.561086] do_vfs_ioctl+0xa9/0x640 [354194.561088] ? fput+0x13/0x20 [354194.561089] ? __sys_recvmsg+0x88/0xa0 [354194.561090] ksys_ioctl+0x67/0x90 [354194.561091] __x64_sys_ioctl+0x1a/0x20 [354194.561093] do_syscall_64+0x5a/0x140 [354194.561094] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [354194.561096] RIP: 0033:0x7ffad14d3417 [354194.561100] Code: Bad RIP value. [354194.561100] RSP: 002b:00007ffdd5679978 EFLAGS: 00003246 ORIG_RAX: 0000000000000010 [354194.561101] RAX: ffffffffffffffda RBX: 000056428a474610 RCX: 00007ffad14d3417 [354194.561102] RDX: 00007ffdd56799b0 RSI: 00000000c02464bb RDI: 000000000000000e [354194.561102] RBP: 00007ffdd56799b0 R08: 0000000000000040 R09: 0000000000000010 [354194.561103] R10: 000000000000003f R11: 0000000000003246 R12: 00000000c02464bb [354194.561103] R13: 000000000000000e R14: 0000000000000000 R15: 000056428a4721d0 [354194.561163] INFO: task kworker/1:0:27625 blocked for more than 241 seconds. [354194.562474] Not tainted 5.2.0-050200rc1-generic #201905191930 [354194.563994] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [354194.565474] kworker/1:0 D 0 27625 2 0x80004000 [354194.565479] Workqueue: events qxl_client_monitors_config_work_func [qxl] [354194.565480] Call Trace: [354194.565483] __schedule+0x2ba/0x650 [354194.565484] schedule+0x2d/0x90 [354194.565486] schedule_preempt_disabled+0xe/0x10 [354194.565486] __ww_mutex_lock.isra.11+0x3e0/0x750 [354194.565488] ? __switch_to_asm+0x34/0x70 [354194.565489] ? __switch_to_asm+0x40/0x70 [354194.565490] ? __switch_to_asm+0x40/0x70 [354194.565490] __ww_mutex_lock_slowpath+0x16/0x20 [354194.565491] ww_mutex_lock+0x34/0x50 [354194.565499] drm_modeset_lock+0x35/0xb0 [drm] [354194.565507] drm_modeset_lock_all_ctx+0x5d/0xe0 [drm] [354194.565514] drm_modeset_lock_all+0x5e/0xb0 [drm] [354194.565516] qxl_display_read_client_monitors_config+0x1e1/0x370 [qxl] [354194.565518] qxl_client_monitors_config_work_func+0x15/0x20 [qxl] [354194.565519] process_one_work+0x20f/0x410 [354194.565521] worker_thread+0x34/0x400 [354194.565522] kthread+0x120/0x140 [354194.565523] ? process_one_work+0x410/0x410 [354194.565524] ? __kthread_parkme+0x70/0x70 [354194.565525] ret_from_fork+0x35/0x40 [354315.400956] INFO: task Xorg:920 blocked for more than 362 seconds. [354315.411626] Not tainted 5.2.0-050200rc1-generic #201905191930 [354315.422647] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [354315.435897] Xorg D 0 920 854 0x00404004 [354315.435899] Call Trace: [354315.435923] __schedule+0x2ba/0x650 [354315.435925] schedule+0x2d/0x90 [354315.435927] schedule_preempt_disabled+0xe/0x10 [354315.435928] __ww_mutex_lock.isra.11+0x3e0/0x750 [354315.435929] __ww_mutex_lock_slowpath+0x16/0x20 [354315.435930] ww_mutex_lock+0x34/0x50 [354315.435935] ttm_eu_reserve_buffers+0x1f9/0x2e0 [ttm] [354315.435939] qxl_release_reserve_list+0x67/0x150 [qxl] [354315.435941] ? qxl_bo_pin+0xaa/0x190 [qxl] [354315.435943] qxl_cursor_atomic_update+0x1b0/0x2e0 [qxl] [354315.435951] drm_atomic_helper_commit_planes+0xb9/0x220 [drm_kms_helper] [354315.435955] drm_atomic_helper_commit_tail+0x2b/0x70 [drm_kms_helper] [354315.435958] commit_tail+0x67/0x70 [drm_kms_helper] [354315.435962] drm_atomic_helper_commit+0x113/0x120 [drm_kms_helper] [354315.435974] drm_atomic_commit+0x4a/0x50 [drm] [354315.435977] drm_atomic_helper_update_plane+0xe9/0x100 [drm_kms_helper] [354315.435985] __setplane_atomic+0xd3/0x120 [drm] [354315.435993] drm_mode_cursor_universal+0x142/0x270 [drm] [354315.436001] drm_mode_cursor_common+0xcb/0x220 [drm] [354315.436009] ? drm_mode_cursor_ioctl+0x60/0x60 [drm] [354315.436016] drm_mode_cursor2_ioctl+0xe/0x10 [drm] [354315.436021] drm_ioctl_kernel+0xb0/0x100 [drm] [354315.436023] ? ___sys_recvmsg+0x16c/0x200 [354315.436029] drm_ioctl+0x233/0x410 [drm] [354315.436036] ? drm_mode_cursor_ioctl+0x60/0x60 [drm] [354315.436038] ? timerqueue_add+0x57/0x90 [354315.436040] ? enqueue_hrtimer+0x3c/0x90 [354315.436042] do_vfs_ioctl+0xa9/0x640 [354315.436043] ? fput+0x13/0x20 [354315.436045] ? __sys_recvmsg+0x88/0xa0 [354315.436046] ksys_ioctl+0x67/0x90 [354315.436047] __x64_sys_ioctl+0x1a/0x20 [354315.436049] do_syscall_64+0x5a/0x140 [354315.436050] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [354315.436051] RIP: 0033:0x7ffad14d3417 [354315.436069] Code: Bad RIP value. [354315.436070] RSP: 002b:00007ffdd5679978 EFLAGS: 00003246 ORIG_RAX: 0000000000000010 [354315.436071] RAX: ffffffffffffffda RBX: 000056428a474610 RCX: 00007ffad14d3417 [354315.436071] RDX: 00007ffdd56799b0 RSI: 00000000c02464bb RDI: 000000000000000e [354315.436072] RBP: 00007ffdd56799b0 R08: 0000000000000040 R09: 0000000000000010 [354315.436072] R10: 000000000000003f R11: 0000000000003246 R12: 00000000c02464bb [354315.436073] R13: 000000000000000e R14: 0000000000000000 R15: 000056428a4721d0 [354315.436103] INFO: task kworker/1:0:27625 blocked for more than 362 seconds. [354315.451103] Not tainted 5.2.0-050200rc1-generic #201905191930 [354315.461927] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [354315.477908] kworker/1:0 D 0 27625 2 0x80004000 [354315.477916] Workqueue: events qxl_client_monitors_config_work_func [qxl] [354315.477918] Call Trace: [354315.477924] __schedule+0x2ba/0x650 [354315.477925] schedule+0x2d/0x90 [354315.477927] schedule_preempt_disabled+0xe/0x10 [354315.477928] __ww_mutex_lock.isra.11+0x3e0/0x750 [354315.477930] ? __switch_to_asm+0x34/0x70 [354315.477931] ? __switch_to_asm+0x40/0x70 [354315.477932] ? __switch_to_asm+0x40/0x70 [354315.477933] __ww_mutex_lock_slowpath+0x16/0x20 [354315.477933] ww_mutex_lock+0x34/0x50 [354315.477947] drm_modeset_lock+0x35/0xb0 [drm] [354315.477955] drm_modeset_lock_all_ctx+0x5d/0xe0 [drm] [354315.477963] drm_modeset_lock_all+0x5e/0xb0 [drm] [354315.477965] qxl_display_read_client_monitors_config+0x1e1/0x370 [qxl] [354315.477967] qxl_client_monitors_config_work_func+0x15/0x20 [qxl] [354315.477969] process_one_work+0x20f/0x410 [354315.477970] worker_thread+0x34/0x400 [354315.477972] kthread+0x120/0x140 [354315.477973] ? process_one_work+0x410/0x410 [354315.477973] ? __kthread_parkme+0x70/0x70 [354315.477975] ret_from_fork+0x35/0x40 [354436.251965] INFO: task Xorg:920 blocked for more than 483 seconds. [354436.253054] Not tainted 5.2.0-050200rc1-generic #201905191930 [354436.254109] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [354436.255421] Xorg D 0 920 854 0x00404004 [354436.255423] Call Trace: [354436.255429] __schedule+0x2ba/0x650 [354436.255431] schedule+0x2d/0x90 [354436.255433] schedule_preempt_disabled+0xe/0x10 [354436.255434] __ww_mutex_lock.isra.11+0x3e0/0x750 [354436.255435] __ww_mutex_lock_slowpath+0x16/0x20 [354436.255435] ww_mutex_lock+0x34/0x50 [354436.255441] ttm_eu_reserve_buffers+0x1f9/0x2e0 [ttm] [354436.255445] qxl_release_reserve_list+0x67/0x150 [qxl] [354436.255446] ? qxl_bo_pin+0xaa/0x190 [qxl] [354436.255448] qxl_cursor_atomic_update+0x1b0/0x2e0 [qxl] [354436.255456] drm_atomic_helper_commit_planes+0xb9/0x220 [drm_kms_helper] [354436.255459] drm_atomic_helper_commit_tail+0x2b/0x70 [drm_kms_helper] [354436.255463] commit_tail+0x67/0x70 [drm_kms_helper] [354436.255467] drm_atomic_helper_commit+0x113/0x120 [drm_kms_helper] [354436.255479] drm_atomic_commit+0x4a/0x50 [drm] [354436.255482] drm_atomic_helper_update_plane+0xe9/0x100 [drm_kms_helper] [354436.255490] __setplane_atomic+0xd3/0x120 [drm] [354436.255498] drm_mode_cursor_universal+0x142/0x270 [drm] [354436.255506] drm_mode_cursor_common+0xcb/0x220 [drm] [354436.255513] ? drm_mode_cursor_ioctl+0x60/0x60 [drm] [354436.255520] drm_mode_cursor2_ioctl+0xe/0x10 [drm] [354436.255526] drm_ioctl_kernel+0xb0/0x100 [drm] [354436.255527] ? ___sys_recvmsg+0x16c/0x200 [354436.255533] drm_ioctl+0x233/0x410 [drm] [354436.255540] ? drm_mode_cursor_ioctl+0x60/0x60 [drm] [354436.255542] ? timerqueue_add+0x57/0x90 [354436.255544] ? enqueue_hrtimer+0x3c/0x90 [354436.255546] do_vfs_ioctl+0xa9/0x640 [354436.255547] ? fput+0x13/0x20 [354436.255548] ? __sys_recvmsg+0x88/0xa0 [354436.255550] ksys_ioctl+0x67/0x90 [354436.255551] __x64_sys_ioctl+0x1a/0x20 [354436.255553] do_syscall_64+0x5a/0x140 [354436.255554] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [354436.255555] RIP: 0033:0x7ffad14d3417 [354436.255559] Code: Bad RIP value. [354436.255560] RSP: 002b:00007ffdd5679978 EFLAGS: 00003246 ORIG_RAX: 0000000000000010 [354436.255561] RAX: ffffffffffffffda RBX: 000056428a474610 RCX: 00007ffad14d3417 [354436.255561] RDX: 00007ffdd56799b0 RSI: 00000000c02464bb RDI: 000000000000000e [354436.255562] RBP: 00007ffdd56799b0 R08: 0000000000000040 R09: 0000000000000010 [354436.255562] R10: 000000000000003f R11: 0000000000003246 R12: 00000000c02464bb [354436.255563] R13: 000000000000000e R14: 0000000000000000 R15: 000056428a4721d0 [354436.255599] INFO: task kworker/1:0:27625 blocked for more than 483 seconds. [354436.256802] Not tainted 5.2.0-050200rc1-generic #201905191930 [354436.257874] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [354436.278727] kworker/1:0 D 0 27625 2 0x80004000 [354436.278735] Workqueue: events qxl_client_monitors_config_work_func [qxl] [354436.278736] Call Trace: [354436.278742] __schedule+0x2ba/0x650 [354436.278743] schedule+0x2d/0x90 [354436.278745] schedule_preempt_disabled+0xe/0x10 [354436.278746] __ww_mutex_lock.isra.11+0x3e0/0x750 [354436.278747] ? __switch_to_asm+0x34/0x70 [354436.278748] ? __switch_to_asm+0x40/0x70 [354436.278749] ? __switch_to_asm+0x40/0x70 [354436.278750] __ww_mutex_lock_slowpath+0x16/0x20 [354436.278751] ww_mutex_lock+0x34/0x50 [354436.278764] drm_modeset_lock+0x35/0xb0 [drm] [354436.278772] drm_modeset_lock_all_ctx+0x5d/0xe0 [drm] [354436.278779] drm_modeset_lock_all+0x5e/0xb0 [drm] [354436.278781] qxl_display_read_client_monitors_config+0x1e1/0x370 [qxl] [354436.278783] qxl_client_monitors_config_work_func+0x15/0x20 [qxl] [354436.278785] process_one_work+0x20f/0x410 [354436.278786] worker_thread+0x34/0x400 [354436.278787] kthread+0x120/0x140 [354436.278788] ? process_one_work+0x410/0x410 [354436.278789] ? __kthread_parkme+0x70/0x70 [354436.278790] ret_from_fork+0x35/0x40 [354557.088600] INFO: task Xorg:920 blocked for more than 604 seconds. [354557.089689] Not tainted 5.2.0-050200rc1-generic #201905191930 [354557.090759] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [354557.092075] Xorg D 0 920 854 0x00404004 [354557.092077] Call Trace: [354557.092083] __schedule+0x2ba/0x650 [354557.092085] schedule+0x2d/0x90 [354557.092086] schedule_preempt_disabled+0xe/0x10 [354557.092087] __ww_mutex_lock.isra.11+0x3e0/0x750 [354557.092089] __ww_mutex_lock_slowpath+0x16/0x20 [354557.092089] ww_mutex_lock+0x34/0x50 [354557.092095] ttm_eu_reserve_buffers+0x1f9/0x2e0 [ttm] [354557.092098] qxl_release_reserve_list+0x67/0x150 [qxl] [354557.092100] ? qxl_bo_pin+0xaa/0x190 [qxl] [354557.092102] qxl_cursor_atomic_update+0x1b0/0x2e0 [qxl] [354557.092110] drm_atomic_helper_commit_planes+0xb9/0x220 [drm_kms_helper] [354557.092114] drm_atomic_helper_commit_tail+0x2b/0x70 [drm_kms_helper] [354557.092117] commit_tail+0x67/0x70 [drm_kms_helper] [354557.092121] drm_atomic_helper_commit+0x113/0x120 [drm_kms_helper] [354557.092133] drm_atomic_commit+0x4a/0x50 [drm] [354557.092137] drm_atomic_helper_update_plane+0xe9/0x100 [drm_kms_helper] [354557.092145] __setplane_atomic+0xd3/0x120 [drm] [354557.092154] drm_mode_cursor_universal+0x142/0x270 [drm] [354557.092162] drm_mode_cursor_common+0xcb/0x220 [drm] [354557.092170] ? drm_mode_cursor_ioctl+0x60/0x60 [drm] [354557.092179] drm_mode_cursor2_ioctl+0xe/0x10 [drm] [354557.092185] drm_ioctl_kernel+0xb0/0x100 [drm] [354557.092187] ? ___sys_recvmsg+0x16c/0x200 [354557.092193] drm_ioctl+0x233/0x410 [drm] [354557.092201] ? drm_mode_cursor_ioctl+0x60/0x60 [drm] [354557.092203] ? timerqueue_add+0x57/0x90 [354557.092205] ? enqueue_hrtimer+0x3c/0x90 [354557.092207] do_vfs_ioctl+0xa9/0x640 [354557.092208] ? fput+0x13/0x20 [354557.092209] ? __sys_recvmsg+0x88/0xa0 [354557.092210] ksys_ioctl+0x67/0x90 [354557.092212] __x64_sys_ioctl+0x1a/0x20 [354557.092213] do_syscall_64+0x5a/0x140 [354557.092215] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [354557.092216] RIP: 0033:0x7ffad14d3417 [354557.092220] Code: Bad RIP value. [354557.092221] RSP: 002b:00007ffdd5679978 EFLAGS: 00003246 ORIG_RAX: 0000000000000010 [354557.092222] RAX: ffffffffffffffda RBX: 000056428a474610 RCX: 00007ffad14d3417 [354557.092223] RDX: 00007ffdd56799b0 RSI: 00000000c02464bb RDI: 000000000000000e [354557.092223] RBP: 00007ffdd56799b0 R08: 0000000000000040 R09: 0000000000000010 [354557.092223] R10: 000000000000003f R11: 0000000000003246 R12: 00000000c02464bb [354557.092224] R13: 000000000000000e R14: 0000000000000000 R15: 000056428a4721d0 [354557.092259] INFO: task kworker/1:0:27625 blocked for more than 604 seconds. [354557.093464] Not tainted 5.2.0-050200rc1-generic #201905191930 [354557.094520] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [354557.095834] kworker/1:0 D 0 27625 2 0x80004000 [354557.095838] Workqueue: events qxl_client_monitors_config_work_func [qxl] [354557.095839] Call Trace: [354557.095841] __schedule+0x2ba/0x650 [354557.095843] schedule+0x2d/0x90 [354557.095844] schedule_preempt_disabled+0xe/0x10 [354557.095845] __ww_mutex_lock.isra.11+0x3e0/0x750 [354557.095846] ? __switch_to_asm+0x34/0x70 [354557.095847] ? __switch_to_asm+0x40/0x70 [354557.095848] ? __switch_to_asm+0x40/0x70 [354557.095849] __ww_mutex_lock_slowpath+0x16/0x20 [354557.095850] ww_mutex_lock+0x34/0x50 [354557.095858] drm_modeset_lock+0x35/0xb0 [drm] [354557.095866] drm_modeset_lock_all_ctx+0x5d/0xe0 [drm] [354557.095874] drm_modeset_lock_all+0x5e/0xb0 [drm] [354557.095876] qxl_display_read_client_monitors_config+0x1e1/0x370 [qxl] [354557.095878] qxl_client_monitors_config_work_func+0x15/0x20 [qxl] [354557.095880] process_one_work+0x20f/0x410 [354557.095881] worker_thread+0x34/0x400 [354557.095882] kthread+0x120/0x140 [354557.095883] ? process_one_work+0x410/0x410 [354557.095884] ? __kthread_parkme+0x70/0x70 [354557.095885] ret_from_fork+0x35/0x40 Please contact me if more information is needed. Best regards, Jaak Ristioja

4 6

[Bug 111415] BUG: kernel NULL pointer dereference - supervisor read access in kernel mode
by bugzilla-daemon＠freedesktop.org 03 Oct '19

03 Oct '19

https://bugs.freedesktop.org/show_bug.cgi?id=111415 Bug ID: 111415 Summary: BUG: kernel NULL pointer dereference - supervisor read access in kernel mode Product: DRI Version: unspecified Hardware: x86-64 (AMD64) OS: Linux (All) Status: NEW Severity: normal Priority: medium Component: DRM/AMDgpu Assignee: dri-devel(a)lists.freedesktop.org Reporter: tseewald(a)gmail.com Created attachment 145088 --> https://bugs.freedesktop.org/attachment.cgi?id=145088&action=edit dmesg of freeze Distribution: Fedora 30 Kernel: 5.2.8 Mesa: 19.1.4 GPU: RX 560 Problem: While browsing the internet using Chromium my entire machine froze, it was completely unresponsive to input but audio continued to play. Snippet of BUG: [173497.820810] BUG: kernel NULL pointer dereference, address: 00000000000002b4 [173497.820815] #PF: supervisor read access in kernel mode [173497.820817] #PF: error_code(0x0000) - not-present page [173497.820818] PGD 0 P4D 0 [173497.820822] Oops: 0000 [#1] SMP PTI [173497.820825] CPU: 2 PID: 21197 Comm: kworker/u8:2 Not tainted 5.2.8-200.fc30.x86_64 #1 [173497.820826] Hardware name: To Be Filled By O.E.M. To Be Filled By O.E.M./Z77 Extreme4, BIOS P2.90 07/11/2013 [173497.820839] Workqueue: events_unbound commit_work [drm_kms_helper] [173497.820953] RIP: 0010:dc_stream_log+0x6/0xb0 [amdgpu] See attached dmesg for full message. Let me know if you need any additional information. -- You are receiving this mail because: You are the assignee for the bug.

1 2

[Bug 110963] Wrong condition and wrong variable substitution in libgl1-amdgpu-mesa-dri in postinst script
by bugzilla-daemon＠freedesktop.org 02 Oct '19

02 Oct '19

https://bugs.freedesktop.org/show_bug.cgi?id=110963 Bug ID: 110963 Summary: Wrong condition and wrong variable substitution in libgl1-amdgpu-mesa-dri in postinst script Product: DRI Version: unspecified Hardware: Other OS: All Status: NEW Severity: major Priority: medium Component: DRM/AMDgpu-pro Assignee: dri-devel(a)lists.freedesktop.org Reporter: ashark(a)linuxcomp.ru 19.20-812932 release for Ubuntu In libgl1-amdgpu-mesa-dri in postinst script there is such condition: # Support I+A hybrid graphics if [ -f ... ] && [ "str1" != "str2" ]; then You just compare two different strings? I guess you wanted to compare folder contents. But now that second condition will always be true. Further there is: if [ "${f%%/*}" = ... ]; then there is extra percent symbol, you should remove it. Btw, in rpm release variant in scriptlet there is no such mistake. -- You are receiving this mail because: You are the assignee for the bug.

1 5

[PATCH] drm/vkms: prime import support
by Oleg Vasilev 02 Oct '19

02 Oct '19

Bring dmabuf sharing through implementing prime_import_sg_table callback. This will help to validate userspace conformance in prime configurations without using any actual hardware (e.g. in the cloud). This enables kms_prime IGT testcase on vkms. V2: - Rodrigo: styleguide + return code check V3: - Rodrigo: remove redundant vkms_gem_create_private Cc: Rodrigo Siqueira <rodrigosiqueiramelo(a)gmail.com> Cc: Haneen Mohammed <hamohammed.sa(a)gmail.com> Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: Simon Ser <simon.ser(a)intel.com> Signed-off-by: Oleg Vasilev <oleg.vasilev(a)intel.com> Signed-off-by: Oleg Vasilev <omrigann(a)gmail.com> --- drivers/gpu/drm/vkms/vkms_drv.c | 12 ++++++++++++ drivers/gpu/drm/vkms/vkms_drv.h | 6 ++++++ drivers/gpu/drm/vkms/vkms_gem.c | 27 +++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c index 80524a22412a..54703463d966 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -11,7 +11,9 @@ #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/dma-mapping.h> +#include <drm/drm_gem.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> @@ -103,6 +105,8 @@ static struct drm_driver vkms_driver = { .gem_vm_ops = &vkms_gem_vm_ops, .gem_free_object_unlocked = vkms_gem_free_object, .get_vblank_timestamp = vkms_get_vblank_timestamp, + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, + .gem_prime_import_sg_table = vkms_prime_import_sg_table, .name = DRIVER_NAME, .desc = DRIVER_DESC, @@ -157,6 +161,14 @@ static int __init vkms_init(void) if (ret) goto out_unregister; + ret = dma_coerce_mask_and_coherent(vkms_device->drm.dev, + DMA_BIT_MASK(64)); + + if (ret) { + DRM_ERROR("Could not initialize DMA support\n"); + goto out_fini; + } + vkms_device->drm.irq_enabled = true; ret = drm_vblank_init(&vkms_device->drm, 1); diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index 5a95100fa18b..7d52e24564db 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -137,6 +137,12 @@ int vkms_gem_vmap(struct drm_gem_object *obj); void vkms_gem_vunmap(struct drm_gem_object *obj); +/* Prime */ +struct drm_gem_object * +vkms_prime_import_sg_table(struct drm_device *dev, + struct dma_buf_attachment *attach, + struct sg_table *sg); + /* CRC Support */ const char *const *vkms_get_crc_sources(struct drm_crtc *crtc, size_t *count); diff --git a/drivers/gpu/drm/vkms/vkms_gem.c b/drivers/gpu/drm/vkms/vkms_gem.c index 6489bfe0a149..2e01186fb943 100644 --- a/drivers/gpu/drm/vkms/vkms_gem.c +++ b/drivers/gpu/drm/vkms/vkms_gem.c @@ -1,7 +1,9 @@ // SPDX-License-Identifier: GPL-2.0+ +#include <linux/dma-buf.h> #include <linux/shmem_fs.h> #include <linux/vmalloc.h> +#include <drm/drm_prime.h> #include "vkms_drv.h" @@ -218,3 +220,28 @@ int vkms_gem_vmap(struct drm_gem_object *obj) mutex_unlock(&vkms_obj->pages_lock); return ret; } + +struct drm_gem_object * +vkms_prime_import_sg_table(struct drm_device *dev, + struct dma_buf_attachment *attach, + struct sg_table *sg) +{ + struct vkms_gem_object *obj; + int npages; + + obj = __vkms_gem_create(dev, attach->dmabuf->size); + if (IS_ERR(obj)) + return ERR_CAST(obj); + + npages = PAGE_ALIGN(attach->dmabuf->size) / PAGE_SIZE; + DRM_DEBUG_PRIME("Importing %d pages\n", npages); + + obj->pages = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL); + if (!obj->pages) { + vkms_gem_free_object(&obj->gem); + return ERR_PTR(-ENOMEM); + } + + drm_prime_sg_to_page_addr_arrays(sg, obj->pages, NULL, npages); + return &obj->gem; +} -- 2.17.1

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel September 2019