dri-devel October 2013

dri-devel@lists.freedesktop.org

171 participants
926 discussions

[PATCH 0/5] module_reload fixes
by Paulo Zanoni 09 Oct '13

09 Oct '13

From: Paulo Zanoni <paulo.r.zanoni(a)intel.com> Hi These patches allow us to run the "module_reload" script from intel-gpu-tools on Haswell. The script basically just removes i915.ko and loads it again. There's a memory corruption fix and also the fix for fd.o #67813. Notice that the first patch fixes the case where we boot eDP+something, while patches 3-5 fix the case where we boot eDP-only. I couldn't find MAINTAINERS entries for vt.c or fbcon.c, but I heard the dri-devel list is a … [View More]

3 11

[PATCH 0/5] DRM device-alloc cleanup
by David Herrmann 09 Oct '13

09 Oct '13

Hi This cleans up the bus drivers in DRM. Instead of copying the device alloc/free semantics into each bus driver (drm_{pci,platform,usb}.c) we now have a central place in drm_stub.c. This introduces drm_dev_{alloc,free,register,unregister}(). They have the same semantics as most other kernel subsystems. *_alloc() allocates a new device and populates the static fields and sub-objects. *_free() frees an unregistered object allocated via *_alloc(). *_register() registers a DRM device and *… [View More]

3 12

[PATCHv4 0/5] gpu: host1x: Add runtime pm support
by Arto Merilainen 09 Oct '13

09 Oct '13

This series adds runtime pm support for host1x, gr2d and dc. It retains the current behaviour if CONFIG_PM_RUNTIME is not enabled. The gr2d clock is enabled when a new job is submitted and disabled when the work is done. Due to parent->child relations between host1x->gr2d, this scheme enables and disables host1x clock. For dc, the clocks are enabled in .probe and disabled in .remove via runtime pm instead of direct clock APIs. Mayuresh is unfortunately not available to continue with … [View More]

3 7

[PATCH 00/10] drm: drm_device house cleaning
by ville.syrjala＠linux.intel.com 09 Oct '13

09 Oct '13

This series does some house cleaning on struct drm_device. x86-64: pahole before the series: /* size: 1576, cachelines: 25, members: 67 */ /* sum members: 1528, holes: 12, sum holes: 48 */ /* paddings: 3, sum paddings: 11 */ /* last cacheline: 40 bytes */ pahole after the series: /* size: 1296, cachelines: 21, members: 52 */ /* sum members: 1290, holes: 1, sum holes: 2 */ /* padding: 4 */ /* paddings: 3, sum paddings: 11 */ … [View More] /* last cacheline: 16 bytes */ x86: pahole before the series: /* size: 956, cachelines: 15, members: 67 */ /* sum members: 952, holes: 2, sum holes: 4 */ /* paddings: 3, sum paddings: 7 */ /* last cacheline: 60 bytes */ pahole after the series: /* size: 764, cachelines: 12, members: 52 */ /* sum members: 762, holes: 1, sum holes: 2 */ /* paddings: 3, sum paddings: 7 */ /* last cacheline: 60 bytes */ Ville Syrjälä (10): drm: Make vblank_disable_allowed bool drm: Make vblank_inmodeset unsigned drm: Make vblank_enabled bool drm: Collect per-crtc vblank stuff to a struct drm: Make irq_enabled bool drm: Kill unused stuff from struct drm_device drm: Kill ctx_count from struct drm_device drm: Remove pci_vendor and pci_device from struct drm_device drm: Kill drm perf counter leftovers drm: Pack struct drm_device a bit better drivers/gpu/drm/drm_context.c | 2 - drivers/gpu/drm/drm_drv.c | 6 -- drivers/gpu/drm/drm_fops.c | 3 - drivers/gpu/drm/drm_info.c | 6 +- drivers/gpu/drm/drm_irq.c | 152 ++++++++++------------------ drivers/gpu/drm/drm_lock.c | 3 - drivers/gpu/drm/drm_pci.c | 3 - drivers/gpu/drm/drm_stub.c | 9 -- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 8 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 8 +- drivers/gpu/drm/gma500/psb_drv.c | 2 +- drivers/gpu/drm/gma500/psb_drv.h | 8 +- drivers/gpu/drm/gma500/psb_irq.c | 22 ++-- drivers/gpu/drm/i810/i810_dma.c | 11 -- drivers/gpu/drm/i915/i915_dma.c | 11 +- drivers/gpu/drm/i915/i915_drv.h | 36 +++---- drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/i915/intel_tv.c | 2 +- drivers/gpu/drm/mga/mga_dma.c | 5 - drivers/gpu/drm/mga/mga_irq.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/arb.c | 8 +- drivers/gpu/drm/nouveau/dispnv04/dfp.c | 4 +- drivers/gpu/drm/nouveau/dispnv04/disp.h | 6 +- drivers/gpu/drm/nouveau/dispnv04/hw.c | 4 +- drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 +- drivers/gpu/drm/nouveau/nouveau_bios.c | 4 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 4 +- drivers/gpu/drm/omapdrm/omap_irq.c | 17 ++-- drivers/gpu/drm/radeon/radeon_bios.c | 6 +- drivers/gpu/drm/radeon/radeon_kms.c | 2 +- drivers/gpu/drm/via/via_mm.c | 2 +- drivers/gpu/host1x/drm/drm.c | 2 +- drivers/staging/imx-drm/imx-drm-core.c | 8 +- include/drm/drmP.h | 62 ++++++------ 35 files changed, 171 insertions(+), 265 deletions(-) [View Less]

4 13

[PATCH v2 1/2] drm/nouveau: embed gem object in nouveau_bo
by David Herrmann 09 Oct '13

09 Oct '13

There is no reason to keep the gem object separately allocated. nouveau is the last user of gem_obj->driver_private, so if we embed it, we can get rid of 8bytes per gem-object. The implementation follows the radeon driver. bo->gem is only valid, iff the bo was created via the gem helpers _and_ iff the user holds a valid gem reference. That is, as the gem object holds a reference to the nouveau_bo. If you use nouveau_ref() to gain a bo reference, you are not guaranteed to also hold a gem … [View More]reference. The gem object might get destroyed after the last user drops the gem-ref via drm_gem_object_unreference(). Use drm_gem_object_reference() to gain a gem-reference. For debugging, we can use bo->gem.filp != NULL to test whether a gem-bo is valid. However, this shouldn't be used for real functionality to avoid gem-internal dependencies. Note that the implementation follows the previous style. However, we no longer can check for bo->gem != NULL to test for a valid gem object. This wasn't done before, so we should be safe now. Signed-off-by: David Herrmann <dh.herrmann(a)gmail.com> Acked-by: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> Reviewed-by: Ben Skeggs <bskeggs(a)redhat.com> --- drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_bo.h | 5 ++++- drivers/gpu/drm/nouveau/nouveau_display.c | 10 ++++----- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 36 +++++++++++++++---------------- drivers/gpu/drm/nouveau/nouveau_gem.h | 2 +- drivers/gpu/drm/nouveau/nouveau_prime.c | 10 +++++---- 8 files changed, 38 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c index 8f467e7..3897549 100644 --- a/drivers/gpu/drm/nouveau/nouveau_abi16.c +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c @@ -130,7 +130,7 @@ nouveau_abi16_chan_fini(struct nouveau_abi16 *abi16, if (chan->ntfy) { nouveau_bo_vma_del(chan->ntfy, &chan->ntfy_vma); nouveau_bo_unpin(chan->ntfy); - drm_gem_object_unreference_unlocked(chan->ntfy->gem); + drm_gem_object_unreference_unlocked(&chan->ntfy->gem); } if (chan->heap.block_size) @@ -320,7 +320,7 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) goto done; } - ret = drm_gem_handle_create(file_priv, chan->ntfy->gem, + ret = drm_gem_handle_create(file_priv, &chan->ntfy->gem, &init->notifier_handle); if (ret) goto done; diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 755c38d..4172854 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -146,7 +146,7 @@ nouveau_bo_del_ttm(struct ttm_buffer_object *bo) struct drm_device *dev = drm->dev; struct nouveau_bo *nvbo = nouveau_bo(bo); - if (unlikely(nvbo->gem)) + if (unlikely(nvbo->gem.filp)) DRM_ERROR("bo %p still attached to GEM object\n", bo); WARN_ON(nvbo->pin_refcnt > 0); nv10_bo_put_tile_region(dev, nvbo->tile, NULL); @@ -1267,7 +1267,7 @@ nouveau_bo_verify_access(struct ttm_buffer_object *bo, struct file *filp) { struct nouveau_bo *nvbo = nouveau_bo(bo); - return drm_vma_node_verify_access(&nvbo->gem->vma_node, filp); + return drm_vma_node_verify_access(&nvbo->gem.vma_node, filp); } static int diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.h b/drivers/gpu/drm/nouveau/nouveau_bo.h index 653dbbb..ff17c1f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.h +++ b/drivers/gpu/drm/nouveau/nouveau_bo.h @@ -27,7 +27,10 @@ struct nouveau_bo { u32 tile_flags; struct nouveau_drm_tile *tile; - struct drm_gem_object *gem; + /* Only valid if allocated via nouveau_gem_new() and iff you hold a + * gem reference to it! For debugging, use gem.filp != NULL to test + * whether it is valid. */ + struct drm_gem_object gem; /* protect by the ttm reservation lock */ int pin_refcnt; diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index 7848590..bdd5cf7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -50,7 +50,7 @@ nouveau_user_framebuffer_destroy(struct drm_framebuffer *drm_fb) struct nouveau_framebuffer *fb = nouveau_framebuffer(drm_fb); if (fb->nvbo) - drm_gem_object_unreference_unlocked(fb->nvbo->gem); + drm_gem_object_unreference_unlocked(&fb->nvbo->gem); drm_framebuffer_cleanup(drm_fb); kfree(fb); @@ -63,7 +63,7 @@ nouveau_user_framebuffer_create_handle(struct drm_framebuffer *drm_fb, { struct nouveau_framebuffer *fb = nouveau_framebuffer(drm_fb); - return drm_gem_handle_create(file_priv, fb->nvbo->gem, handle); + return drm_gem_handle_create(file_priv, &fb->nvbo->gem, handle); } static const struct drm_framebuffer_funcs nouveau_framebuffer_funcs = { @@ -674,8 +674,8 @@ nouveau_display_dumb_create(struct drm_file *file_priv, struct drm_device *dev, if (ret) return ret; - ret = drm_gem_handle_create(file_priv, bo->gem, &args->handle); - drm_gem_object_unreference_unlocked(bo->gem); + ret = drm_gem_handle_create(file_priv, &bo->gem, &args->handle); + drm_gem_object_unreference_unlocked(&bo->gem); return ret; } @@ -688,7 +688,7 @@ nouveau_display_dumb_map_offset(struct drm_file *file_priv, gem = drm_gem_object_lookup(dev, file_priv, handle); if (gem) { - struct nouveau_bo *bo = gem->driver_private; + struct nouveau_bo *bo = nouveau_gem_object(gem); *poffset = drm_vma_node_offset_addr(&bo->bo.vma_node); drm_gem_object_unreference_unlocked(gem); return 0; diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index a86ecf6..c80b519 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -420,7 +420,7 @@ nouveau_fbcon_destroy(struct drm_device *dev, struct nouveau_fbdev *fbcon) nouveau_bo_unmap(nouveau_fb->nvbo); nouveau_bo_vma_del(nouveau_fb->nvbo, &nouveau_fb->vma); nouveau_bo_unpin(nouveau_fb->nvbo); - drm_gem_object_unreference_unlocked(nouveau_fb->nvbo->gem); + drm_gem_object_unreference_unlocked(&nouveau_fb->nvbo->gem); nouveau_fb->nvbo = NULL; } drm_fb_helper_fini(&fbcon->helper); diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index f32b712..6618318 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -43,20 +43,17 @@ nouveau_gem_object_new(struct drm_gem_object *gem) void nouveau_gem_object_del(struct drm_gem_object *gem) { - struct nouveau_bo *nvbo = gem->driver_private; + struct nouveau_bo *nvbo = nouveau_gem_object(gem); struct ttm_buffer_object *bo = &nvbo->bo; - if (!nvbo) - return; - nvbo->gem = NULL; - if (gem->import_attach) drm_prime_gem_destroy(gem, nvbo->bo.sg); - ttm_bo_unref(&bo); - drm_gem_object_release(gem); - kfree(gem); + + /* reset filp so nouveau_bo_del_ttm() can test for it */ + gem->filp = NULL; + ttm_bo_unref(&bo); } int @@ -186,14 +183,15 @@ nouveau_gem_new(struct drm_device *dev, int size, int align, uint32_t domain, if (nv_device(drm->device)->card_type >= NV_50) nvbo->valid_domains &= domain; - nvbo->gem = drm_gem_object_alloc(dev, nvbo->bo.mem.size); - if (!nvbo->gem) { + /* Initialize the embedded gem-object. We return a single gem-reference + * to the caller, instead of a normal nouveau_bo ttm reference. */ + ret = drm_gem_object_init(dev, &nvbo->gem, nvbo->bo.mem.size); + if (ret) { nouveau_bo_ref(NULL, pnvbo); return -ENOMEM; } - nvbo->bo.persistent_swap_storage = nvbo->gem->filp; - nvbo->gem->driver_private = nvbo; + nvbo->bo.persistent_swap_storage = nvbo->gem.filp; return 0; } @@ -250,15 +248,15 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data, if (ret) return ret; - ret = drm_gem_handle_create(file_priv, nvbo->gem, &req->info.handle); + ret = drm_gem_handle_create(file_priv, &nvbo->gem, &req->info.handle); if (ret == 0) { - ret = nouveau_gem_info(file_priv, nvbo->gem, &req->info); + ret = nouveau_gem_info(file_priv, &nvbo->gem, &req->info); if (ret) drm_gem_handle_delete(file_priv, req->info.handle); } /* drop reference from allocate - handle holds it now */ - drm_gem_object_unreference_unlocked(nvbo->gem); + drm_gem_object_unreference_unlocked(&nvbo->gem); return ret; } @@ -266,7 +264,7 @@ static int nouveau_gem_set_domain(struct drm_gem_object *gem, uint32_t read_domains, uint32_t write_domains, uint32_t valid_domains) { - struct nouveau_bo *nvbo = gem->driver_private; + struct nouveau_bo *nvbo = nouveau_gem_object(gem); struct ttm_buffer_object *bo = &nvbo->bo; uint32_t domains = valid_domains & nvbo->valid_domains & (write_domains ? write_domains : read_domains); @@ -327,7 +325,7 @@ validate_fini_list(struct list_head *list, struct nouveau_fence *fence, list_del(&nvbo->entry); nvbo->reserved_by = NULL; ttm_bo_unreserve_ticket(&nvbo->bo, ticket); - drm_gem_object_unreference_unlocked(nvbo->gem); + drm_gem_object_unreference_unlocked(&nvbo->gem); } } @@ -376,7 +374,7 @@ retry: validate_fini(op, NULL); return -ENOENT; } - nvbo = gem->driver_private; + nvbo = nouveau_gem_object(gem); if (nvbo == res_bo) { res_bo = NULL; drm_gem_object_unreference_unlocked(gem); @@ -478,7 +476,7 @@ validate_list(struct nouveau_channel *chan, struct nouveau_cli *cli, return ret; } - ret = nouveau_gem_set_domain(nvbo->gem, b->read_domains, + ret = nouveau_gem_set_domain(&nvbo->gem, b->read_domains, b->write_domains, b->valid_domains); if (unlikely(ret)) { diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.h b/drivers/gpu/drm/nouveau/nouveau_gem.h index 502e429..b535895 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.h +++ b/drivers/gpu/drm/nouveau/nouveau_gem.h @@ -12,7 +12,7 @@ static inline struct nouveau_bo * nouveau_gem_object(struct drm_gem_object *gem) { - return gem ? gem->driver_private : NULL; + return gem ? container_of(gem, struct nouveau_bo, gem) : NULL; } /* nouveau_gem.c */ diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c index e90468d..51a2cb1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_prime.c +++ b/drivers/gpu/drm/nouveau/nouveau_prime.c @@ -71,14 +71,16 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev, return ERR_PTR(ret); nvbo->valid_domains = NOUVEAU_GEM_DOMAIN_GART; - nvbo->gem = drm_gem_object_alloc(dev, nvbo->bo.mem.size); - if (!nvbo->gem) { + + /* Initialize the embedded gem-object. We return a single gem-reference + * to the caller, instead of a normal nouveau_bo ttm reference. */ + ret = drm_gem_object_init(dev, &nvbo->gem, nvbo->bo.mem.size); + if (ret) { nouveau_bo_ref(NULL, &nvbo); return ERR_PTR(-ENOMEM); } - nvbo->gem->driver_private = nvbo; - return nvbo->gem; + return &nvbo->gem; } int nouveau_gem_prime_pin(struct drm_gem_object *obj) -- 1.8.4 [View Less]

3 3

[PATCH 1/3] drm/edid: add drm_edid_duplicate
by Jani Nikula 09 Oct '13

09 Oct '13

We have some code duplication related to EDID duplication. Add a helper. Signed-off-by: Jani Nikula <jani.nikula(a)intel.com> --- drivers/gpu/drm/drm_edid.c | 12 ++++++++++++ include/drm/drm_crtc.h | 1 + 2 files changed, 13 insertions(+) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index c24af1d..412b80f 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1264,6 +1264,18 @@ struct edid *drm_get_edid(struct drm_connector *… [View More]

4 8

[PATCH] drm/nouveau: suspend to D3hot, not to D3cold
by Maarten Lankhorst 08 Oct '13

08 Oct '13

In the autumn and winter it's considered bad form to set power state to D3cold, it might cause the device to freeze to death. This is also the case in the other seasons, so any device in the southern hemisphere is affected too. D3cold is not a valid state in a call to pci_set_power_state, only up to D3hot is allowed. Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> --- diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index … [View More]

2 1

[PATCH] drm/gma500: fix things after get/put page helpers
by Rob Clark 08 Oct '13

08 Oct '13

Commit 8b9ba7a3 'drm/gma500: use gem get/put page helpers' was missing a line, which resulted in garbled screen. Signed-off-by: Rob Clark <robdclark(a)gmail.com> Tested-by: Guillaume CLÉMENT <gclement(a)baobob.org> --- drivers/gpu/drm/gma500/gtt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c index 92babac..2db731f 100644 --- a/drivers/gpu/drm/gma500/gtt.c +++ b/drivers/gpu/drm/gma500/gtt.c @@ -204,6 +204,7 @@ … [View More]

1 0

[PATCH 0/9] deps for msm drm (flip-work helper, const ioctl table, and gem helpers)
by Rob Clark 08 Oct '13

08 Oct '13

I'd sent these previously, but consolidating them into one patchset for easier tracking. The individual driver patches are not needed for msm drm/kms but the drm core bits are. Rob Clark (9): drm: add flip-work helper drm/tilcdc: use flip-work helper drm/omap: use flip-work helper drm: const'ify ioctls table (v2) drm/gem: add drm_gem_create_mmap_offset_size() drm/gem: add shmem get/put page helpers drm/gma500: use gem get/put page helpers drm/udl: use gem get/put page helpers … [View More] drm/omap: kill omap_gem_helpers.c drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/drm_flip_work.c | 124 +++++++++++++++++++++++++++ drivers/gpu/drm/drm_gem.c | 131 ++++++++++++++++++++++++++++- drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 +- drivers/gpu/drm/gma500/gtt.c | 38 ++------- drivers/gpu/drm/gma500/psb_drv.c | 2 +- drivers/gpu/drm/i810/i810_dma.c | 2 +- drivers/gpu/drm/i810/i810_drv.h | 2 +- drivers/gpu/drm/i915/i915_dma.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/mga/mga_drv.h | 2 +- drivers/gpu/drm/mga/mga_state.c | 2 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 5 +- drivers/gpu/drm/omapdrm/Makefile | 3 - drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- drivers/gpu/drm/omapdrm/omap_drv.h | 5 +- drivers/gpu/drm/omapdrm/omap_fb.c | 74 ++++++++-------- drivers/gpu/drm/omapdrm/omap_gem.c | 8 +- drivers/gpu/drm/omapdrm/omap_gem_helpers.c | 124 --------------------------- drivers/gpu/drm/omapdrm/omap_plane.c | 51 +++++------ drivers/gpu/drm/qxl/qxl_drv.h | 2 +- drivers/gpu/drm/qxl/qxl_ioctl.c | 2 +- drivers/gpu/drm/r128/r128_drv.h | 2 +- drivers/gpu/drm/r128/r128_state.c | 2 +- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/radeon/radeon_kms.c | 2 +- drivers/gpu/drm/savage/savage_bci.c | 2 +- drivers/gpu/drm/savage/savage_drv.h | 2 +- drivers/gpu/drm/sis/sis_drv.h | 2 +- drivers/gpu/drm/sis/sis_mm.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 33 +++----- drivers/gpu/drm/udl/udl_gem.c | 44 ++-------- drivers/gpu/drm/via/via_dma.c | 2 +- drivers/gpu/drm/via/via_drv.h | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 +- drivers/gpu/host1x/drm/drm.c | 2 +- drivers/staging/imx-drm/imx-drm-core.c | 2 +- include/drm/drmP.h | 7 +- include/drm/drm_flip_work.h | 71 ++++++++++++++++ 39 files changed, 443 insertions(+), 329 deletions(-) create mode 100644 drivers/gpu/drm/drm_flip_work.c delete mode 100644 drivers/gpu/drm/omapdrm/omap_gem_helpers.c create mode 100644 include/drm/drm_flip_work.h -- 1.8.3.1 [View Less]

5 19

i915 deadlock on laptop undock
by Roland Dreier 08 Oct '13

08 Oct '13

Hi, I have a Lenovo T410s (Ironlake/Arrandale graphics) that I use docked and connected to an external DP monitor (laptop is closed so the only active display is the DP monitor). With 3.12-rc4 I reproducably hit a deadlock when I undock the laptop -- it seems to be a deadlock on dev->mode_confix.mutext between intel_crtc_wait_for_pending_flips (mutex held because of drm_modeset_lock_all in intel_lid_notify) and drm_mode_getconnector. See below for the kernel logging (there's no logging … [View More]for more than 2 minutes before the hung task stuff) -- it seems that intel_crtc_wait_for_pending_flips is getting stuck, and then everything else piles up behind it: [ 241.009121] INFO: task kworker/0:1:70 blocked for more than 120 seconds. [ 241.009131] Tainted: G W 3.12.0-999-generic #201310070425 [ 241.009133] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 241.009137] kworker/0:1 D 0000000000000000 0 70 2 0x00000000 [ 241.009152] Workqueue: kacpi_notify acpi_os_execute_deferred [ 241.009156] ffff88022b2c9ae8 0000000000000046 ffff88022b2c9ab8 000000008e17de71 [ 241.009162] ffff88022b2c9fd8 ffff88022b2c9fd8 ffff88022b2c9fd8 00000000000144c0 [ 241.009167] ffffffff81c144a0 ffff88022b290000 0000000000000286 ffff88022ae70000 [ 241.009173] Call Trace: [ 241.009186] [<ffffffff81753619>] schedule+0x29/0x70 [ 241.009247] [<ffffffffa011eb9d>] intel_crtc_wait_for_pending_flips+0x8d/0x120 [i915] [ 241.009257] [<ffffffff8108cc30>] ? add_wait_queue+0x60/0x60 [ 241.009289] [<ffffffffa0127baf>] ironlake_crtc_disable+0x7f/0x2a0 [i915] [ 241.009318] [<ffffffffa012a0f6>] intel_crtc_update_dpms+0x76/0xb0 [i915] [ 241.009347] [<ffffffffa012d8e5>] intel_sanitize_crtc+0xd5/0x370 [i915] [ 241.009377] [<ffffffffa012e1ed>] intel_modeset_setup_hw_state+0x17d/0x380 [i915] [ 241.009407] [<ffffffffa01307a1>] intel_lid_notify+0xc1/0x100 [i915] [ 241.009412] [<ffffffff817596ad>] notifier_call_chain+0x4d/0x70 [ 241.009419] [<ffffffff81091ea8>] __blocking_notifier_call_chain+0x58/0x80 [ 241.009424] [<ffffffff81091ee6>] blocking_notifier_call_chain+0x16/0x20 [ 241.009431] [<ffffffff8142b15b>] acpi_lid_send_state+0x86/0xaf [ 241.009436] [<ffffffff8142b1e1>] acpi_button_notify+0x3b/0xa2 [ 241.009442] [<ffffffff814032f1>] acpi_device_notify+0x19/0x1b [ 241.009448] [<ffffffff814131cd>] acpi_ev_notify_dispatch+0x41/0x5c [ 241.009453] [<ffffffff813ff59e>] acpi_os_execute_deferred+0x25/0x32 [ 241.009458] [<ffffffff81083ccf>] process_one_work+0x17f/0x4d0 [ 241.009463] [<ffffffff81084f0b>] worker_thread+0x11b/0x3d0 [ 241.009468] [<ffffffff81084df0>] ? manage_workers.isra.20+0x1b0/0x1b0 [ 241.009473] [<ffffffff8108c0d0>] kthread+0xc0/0xd0 [ 241.009479] [<ffffffff8108c010>] ? flush_kthread_worker+0xb0/0xb0 [ 241.009484] [<ffffffff8175dfbc>] ret_from_fork+0x7c/0xb0 [ 241.009489] [<ffffffff8108c010>] ? flush_kthread_worker+0xb0/0xb0 [ 241.009525] INFO: task Xorg:1436 blocked for more than 120 seconds. [ 241.009528] Tainted: G W 3.12.0-999-generic #201310070425 [ 241.009531] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 241.009533] Xorg D 0000000000000000 0 1436 1410 0x00400004 [ 241.009538] ffff88022ca1bc48 0000000000000082 ffff88022ca1bc18 ffffffff811a31a1 [ 241.009543] ffff88022ca1bfd8 ffff88022ca1bfd8 ffff88022ca1bfd8 00000000000144c0 [ 241.009549] ffff880230198000 ffff8800b06546e0 ffff88022ca1bc28 ffff8800363b8330 [ 241.009554] Call Trace: [ 241.009562] [<ffffffff811a31a1>] ? kmem_cache_free+0x121/0x180 [ 241.009568] [<ffffffff81753619>] schedule+0x29/0x70 [ 241.009574] [<ffffffff8175394e>] schedule_preempt_disabled+0xe/0x10 [ 241.009580] [<ffffffff817518c4>] __mutex_lock_slowpath+0x114/0x1b0 [ 241.009585] [<ffffffff81751983>] mutex_lock+0x23/0x40 [ 241.009613] [<ffffffffa004e582>] drm_mode_getconnector+0xb2/0x430 [drm] [ 241.009633] [<ffffffffa003ef1a>] drm_ioctl+0x4fa/0x620 [drm] [ 241.009656] [<ffffffffa004e4d0>] ? drm_mode_getcrtc+0xe0/0xe0 [drm] [ 241.009663] [<ffffffff811cedda>] do_vfs_ioctl+0x7a/0x2e0 [ 241.009668] [<ffffffff811bcc01>] ? vfs_read+0x111/0x180 [ 241.009673] [<ffffffff811cf0d1>] SyS_ioctl+0x91/0xb0 [ 241.009678] [<ffffffff811bce40>] ? SyS_read+0x70/0xa0 [ 241.009683] [<ffffffff8175e06d>] system_call_fastpath+0x1a/0x1f Detailed lspci info for my laptop: 00:00.0 Host bridge [0600]: Intel Corporation Core Processor DRAM Controller [8086:0044] (rev 02) 00:02.0 VGA compatible controller [0300]: Intel Corporation Core Processor Integrated Graphics Controller [8086:0046] (rev 02) 00:16.0 Communication controller [0780]: Intel Corporation 5 Series/3400 Series Chipset HECI Controller [8086:3b64] (rev 06) 00:19.0 Ethernet controller [0200]: Intel Corporation 82577LM Gigabit Network Connection [8086:10ea] (rev 06) 00:1a.0 USB controller [0c03]: Intel Corporation 5 Series/3400 Series Chipset USB2 Enhanced Host Controller [8086:3b3c] (rev 06) 00:1b.0 Audio device [0403]: Intel Corporation 5 Series/3400 Series Chipset High Definition Audio [8086:3b57] (rev 06) 00:1c.0 PCI bridge [0604]: Intel Corporation 5 Series/3400 Series Chipset PCI Express Root Port 1 [8086:3b42] (rev 06) 00:1c.1 PCI bridge [0604]: Intel Corporation 5 Series/3400 Series Chipset PCI Express Root Port 2 [8086:3b44] (rev 06) 00:1c.3 PCI bridge [0604]: Intel Corporation 5 Series/3400 Series Chipset PCI Express Root Port 4 [8086:3b48] (rev 06) 00:1d.0 USB controller [0c03]: Intel Corporation 5 Series/3400 Series Chipset USB2 Enhanced Host Controller [8086:3b34] (rev 06) 00:1e.0 PCI bridge [0604]: Intel Corporation 82801 Mobile PCI Bridge [8086:2448] (rev a6) 00:1f.0 ISA bridge [0601]: Intel Corporation 5 Series/3400 Series Chipset LPC Interface Controller [8086:3b0f] (rev 06) 00:1f.2 SATA controller [0106]: Intel Corporation 5 Series/3400 Series Chipset 6 port SATA AHCI Controller [8086:3b2f] (rev 06) 00:1f.3 SMBus [0c05]: Intel Corporation 5 Series/3400 Series Chipset SMBus Controller [8086:3b30] (rev 06) 00:1f.6 Signal processing controller [1180]: Intel Corporation 5 Series/3400 Series Chipset Thermal Subsystem [8086:3b32] (rev 06) 03:00.0 Network controller [0280]: Intel Corporation Centrino Wireless-N 1000 [Condor Peak] [8086:0084] ff:00.0 Host bridge [0600]: Intel Corporation Core Processor QuickPath Architecture Generic Non-core Registers [8086:2c62] (rev 02) ff:00.1 Host bridge [0600]: Intel Corporation Core Processor QuickPath Architecture System Address Decoder [8086:2d01] (rev 02) ff:02.0 Host bridge [0600]: Intel Corporation Core Processor QPI Link 0 [8086:2d10] (rev 02) ff:02.1 Host bridge [0600]: Intel Corporation Core Processor QPI Physical 0 [8086:2d11] (rev 02) ff:02.2 Host bridge [0600]: Intel Corporation Core Processor Reserved [8086:2d12] (rev 02) ff:02.3 Host bridge [0600]: Intel Corporation Core Processor Reserved [8086:2d13] (rev 02) Please let me know if there is any way I can help debug this further. Thanks! Roland [View Less]

2 3

← Newer
1
...
81
82
83
84
85
86
87
...
93
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel October 2013