dri-devel November 2012

dri-devel@lists.freedesktop.org

126 participants
797 discussions

some drm cleanups to pull
by Rob Clark 30 Nov '12

30 Nov '12

Hi Dave, I've rebased the patch series to remove usage of and drop the legacy connector-property functions and replace w/ object-property which can be pulled from: git://github.com/robclark/kernel-omap4.git connector-to-object-prop There was one additional connector->object rename needed in i915 since one new call to drm_connector_property() snuck in after the first patch was merged. BR, -R drivers/gpu/drm/drm_crtc.c | 31 +++----------- drivers/gpu/drm/drm_fb_helper.c | 2 +- drivers/gpu/drm/drm_sysfs.c | 6 +-- drivers/gpu/drm/gma500/cdv_device.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 6 +-- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 10 ++--- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 10 ++--- drivers/gpu/drm/gma500/mdfld_intel_display.c | 2 +- drivers/gpu/drm/gma500/oaktrail_crtc.c | 2 +- drivers/gpu/drm/gma500/oaktrail_lvds.c | 8 ++-- drivers/gpu/drm/gma500/psb_intel_lvds.c | 10 ++--- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 24 +++++------ drivers/gpu/drm/i2c/ch7006_drv.c | 20 ++++----- drivers/gpu/drm/i915/intel_dp.c | 4 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 22 +++++----- drivers/gpu/drm/nouveau/nv17_tv.c | 16 +++---- drivers/gpu/drm/radeon/radeon_connectors.c | 62 ++++++++++++++-------------- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +- drivers/gpu/drm/udl/udl_connector.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +- include/drm/drm_crtc.h | 8 ---- 23 files changed, 114 insertions(+), 143 deletions(-)

1 0

[Bug 42627] Hibernation fails to resume - Toshiba Satellite L755-161 notebook
by bugzilla-daemon＠bugzilla.kernel.org 30 Nov '12

30 Nov '12

https://bugzilla.kernel.org/show_bug.cgi?id=42627 --- Comment #25 from Harald Brennich <harald.brennich(a)gmx.de> 2012-11-30 16:41:04 --- After installing openSuse 12.2 with kernel 3.4.11-2.16-desktop, resume from s2disk works with the nouveau driver. There is one (small) drawback compared to the nvidia driver: during resume, the notebook lid must remain open. With nvidia, the lid could be closed after pressing the power button. I haven't tested s2disk on openSuse 12.2 with the 3.5.x and 3.6.x kernels. -- Configure bugmail: https://bugzilla.kernel.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching the assignee of the bug.

1 0

[GIT PULL v2] exynos-drm-next
by Inki Dae 30 Nov '12

30 Nov '12

Hi Dave, This is second time pull request for -next and based on previous pull request. For this, please refer to the below link, http://permalink.gmane.org/gmane.comp.video.dri.devel/76834 And a summary to this is as the following: - add sending AVI and AVI info frames. . this adds some codes for composing AVI and AUI info frames and send them every VSYNC for HDMI Certification. - bug fix to previous pull request. - add some code cleanup And the below is patches being reviewed so not merged yet. - add ipp subsystem. it's so big modules. drm/exynos: add ipp subsystem and each ipp drivers drm/exynos: add ipp subsystem drm/exynos: add fimc ipp driver drm/exynos: add rotator ipp driver drm/exynos: add gsc ipp driver - add runtime pm support for hdmi and mixer. drm/exynos: added runtime pm support for hdmi drm/exynos: add runtime pm support for mixer drm/exynos: add support for hdmiphy power control for exynos5 - and maybe some fixups and cleanups. The above patch sets will be merged after reviewed enough and maybe these will be last pull request for -next. If there is any problem, please let me know. Thanks, Inki Dae The following changes since commit 660c51e92f5357f351b483fa9d82451344ed25a4: drm/exynos: add exynos drm specific fb_mmap function (2012-11-29 03:30:38 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git exynos-drm-next for you to fetch changes up to d9f25388ec9034c9bf2c1dcfe162607a604049cf: drm/exynos: sending AVI and AUI info frames (2012-11-29 03:30:40 -0800) ---------------------------------------------------------------- Egbert Eich (1): drm/exynos: fix memory leak to EDID block Prathyush K (2): drm/exynos: remove 'pages' and 'page_size' elements in exynos gem buffer drm/exynos: use sgt instead of pages for framebuffer address Rahul Sharma (2): drm: exynos: fix for loosing display mode header during mode adjustment drm/exynos: sending AVI and AUI info frames Sachin Kamat (5): drm/exynos: Use devm_clk_get in exynos_drm_g2d.c drm/exynos: Fix potential NULL pointer dereference drm/exynos: Use devm_clk_get in exynos_mixer.c drm/exynos: Use devm_* APIs in exynos_hdmi.c drm/exynos: Use devm_clk_get in exynos_drm_fimd.c YoungJun Cho (1): drm/exynos: Unreference fb in exynos_disable_plane() drivers/gpu/drm/exynos/exynos_drm_buf.c | 20 --- drivers/gpu/drm/exynos/exynos_drm_buf.h | 4 +- drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 3 +- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 31 +--- drivers/gpu/drm/exynos/exynos_drm_g2d.c | 6 +- drivers/gpu/drm/exynos/exynos_drm_gem.c | 37 ++--- drivers/gpu/drm/exynos/exynos_drm_gem.h | 4 - drivers/gpu/drm/exynos/exynos_drm_plane.c | 12 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 235 +++++++++++++++++++++-------- drivers/gpu/drm/exynos/exynos_mixer.c | 59 ++------ drivers/gpu/drm/exynos/regs-hdmi.h | 17 ++- 12 files changed, 238 insertions(+), 194 deletions(-)

3 3

[PATCH] drm/ttm: do not check if list is empty in ttm_bo_force_list_clean, v2
by Maarten Lankhorst 30 Nov '12

30 Nov '12

Just use the return error from ttm_mem_evict_first instead. Changes since v1: - Add warning if list is not empty, nothing else we can do here. Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> --- drivers/gpu/drm/ttm/ttm_bo.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 8ab23ae..9028327 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1323,25 +1323,25 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev, struct ttm_bo_global *glob = bdev->glob; int ret; - /* - * Can't use standard list traversal since we're unlocking. - */ - - spin_lock(&glob->lru_lock); - while (!list_empty(&man->lru)) { - spin_unlock(&glob->lru_lock); + do { ret = ttm_mem_evict_first(bdev, mem_type, false, false); - if (ret) { - if (allow_errors) { - return ret; - } else { - pr_err("Cleanup eviction failed\n"); - } + if (ret && ret != -EBUSY && !allow_errors) { + pr_err("Cleanup eviction failed with %i\n", ret); + ret = 0; } + } while (!ret); + + if (likely(ret == -EBUSY)) { + /* + * lru list should be empty, verify this is the case. + */ spin_lock(&glob->lru_lock); + WARN_ON(!list_empty(&man->lru)); + if (list_empty(&man->lru) || !allow_errors) + ret = 0; + spin_unlock(&glob->lru_lock); } - spin_unlock(&glob->lru_lock); - return 0; + return ret; } int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)

2 3

[PATCH, FIXED] drm/vmwgfx: always use ttm_bo_is_reserved
by Maarten Lankhorst 30 Nov '12

30 Nov '12

This was missed during the initial conversion, most likely due to the refactoring here. Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> --- Woops, forgot to stg refresh before sending, fixed. :-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index 93dffe3..ddc8db8 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c @@ -939,13 +939,13 @@ void vmw_resource_unreserve(struct vmw_resource *res, if (new_backup && new_backup != res->backup) { if (res->backup) { - BUG_ON(atomic_read(&res->backup->base.reserved) == 0); + BUG_ON(!ttm_bo_is_reserved(&res->backup->base)); list_del_init(&res->mob_head); vmw_dmabuf_unreference(&res->backup); } res->backup = vmw_dmabuf_reference(new_backup); - BUG_ON(atomic_read(&new_backup->base.reserved) == 0); + BUG_ON(!ttm_bo_is_reserved(&new_backup->base)); list_add_tail(&res->mob_head, &new_backup->res_list); } if (new_backup)

2 1

[PATCH] drm/vmwgfx: always use ttm_bo_is_reserved
by Maarten Lankhorst 30 Nov '12

30 Nov '12

This was missed during the initial conversion, most likely due to the refactoring here. Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> --- diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index 93dffe3..783a448 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c @@ -939,13 +939,13 @@ void vmw_resource_unreserve(struct vmw_resource *res, if (new_backup && new_backup != res->backup) { if (res->backup) { - BUG_ON(atomic_read(&res->backup->base.reserved) == 0); + BUG_ON(!ttm_bo_is_reserved(&res->backup.base)); list_del_init(&res->mob_head); vmw_dmabuf_unreference(&res->backup); } res->backup = vmw_dmabuf_reference(new_backup); - BUG_ON(atomic_read(&new_backup->base.reserved) == 0); + BUG_ON(!ttm_bo_is_reserved(&new_backup->base)); list_add_tail(&res->mob_head, &new_backup->res_list); } if (new_backup)

1 0

[PATCH 1/6] drm/ttm: change fence_lock to inner lock
by Maarten Lankhorst 29 Nov '12

29 Nov '12

This requires changing the order in ttm_bo_cleanup_refs_or_queue to take the reservation first, as there is otherwise no race free way to take lru lock before fence_lock. Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> --- drivers/gpu/drm/ttm/ttm_bo.c | 31 +++++++++++-------------------- drivers/gpu/drm/ttm/ttm_execbuf_util.c | 4 ++-- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 7426fe5..202fc20 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -500,27 +500,17 @@ static void ttm_bo_cleanup_refs_or_queue(struct ttm_buffer_object *bo) { struct ttm_bo_device *bdev = bo->bdev; struct ttm_bo_global *glob = bo->glob; - struct ttm_bo_driver *driver; + struct ttm_bo_driver *driver = bdev->driver; void *sync_obj = NULL; int put_count; int ret; + spin_lock(&glob->lru_lock); + ret = ttm_bo_reserve_locked(bo, false, true, false, 0); + spin_lock(&bdev->fence_lock); (void) ttm_bo_wait(bo, false, false, true); - if (!bo->sync_obj) { - - spin_lock(&glob->lru_lock); - - /** - * Lock inversion between bo:reserve and bdev::fence_lock here, - * but that's OK, since we're only trylocking. - */ - - ret = ttm_bo_reserve_locked(bo, false, true, false, 0); - - if (unlikely(ret == -EBUSY)) - goto queue; - + if (!ret && !bo->sync_obj) { spin_unlock(&bdev->fence_lock); put_count = ttm_bo_del_from_lru(bo); @@ -530,18 +520,19 @@ static void ttm_bo_cleanup_refs_or_queue(struct ttm_buffer_object *bo) ttm_bo_list_ref_sub(bo, put_count, true); return; - } else { - spin_lock(&glob->lru_lock); } -queue: - driver = bdev->driver; if (bo->sync_obj) sync_obj = driver->sync_obj_ref(bo->sync_obj); + spin_unlock(&bdev->fence_lock); + + if (!ret) { + atomic_set(&bo->reserved, 0); + wake_up_all(&bo->event_queue); + } kref_get(&bo->list_kref); list_add_tail(&bo->ddestroy, &bdev->ddestroy); spin_unlock(&glob->lru_lock); - spin_unlock(&bdev->fence_lock); if (sync_obj) { driver->sync_obj_flush(sync_obj); diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c b/drivers/gpu/drm/ttm/ttm_execbuf_util.c index 1986d00..cd9e452 100644 --- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c +++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c @@ -213,8 +213,8 @@ void ttm_eu_fence_buffer_objects(struct list_head *list, void *sync_obj) driver = bdev->driver; glob = bo->glob; - spin_lock(&bdev->fence_lock); spin_lock(&glob->lru_lock); + spin_lock(&bdev->fence_lock); list_for_each_entry(entry, list, head) { bo = entry->bo; @@ -223,8 +223,8 @@ void ttm_eu_fence_buffer_objects(struct list_head *list, void *sync_obj) ttm_bo_unreserve_locked(bo); entry->reserved = false; } - spin_unlock(&glob->lru_lock); spin_unlock(&bdev->fence_lock); + spin_unlock(&glob->lru_lock); list_for_each_entry(entry, list, head) { if (entry->old_sync_obj) -- 1.8.0

3 21

[PATCH] drm/radeon: fix rare segfault after gpu lockup on r7xx
by j.glisse＠gmail.com 29 Nov '12

29 Nov '12

From: Jerome Glisse <jglisse(a)redhat.com> If GPU reset fails the gart table ptr might be NULL avoid a kernel segfault in this rare event. Signed-off-by: Jerome Glisse <jglisse(a)redhat.com> --- drivers/gpu/drm/radeon/r600.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index cda280d..0e3a68a 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -843,7 +843,9 @@ void r600_pcie_gart_tlb_flush(struct radeon_device *rdev) * method for them. */ WREG32(HDP_DEBUG1, 0); - tmp = readl((void __iomem *)ptr); + if (ptr) { + tmp = readl((void __iomem *)ptr); + } } else WREG32(R_005480_HDP_MEM_COHERENCY_FLUSH_CNTL, 0x1); -- 1.7.11.7

1 0

[PULL] last drm-intel-next for 3.8
by Daniel Vetter 29 Nov '12

29 Nov '12

Hi Dave, Besides the big item of lifting the "preliminary hw support" tag from the Haswell code, just small bits&pieces all over: - Leftover Haswell patches and some fixes from Paulo - LyncPoint PCH support (for hsw) - OOM handling improvements from Chris Wilson - connector property and send_vblank_event refactorings from Rob Clark - random pile of small fixes Note that the send_vblank refactorings will cause some locking WARNs to show up. Imre has fixed that up, but since all the driver changes outside of the drm core have been for exonys, those four patches are merged through the exonys-next tree. Yours, Daniel The following changes since commit bf6f036848ab2151c2498f11cb7d31a52a95dd5c: drm/vmwgfx: Make vmw_dmabuf_unreference handle NULL objects (2012-11-20 16:19:59 +1000) are available in the git repository at: git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2012-11-23 for you to fetch changes up to 70b12bb415463c1bd146b67c5fbf6784fd046ad9: drm/i915: promote Haswell to full support (2012-11-23 19:40:14 +0100) ---------------------------------------------------------------- Ben Widawsky (2): drm/i915: Fix warning in i915_gem_chipset_flush drm/i915: Use pci_resource functions for BARs. Chris Wilson (11): drm/i915: Use LRI to update the semaphore registers drm/i915: Remove save/restore of physical HWS_PGA register drm/i915: Remove bogus test for a present execbuffer drm/i915: Guard pages being reaped by OOM whilst binding-to-GTT drm/i915: Pin the object whilst faulting it in drm/i915: Flush outstanding unpin tasks before pageflipping drm/i915: Apply the IBX transcoder A w/a for HDMI to SDVO as well drm/i915: Defer assignment of obj->gtt_space until after all possible mallocs drm/i915: Borrow our struct_mutex for the direct reclaim drm/i915: LVDS fallback to fixed-mode if EDID not present drm/i915: Report the origin of the LVDS fixed panel mode Damien Lespiau (1): drm/i915: Only check for valid PP_{ON, OFF}_DELAYS on pre ILK hardware Daniel Vetter (2): drm/i915: drop buggy write to FDI_RX_CHICKEN register drm/i915: resurrect panel lid handling Jani Nikula (1): drm/i915/sdvo: kfree the intel_sdvo_connector, not drm_connector, on destroy Jean Delvare (1): drm/i915: Optimize DIV_ROUND_CLOSEST call Paulo Zanoni (10): drm/i915: don't limit Haswell CRT encoder to pipe A drm/i915: use cpu/pch transcoder on intel_enable_pipe drm/i915: fix false positive "Unclaimed write" messages drm/i915: make DP work on LPT-LP machines drm/i915: don't intel_crt_init if DDI A has 4 lanes drm/i915: make the panel fitter work on pipes B and C on IVB drm/i915: make the panel fitter work on pipes B and C on Haswell drm/i915: fix intel_ddi_get_cdclk_freq for ULT machines drm/i915: implement WaMbcDriverBootEnable on Haswell drm/i915: promote Haswell to full support Rob Clark (2): drm/i915: use drm_send_vblank_event() helper drm/i915: drm_connector_property -> drm_object_property Takashi Iwai (1): drm/i915: Enable DP audio for Haswell Wei Shun Chang (1): drm/i915: add LynxPoint-LP PCH ID drivers/gpu/drm/i915/i915_drv.c | 26 ++++--- drivers/gpu/drm/i915/i915_drv.h | 13 +++- drivers/gpu/drm/i915/i915_gem.c | 102 ++++++++++++++++------------ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 9 --- drivers/gpu/drm/i915/i915_gem_gtt.c | 8 +-- drivers/gpu/drm/i915/i915_reg.h | 4 ++ drivers/gpu/drm/i915/i915_suspend.c | 8 --- drivers/gpu/drm/i915/intel_bios.c | 3 +- drivers/gpu/drm/i915/intel_crt.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 11 +++ drivers/gpu/drm/i915/intel_display.c | 80 +++++++++++----------- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 4 +- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 24 ++++--- drivers/gpu/drm/i915/intel_modes.c | 4 +- drivers/gpu/drm/i915/intel_panel.c | 25 +++---- drivers/gpu/drm/i915/intel_pm.c | 25 ++++++- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +- drivers/gpu/drm/i915/intel_sdvo.c | 64 +++++++++++++---- drivers/gpu/drm/i915/intel_tv.c | 14 ++-- 21 files changed, 260 insertions(+), 177 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch

1 1

[git pull] drm fixes
by Dave Airlie 29 Nov '12

29 Nov '12

Hi Linus just driver fixes, nothing major, except maybe ilk rc6 disable. intel: revert ironlake rc6 - we still have one ilk regression, but this gets rid of one big one, turn off cloning, and a directed fix for Apple edp radeon: one modesetting fix exynos: minor fixes Dave. The following changes since commit 9489e9dcae718d5fde988e4a684a0f55b5f94d17: Linux 3.7-rc7 (2012-11-25 17:59:19 -0800) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes for you to fetch changes up to e548a83c34806b8bc2c55f52d3bc481a13a3829e: Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux (2012-11-28 16:51:10 +1000) ---------------------------------------------------------------- Chris Wilson (1): Revert "drm/i915: enable rc6 on ilk again" Daniel Vetter (1): drm/i915: disable cloning on sdvo Dave Airlie (3): Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel Merge branch 'exynos-drm-fixes' of git://git.kernel.org/.../daeinki/drm-exynos Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux Inki Dae (3): drm/exynos: fix linux framebuffer address setting. drm/exynos: remove unnecessary code. drm/exynos: fix overlay updating issue Jani Nikula (1): drm/i915: do not default to 18 bpp for eDP if missing from VBT Jerome Glisse (1): radeon: fix pll/ctrc mapping on dce2 and dce3 hardware Sachin Kamat (2): drm/exynos: Make exynos4/5_fimd_driver_data static drm/exynos: Fix potential NULL pointer dereference in exynos_drm_encoder.c drivers/gpu/drm/exynos/exynos_drm_encoder.c | 8 ++++- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 3 +- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 4 +-- drivers/gpu/drm/exynos/exynos_drm_plane.c | 1 - drivers/gpu/drm/i915/intel_bios.c | 11 ++----- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 12 ++------ drivers/gpu/drm/i915/intel_sdvo.c | 17 +++++----- drivers/gpu/drm/radeon/atombios_crtc.c | 48 +++++++++-------------------- 9 files changed, 41 insertions(+), 65 deletions(-)

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel November 2012