dri-devel April 2014

dri-devel@lists.freedesktop.org

153 participants
962 discussions

[Bug 76659] Display does not return from DPMS off using ATI drivers
by bugzilla-daemon＠freedesktop.org 04 Apr '14

04 Apr '14

https://bugs.freedesktop.org/show_bug.cgi?id=76659 --- Comment #8 from Alex Deucher <agd5f(a)yahoo.com> --- Does manually turning off the display also cause problems? e.g. run: xset dpms force off xset dpms force on from a terminal Can you get remote access to the box (e.g., ssh)? If so can you try manually turning the displays on/off? E.g., DISPLAY=:0.0 xset dpms force off DISPLAY=:0.0 xset dpms force on or DISPLAY=:0.0 xrandr --output DVI-0 --off DISPLAY=:0.0 xrandr --output DVI-… [View More]

1 0

[PATCH 0/3] Reset i2c connection between xfers
by Alex Deucher 04 Apr '14

04 Apr '14

When switching to the new common i2c over aux code, I ran into problems fetching the EDID on certain DP monitors. I tracked this down to the lack of bare address packets being sent between i2c transfers. This patch set adds that functionality which brings it back inline with the old drm dpm i2c algo. Originally, I added flags to note a bare address packet, but after review switched to sending a zero sized packet instead. Note that I'm not sure the other drivers that use these helpers … [View More]

3 5

[Bug 76659] Display does not return from DPMS off using ATI drivers
by bugzilla-daemon＠freedesktop.org 04 Apr '14

04 Apr '14

https://bugs.freedesktop.org/show_bug.cgi?id=76659 --- Comment #7 from Tyler Brock <tyler.brock(a)gmail.com> --- Any thoughts Alex? I basically need to restart my computer almost every time the screen turns off. I have no problem providing any help I could give you guys in figuring this out. -- You are receiving this mail because: You are the assignee for the bug.

1 0

[PULL] drm-intel-fixes
by Daniel Vetter 04 Apr '14

04 Apr '14

Hi Dave, Merge window -fixes pull request as usual. Well, I did sneak in Jani's drm_i915_private_t typedef removal, need to have fun with a big sed job too ;-) Otherwise: - hdmi interlaced fixes (Jesse&Ville) - pipe error/underrun/crc tracking fixes, regression in late 3.14-rc (but not cc: stable since only really relevant for igt runs) - large cursor wm fixes (Chris) - fix gpu turbo boost/throttle again, was getting stuck due to vlv rps patches (Chris+Imre) - fix runtime pm fallout (… [View More]Paulo) - bios framebuffer inherit fix (Chris) - a few smaller things Also a bunch with cc: stable in here. Note that I have a 3.14 release backmerge in here because of some vt-d stuff (which I then actually postponed for 3.16 ...). No conflicts really with current drm-next nor in the merge commit itself. I've frobbed the shortlog though to exclude anything already merged into Linus' tree. Jani and I decided that he'll take care of -fixes for 3.15 again and will take over after this pull request. For outstanding issues there's a bit of lifetime fun in the reset stats code still on older platforms. Chris is working on that and I didn't really want to delay this pull request. Cheers, Daniel The following changes since commit 698b3135acb94e838a33a69f1a7a684fe0d90734: drm/i915: Include a note about the dangers of I915_READ64/I915_WRITE64 (2014-03-21 16:13:14 +0100) are available in the git repository at: git://anongit.freedesktop.org/drm-intel tags/drm-intel-fixes-2014-04-04 for you to fetch changes up to 10b6ee4a87811a110cb01eaca01eb04da6801baf: Skip intel_crt_init for Dell XPS 8700 (2014-04-04 09:30:53 +0200) ---------------------------------------------------------------- Akash Goel (1): drm/i915: Remove the enabling of VS_TIMER_DISPATCH bit in MI MODE reg Chris Wilson (8): drm/i915: Compute WM for current cursor size drm/i915: Recompute WM when the cursor size changes drm/i915: Broadwell expands ACTHD to 64bit drm/i915: Split 64bit hexadecimal addresses to make them easier to read Revert "drm/i915: Disable/Enable PM Intrrupts based on the current freq." drm/i915: Refactor gen6_set_rps drm/i915: Mask PM/RPS interrupt generation based on activity drm/i915: Fix the computation of required fb size for pipe Damien Lespiau (1): drm/i915/bdw: Implement Wa4x4STCOptimizationDisable:bdw Daniel Vetter (6): drm/i915: add locking to fixed panel edid probing drm/i915: fix up semaphore_waits_for drm/i915: Fix initial pipe underrun state tracking drm/i915: Undo gtt scratch pte unmapping again Merge tag 'v3.14' into drm-intel-next-queued drm/i915: restrict vt-d stolen memory workaround to pre-gen8 Deepak S (2): drm/i915: Track the enabled PM interrupts in dev_priv. Revert "drm/i915/vlv: fixup DDR freq detection per Punit spec" Giacomo Comes (1): Skip intel_crt_init for Dell XPS 8700 Imre Deak (3): drm/i915: vlv: reserve the GT power context only once during driver init drm/i915: move power domain init earlier during system resume drm/i915: vlv: fix RPS interrupt mask setting Jani Nikula (9): drm/i915/tv: fix gen4 composite s-video tv-out drm/i915/debugfs: prefer struct drm_i915_private to drm_i915_private_t drm/i915/dma: prefer struct drm_i915_private to drm_i915_private_t drm/i915/gem: prefer struct drm_i915_private to drm_i915_private_t drm/i915/irq: prefer struct drm_i915_private to drm_i915_private_t drm/i915/display: prefer struct drm_i915_private to drm_i915_private_t drm/i915/ringbuffer: prefer struct drm_i915_private to drm_i915_private_t drm/i915/overlay: prefer struct drm_i915_private to drm_i915_private_t drm/i915: prefer struct drm_i915_private to drm_i915_private_t Jesse Barnes (1): drm/i915/vlv: use W_SYNC_SHIFT for interlaced modes on VLV Paulo Zanoni (7): drm/i915: don't schedule force_wake_timer at gen6_read drm/i915: get runtime PM at i915_reg_read_ioctl drm/i915: don't read pp_ctrl_reg if we're suspended drm/i915: get runtime PM at i915_display_info drm/i915: don't read cursor registers on powered down pipes drm/i915: fix WARNs when reading DDI state while suspended drm/i915: don't get/put runtime PM at the debugfs forcewake file Ville Syrjälä (3): drm/i915: Program VSYNCSHIFT in a more consistent manner drm/i915: Fix the interlace mode selection for gmch platforms drm/i915: Make sure vsyncshift is positive -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch [View Less]

1 0

[PATCH 1/4] drm/dp: add flags field to drm_dp_aux_msg struct
by Alex Deucher 04 Apr '14

04 Apr '14

This adds a flags field and a new flag, BARE_ADDRESS, which drivers can use for special handling when they want to set just the aux address. This is needed to properly reset the connection between i2c transactions. Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> --- include/drm/drm_dp_helper.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index b7488c9..a006e96 100644 --- a/include/drm/drm_dp_helper.h +++ b/… [View More]

2 5

[PATCH v4 00/34] drm/exynos: Refactor parts of the exynos driver
by Sean Paul 04 Apr '14

04 Apr '14

This patchset refactors parts of the exynos driver to move it closer to a proper drm driver (rather than just implementing a drm layer on top of the hardware drivers). The hope is to get to a point where the dp/hdmi drivers can implement drm_connector/drm_encoder directly, and fimd/mixer can directly implement drm_crtc. The notable changes in this set: - drm_encoder funcs no longer route through the crtc - DP driver has been moved from video into the drm driver - fimd no longer implements … [View More]encoder callbacks - exynos_drm_hdmi is removed in favor of generic manager/display handling At a glance, differences between v1 and v2: - Passing manager/display in callbacks instead of ctx - Tacked on some dpms patches on the end to handle suspend/resume through the dpms path At a glance, differences between v2 and v3: - Fixed vidi issues - Moved exynos_drm_hdmi.c removal to the right place - Added the exynos_drm_connector removal patches on the end At a glance, differences between v3 and v4: - Rebased on top of exynos-drm-next - Addressed review comments, no major functional changes Sean Daniel Kurtz (1): drm/exynos: hdmi: remove the i2c drivers and use devtree Sean Paul (32): drm/exynos: Rename hdmi_infoframe to avoid collision drm/exynos: Merge overlay_ops into manager_ops drm/exynos: Add an initialize function to manager and display drm/exynos: Use manager_op initialize in fimd drm/exynos: hdmi: Implement initialize op for hdmi drm/exynos: Pass exynos_drm_manager in manager ops instead of dev drm/exynos: Remove apply manager callback drm/exynos: Remove dpms link between encoder/connector drm/exynos: Rename display_op power_on to dpms drm/exynos: Don't keep dpms state in encoder drm/exynos: Use unsigned long for possible_crtcs drm/exynos: Split manager/display/subdrv ARM: dts: exynos: Add i2c phandles to hdmi node drm/exynos: Remove exynos_drm_hdmi shim drm/exynos: Use drm_mode_copy to copy modes drm/exynos: Disable unused crtc planes from crtc drm/exynos: Add mode_set manager operation drm/exynos: Implement mode_fixup manager operation drm/exynos: Use mode_set to configure fimd drm/exynos: Remove unused/useless fimd_context members drm/exynos: Move dp driver from video/ to drm/ drm/exynos: Move display implementation into dp ARM: dts: Move display-timings node from fimd to dp drm/exynos: Implement dpms display callback in DP drm/exynos: Clean up FIMD power on/off routines drm/exynos: Consolidate suspend/resume in drm_drv drm/exynos: Add create_connector callback drm/exynos: Implement drm_connector in hdmi directly drm/exynos: Implement drm_connector directly in dp driver drm/exynos: Implement drm_connector directly in vidi driver drm/exynos: Move lvds bridge discovery into DP driver drm/exynos: Remove the exynos_drm_connector shim Stéphane Marchesin (1): drm/exynos: Remove useless slab.h include .../devicetree/bindings/video/exynos_dp.txt | 17 + .../devicetree/bindings/video/exynos_hdmi.txt | 5 + .../devicetree/bindings/video/samsung-fimd.txt | 2 + MAINTAINERS | 7 - arch/arm/boot/dts/cros5250-common.dtsi | 6 +- arch/arm/boot/dts/exynos5250-arndale.dts | 7 +- arch/arm/boot/dts/exynos5250-smdk5250.dts | 13 +- arch/arm/boot/dts/exynos5250-snow.dts | 7 +- arch/arm/boot/dts/exynos5420-smdk5420.dts | 7 +- drivers/gpu/drm/exynos/Kconfig | 7 + drivers/gpu/drm/exynos/Makefile | 7 +- drivers/gpu/drm/exynos/exynos_ddc.c | 63 - drivers/gpu/drm/exynos/exynos_dp_core.c | 1357 ++++++++++++++++++++ drivers/gpu/drm/exynos/exynos_dp_core.h | 329 +++++ drivers/gpu/drm/exynos/exynos_dp_reg.c | 1243 ++++++++++++++++++ drivers/gpu/drm/exynos/exynos_dp_reg.h | 366 ++++++ drivers/gpu/drm/exynos/exynos_drm_connector.c | 304 ----- drivers/gpu/drm/exynos/exynos_drm_connector.h | 24 - drivers/gpu/drm/exynos/exynos_drm_core.c | 233 ++-- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 139 +- drivers/gpu/drm/exynos/exynos_drm_crtc.h | 20 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 155 ++- drivers/gpu/drm/exynos/exynos_drm_drv.h | 154 ++- drivers/gpu/drm/exynos/exynos_drm_encoder.c | 357 +---- drivers/gpu/drm/exynos/exynos_drm_encoder.h | 18 +- drivers/gpu/drm/exynos/exynos_drm_fb.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 682 ++++------ drivers/gpu/drm/exynos/exynos_drm_hdmi.c | 439 ------- drivers/gpu/drm/exynos/exynos_drm_hdmi.h | 67 - drivers/gpu/drm/exynos/exynos_drm_plane.c | 17 +- drivers/gpu/drm/exynos/exynos_drm_plane.h | 2 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 413 +++--- drivers/gpu/drm/exynos/exynos_hdmi.c | 370 +++--- drivers/gpu/drm/exynos/exynos_hdmi.h | 23 - drivers/gpu/drm/exynos/exynos_hdmiphy.c | 65 - drivers/gpu/drm/exynos/exynos_mixer.c | 573 ++++----- drivers/gpu/drm/exynos/exynos_mixer.h | 20 + drivers/video/exynos/Kconfig | 7 - drivers/video/exynos/Makefile | 1 - drivers/video/exynos/exynos_dp_core.c | 1156 ----------------- drivers/video/exynos/exynos_dp_core.h | 320 ----- drivers/video/exynos/exynos_dp_reg.c | 1243 ------------------ drivers/video/exynos/exynos_dp_reg.h | 366 ------ 43 files changed, 4864 insertions(+), 5751 deletions(-) delete mode 100644 drivers/gpu/drm/exynos/exynos_ddc.c create mode 100644 drivers/gpu/drm/exynos/exynos_dp_core.c create mode 100644 drivers/gpu/drm/exynos/exynos_dp_core.h create mode 100644 drivers/gpu/drm/exynos/exynos_dp_reg.c create mode 100644 drivers/gpu/drm/exynos/exynos_dp_reg.h delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_connector.c delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_connector.h delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_hdmi.c delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_hdmi.h delete mode 100644 drivers/gpu/drm/exynos/exynos_hdmi.h delete mode 100644 drivers/gpu/drm/exynos/exynos_hdmiphy.c create mode 100644 drivers/gpu/drm/exynos/exynos_mixer.h delete mode 100644 drivers/video/exynos/exynos_dp_core.c delete mode 100644 drivers/video/exynos/exynos_dp_core.h delete mode 100644 drivers/video/exynos/exynos_dp_reg.c delete mode 100644 drivers/video/exynos/exynos_dp_reg.h -- 1.8.5.1 [View Less]

7 61

[RFC 3/3] drm/ttm: Enable the priority queue for VRAM
by Lauri Kasanen 04 Apr '14

04 Apr '14

Signed-off-by: Lauri Kasanen <cand(a)gmx.com> --- drivers/gpu/drm/ttm/ttm_bo.c | 68 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 621151c..80e5856 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -172,7 +172,12 @@ void ttm_bo_add_to_lru(struct ttm_buffer_object *bo) BUG_ON(!list_empty(&bo->lru)); man = &bdev-&… [View More]gt;man[bo->mem.mem_type]; - list_add_tail(&bo->lru, &man->lru); + + if (bdev->use_pqueue && bo->mem.mem_type == TTM_PL_VRAM) + ttm_prio_add(&man->pqueue, &bo->pqueue); + else + list_add_tail(&bo->lru, &man->lru); + kref_get(&bo->list_kref); if (bo->ttm != NULL) { @@ -186,6 +191,8 @@ EXPORT_SYMBOL(ttm_bo_add_to_lru); int ttm_bo_del_from_lru(struct ttm_buffer_object *bo) { int put_count = 0; + struct ttm_bo_device *bdev = bo->bdev; + struct ttm_mem_type_manager *man = &bdev->man[bo->mem.mem_type]; if (!list_empty(&bo->swap)) { list_del_init(&bo->swap); @@ -194,6 +201,10 @@ int ttm_bo_del_from_lru(struct ttm_buffer_object *bo) if (!list_empty(&bo->lru)) { list_del_init(&bo->lru); ++put_count; + } else if (bdev->use_pqueue && bo->mem.mem_type == TTM_PL_VRAM && + ttm_prio_is_queued(&bo->pqueue)) { + ttm_prio_remove(&man->pqueue, &bo->pqueue); + ++put_count; } /* @@ -725,10 +736,22 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev, int ret = -EBUSY, put_count; spin_lock(&glob->lru_lock); - list_for_each_entry(bo, &man->lru, lru) { - ret = ttm_bo_reserve_nolru(bo, false, true, false, 0); - if (!ret) - break; + if (bdev->use_pqueue && mem_type == TTM_PL_VRAM) { + struct ttm_pqueue_entry *pe; + for (pe = ttm_prio_query_lowest(&man->pqueue); pe; + pe = ttm_prio_query_next(pe)) { + + bo = container_of(pe, struct ttm_buffer_object, pqueue); + ret = ttm_bo_reserve_nolru(bo, false, true, false, 0); + if (!ret) + break; + } + } else { + list_for_each_entry(bo, &man->lru, lru) { + ret = ttm_bo_reserve_nolru(bo, false, true, false, 0); + if (!ret) + break; + } } if (ret) { @@ -1125,6 +1148,7 @@ int ttm_bo_init(struct ttm_bo_device *bdev, INIT_LIST_HEAD(&bo->ddestroy); INIT_LIST_HEAD(&bo->swap); INIT_LIST_HEAD(&bo->io_reserve_lru); + ttm_prio_init_entry(&bo->pqueue); mutex_init(&bo->wu_mutex); bo->bdev = bdev; bo->glob = bdev->glob; @@ -1243,17 +1267,32 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev, */ spin_lock(&glob->lru_lock); - while (!list_empty(&man->lru)) { - spin_unlock(&glob->lru_lock); - 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 (bdev->use_pqueue && mem_type == TTM_PL_VRAM) { + while (ttm_prio_query_lowest(&man->pqueue)) { + spin_unlock(&glob->lru_lock); + ret = ttm_mem_evict_first(bdev, mem_type, false, false); + if (ret) { + if (allow_errors) { + return ret; + } else { + pr_err("Cleanup eviction failed\n"); + } } + spin_lock(&glob->lru_lock); + } + } else { + while (!list_empty(&man->lru)) { + spin_unlock(&glob->lru_lock); + ret = ttm_mem_evict_first(bdev, mem_type, false, false); + if (ret) { + if (allow_errors) { + return ret; + } else { + pr_err("Cleanup eviction failed\n"); + } + } + spin_lock(&glob->lru_lock); } - spin_lock(&glob->lru_lock); } spin_unlock(&glob->lru_lock); return 0; @@ -1338,6 +1377,7 @@ int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type, man->size = p_size; INIT_LIST_HEAD(&man->lru); + memset(&man->pqueue, 0, sizeof(struct ttm_pqueue)); return 0; } -- 1.8.3.1 [View Less]

1 0

[RFC 2/3] drm/ttm: Add the priority queue to appropriate structs
by Lauri Kasanen 04 Apr '14

04 Apr '14

Signed-off-by: Lauri Kasanen <cand(a)gmx.com> --- drivers/gpu/drm/ast/ast_ttm.c | 1 + drivers/gpu/drm/bochs/bochs_mm.c | 1 + drivers/gpu/drm/cirrus/cirrus_ttm.c | 1 + drivers/gpu/drm/mgag200/mgag200_ttm.c | 1 + drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +- drivers/gpu/drm/qxl/qxl_ttm.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 1 + drivers/gpu/drm/ttm/ttm_bo.c | 2 ++ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- include/drm/ttm/ttm_bo_api.h … [View More] | 2 ++ include/drm/ttm/ttm_bo_driver.h | 7 +++++++ 11 files changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c index 61f9e39..311f37f 100644 --- a/drivers/gpu/drm/ast/ast_ttm.c +++ b/drivers/gpu/drm/ast/ast_ttm.c @@ -263,6 +263,7 @@ int ast_mm_init(struct ast_private *ast) dev->anon_inode->i_mapping, DRM_FILE_PAGE_OFFSET, true, + false, 0); if (ret) { DRM_ERROR("Error initialising bo driver; %d\n", ret); diff --git a/drivers/gpu/drm/bochs/bochs_mm.c b/drivers/gpu/drm/bochs/bochs_mm.c index 9dfd24a..c4aba61 100644 --- a/drivers/gpu/drm/bochs/bochs_mm.c +++ b/drivers/gpu/drm/bochs/bochs_mm.c @@ -229,6 +229,7 @@ int bochs_mm_init(struct bochs_device *bochs) bochs->dev->anon_inode->i_mapping, DRM_FILE_PAGE_OFFSET, true, + false, 0); if (ret) { DRM_ERROR("Error initialising bo driver; %d\n", ret); diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c index 74e8e21..895d20e 100644 --- a/drivers/gpu/drm/cirrus/cirrus_ttm.c +++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c @@ -263,6 +263,7 @@ int cirrus_mm_init(struct cirrus_device *cirrus) dev->anon_inode->i_mapping, DRM_FILE_PAGE_OFFSET, true, + false, 0); if (ret) { DRM_ERROR("Error initialising bo driver; %d\n", ret); diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c index 6844b24..591f68e 100644 --- a/drivers/gpu/drm/mgag200/mgag200_ttm.c +++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c @@ -263,6 +263,7 @@ int mgag200_mm_init(struct mga_device *mdev) dev->anon_inode->i_mapping, DRM_FILE_PAGE_OFFSET, true, + false, 0); if (ret) { DRM_ERROR("Error initialising bo driver; %d\n", ret); diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c index 3fef97c..4b032b4 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c @@ -384,7 +384,7 @@ nouveau_ttm_init(struct nouveau_drm *drm) &nouveau_bo_driver, dev->anon_inode->i_mapping, DRM_FILE_PAGE_OFFSET, - bits <= 32 ? true : false, 0); + bits <= 32 ? true : false, false, 0); if (ret) { NV_ERROR(drm, "error initialising bo driver, %d\n", ret); return ret; diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c index 8401a00..88f12e7 100644 --- a/drivers/gpu/drm/qxl/qxl_ttm.c +++ b/drivers/gpu/drm/qxl/qxl_ttm.c @@ -495,7 +495,7 @@ int qxl_ttm_init(struct qxl_device *qdev) qdev->mman.bo_global_ref.ref.object, &qxl_bo_driver, qdev->ddev->anon_inode->i_mapping, - DRM_FILE_PAGE_OFFSET, 0, 0); + DRM_FILE_PAGE_OFFSET, 0, false, 0); if (r) { DRM_ERROR("failed initializing buffer object driver(%d).\n", r); return r; diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 1aef339..dd96ed5 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -711,6 +711,7 @@ int radeon_ttm_init(struct radeon_device *rdev) rdev->ddev->anon_inode->i_mapping, DRM_FILE_PAGE_OFFSET, rdev->need_dma32, + false, 512 * 1024); if (r) { DRM_ERROR("failed initializing buffer object driver(%d).\n", r); diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index caf7cd3..621151c 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1454,6 +1454,7 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev, struct address_space *mapping, uint64_t file_page_offset, bool need_dma32, + bool use_pqueue, uint32_t alloc_threshold) { int ret = -EINVAL; @@ -1477,6 +1478,7 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev, bdev->dev_mapping = mapping; bdev->glob = glob; bdev->need_dma32 = need_dma32; + bdev->use_pqueue = use_pqueue; bdev->alloc_threshold = alloc_threshold; bdev->val_seq = 0; spin_lock_init(&bdev->fence_lock); diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 59a50dd..12cdca4 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -725,7 +725,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) &vmw_bo_driver, dev->anon_inode->i_mapping, VMWGFX_FILE_PAGE_OFFSET, - false, 0); + false, false, 0); if (unlikely(ret != 0)) { DRM_ERROR("Failed initializing TTM buffer object driver.\n"); goto out_err1; diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index ee127ec..2d767c8 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h @@ -33,6 +33,7 @@ #include <drm/drm_hashtab.h> #include <drm/drm_vma_manager.h> +#include <ttm/ttm_priority.h> #include <linux/kref.h> #include <linux/list.h> #include <linux/wait.h> @@ -225,6 +226,7 @@ struct ttm_buffer_object { struct list_head ddestroy; struct list_head swap; struct list_head io_reserve_lru; + struct ttm_pqueue_entry pqueue; /** * Members protected by struct buffer_object_device::fence_lock diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 4924c487..b83871f 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -34,6 +34,7 @@ #include <ttm/ttm_memory.h> #include <ttm/ttm_module.h> #include <ttm/ttm_placement.h> +#include <ttm/ttm_priority.h> #include <drm/drm_mm.h> #include <drm/drm_global.h> #include <drm/drm_vma_manager.h> @@ -257,6 +258,7 @@ struct ttm_mem_type_manager_func { * @io_reserve_fastpath: Only use bdev::driver::io_mem_reserve to obtain * static information. bdev::driver::io_mem_free is never used. * @lru: The lru list for this memory type. + * @pqueue: The priority queue for this memory type. Only lru or pqueue is used. * * This structure is used to identify and manage memory types for a device. * It's set up by the ttm_bo_driver::init_mem_type method. @@ -295,6 +297,7 @@ struct ttm_mem_type_manager { */ struct list_head lru; + struct ttm_pqueue pqueue; }; /** @@ -527,6 +530,7 @@ struct ttm_bo_global { * @dev_mapping: A pointer to the struct address_space representing the * device address space. * @wq: Work queue structure for the delayed delete workqueue. + * @use_pqueue: Whether to use a priority queue for VRAM bos instead of lru. * @alloc_threshold: If non-zero, use this as the threshold for two-ended * allocation. * @@ -567,6 +571,7 @@ struct ttm_bo_device { struct delayed_work wq; bool need_dma32; + bool use_pqueue; uint32_t alloc_threshold; }; @@ -754,6 +759,7 @@ extern int ttm_bo_device_release(struct ttm_bo_device *bdev); * @file_page_offset: Offset into the device address space that is available * for buffer data. This ensures compatibility with other users of the * address space. + * @use_pqueue: Whether to use a priority queue for VRAM bos instead of lru. * @alloc_threshold: If non-zero, use this as the threshold for two-ended * allocation. * @@ -767,6 +773,7 @@ extern int ttm_bo_device_init(struct ttm_bo_device *bdev, struct address_space *mapping, uint64_t file_page_offset, bool need_dma32, + bool use_pqueue, uint32_t alloc_threshold); /** -- 1.8.3.1 [View Less]

1 0

[RFC 1/3] drm/ttm: Add a priority queue
by Lauri Kasanen 04 Apr '14

04 Apr '14

Signed-off-by: Lauri Kasanen <cand(a)gmx.com> --- drivers/gpu/drm/ttm/Makefile | 2 +- drivers/gpu/drm/ttm/ttm_priority.c | 152 +++++++++++++++++++++++++++++++++++++ include/drm/ttm/ttm_priority.h | 90 ++++++++++++++++++++++ 3 files changed, 243 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/ttm/ttm_priority.c create mode 100644 include/drm/ttm/ttm_priority.h diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile index b433b9f..4411599 … [View More]100644 --- a/drivers/gpu/drm/ttm/Makefile +++ b/drivers/gpu/drm/ttm/Makefile @@ -5,6 +5,6 @@ ccflags-y := -Iinclude/drm ttm-y := ttm_agp_backend.o ttm_memory.o ttm_tt.o ttm_bo.o \ ttm_bo_util.o ttm_bo_vm.o ttm_module.o \ ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o \ - ttm_bo_manager.o ttm_page_alloc_dma.o + ttm_bo_manager.o ttm_page_alloc_dma.o ttm_priority.o obj-$(CONFIG_DRM_TTM) += ttm.o diff --git a/drivers/gpu/drm/ttm/ttm_priority.c b/drivers/gpu/drm/ttm/ttm_priority.c new file mode 100644 index 0000000..a7cf8d1 --- /dev/null +++ b/drivers/gpu/drm/ttm/ttm_priority.c @@ -0,0 +1,152 @@ +/************************************************************************** + * + * Copyright (c) 2014 Lauri Kasanen + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. + * + **************************************************************************/ + + +#include <drm/ttm/ttm_priority.h> +#include <linux/bug.h> + +static void ttm_prio_insert_rb(struct rb_root * const root, + struct ttm_pqueue_entry * const data, + struct rb_node *parent, + struct rb_node **where) +{ + BUG_ON(!where || (!parent && root->rb_node)); + + rb_link_node(&data->node, parent, where); + rb_insert_color(&data->node, root); +} + +static struct ttm_pqueue_entry *ttm_prio_search_rb(struct rb_root *root, + u64 score, + struct rb_node **parent, + struct rb_node ***where) +{ + struct rb_node **new = &root->rb_node; + + while (*new) { + struct ttm_pqueue_entry *this = container_of(*new, + struct ttm_pqueue_entry, + node); + + *parent = *new; + + if (score < this->score) + new = &((*new)->rb_left); + else if (score > this->score) + new = &((*new)->rb_right); + else + return this; + + BUG_ON(*parent == *new); + } + + *where = new; + + return NULL; +} + +void ttm_prio_add(struct ttm_pqueue * const queue, + struct ttm_pqueue_entry * const entry) +{ + struct rb_root * const tree = &queue->tree; + struct rb_node **place = NULL, *parent = NULL; + struct ttm_pqueue_entry *test; + + if (ttm_prio_is_queued(entry)) + ttm_prio_remove(queue, entry); + + test = ttm_prio_search_rb(tree, entry->score, &parent, &place); + + if (!test) + ttm_prio_insert_rb(tree, entry, parent, place); + else + list_add_tail(&entry->list, &test->list); +} + +struct ttm_pqueue_entry *ttm_prio_query_lowest(const struct ttm_pqueue * const queue) +{ + const struct rb_root * const root = &queue->tree; + struct rb_node *node; + + node = rb_first(root); + if (!node) + return NULL; + + return container_of(node, struct ttm_pqueue_entry, node); +} + +void ttm_prio_remove(struct ttm_pqueue * const queue, + struct ttm_pqueue_entry * const entry) +{ + struct rb_root * const tree = &queue->tree; + + if (list_empty(&entry->list)) { + rb_erase(&entry->node, tree); + RB_CLEAR_NODE(&entry->node); + } else { + struct ttm_pqueue_entry *next = list_first_entry(&entry->list, + struct ttm_pqueue_entry, + list); + if (RB_EMPTY_NODE(&next->node) && !RB_EMPTY_NODE(&entry->node)) + rb_replace_node(&entry->node, &next->node, tree); + + list_del_init(&entry->list); + RB_CLEAR_NODE(&entry->node); + } +} + +void ttm_prio_init_entry(struct ttm_pqueue_entry * const entry) +{ + entry->score = 0; + RB_CLEAR_NODE(&entry->node); + INIT_LIST_HEAD(&entry->list); +} + +struct ttm_pqueue_entry *ttm_prio_query_next(struct ttm_pqueue_entry * const entry) +{ + struct ttm_pqueue_entry *next = list_next_entry(entry, list); + struct rb_node *node; + + if (list_empty(&entry->list)) { + node = rb_next(&entry->node); + if (!node) + return NULL; + return container_of(node, struct ttm_pqueue_entry, node); + } else if (!RB_EMPTY_NODE(&next->node)) { + node = rb_next(&next->node); + if (!node) + return NULL; + return container_of(node, struct ttm_pqueue_entry, node); + } else { + return next; + } +} + +int ttm_prio_is_queued(const struct ttm_pqueue_entry * const entry) +{ + return !(list_empty(&entry->list) && RB_EMPTY_NODE(&entry->node)); +} diff --git a/include/drm/ttm/ttm_priority.h b/include/drm/ttm/ttm_priority.h new file mode 100644 index 0000000..c3390cd --- /dev/null +++ b/include/drm/ttm/ttm_priority.h @@ -0,0 +1,90 @@ +/************************************************************************** + * + * Copyright (c) 2014 Lauri Kasanen + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. + * + **************************************************************************/ + +#ifndef TTM_PRIORITY_H +#define TTM_PRIORITY_H + +#include <linux/list.h> +#include <linux/rbtree.h> +#include <linux/types.h> + +/** + * struct ttm_pqueue - zero-initialize it when allocating + */ + +struct ttm_pqueue { + struct rb_root tree; +}; + +struct ttm_pqueue_entry { + u64 score; + struct rb_node node; + struct list_head list; +}; + +void ttm_prio_init_entry(struct ttm_pqueue_entry * const entry); + +/** + * ttm_prio_add - add this entry to the priority queue. + * Set the score before calling this. + */ + +void ttm_prio_add(struct ttm_pqueue * const queue, + struct ttm_pqueue_entry * const entry); + +/** + * ttm_prio_query_lowest - return the entry with the lowest score. + * + * Returns NULL if there are none. + */ + +struct ttm_pqueue_entry *ttm_prio_query_lowest(const struct ttm_pqueue * const queue); + +/** + * ttm_prio_remove - remove a previously queried entry from the queue. + */ + +void ttm_prio_remove(struct ttm_pqueue * const queue, + struct ttm_pqueue_entry * const entry); + +/** + * ttm_prio_query_next - walk the queue + * + * Returns NULL if there is no next entry. + */ + +struct ttm_pqueue_entry *ttm_prio_query_next(struct ttm_pqueue_entry * const entry); + +/** + * ttm_prio_is_queued - test if an entry is in the queue. + * + * Returns 1 if it is, 0 if not. + */ + +int ttm_prio_is_queued(const struct ttm_pqueue_entry * const entry); + +#endif -- 1.8.3.1 [View Less]

1 0

[GIT PULL v2] exynos-drm-next
by Inki Dae 04 Apr '14

04 Apr '14

Hi Dave, This pull request includes MIPI-DSI driver, two panel drivers, and relevant dt bindings. And I has excepted one patch series, super device support from exynos-drm-next because the patch series hadn't been reviewed by right maintainers and mailing list. The patch series is reasonable to me but we should have followed open source rule. Sorry for this. Summaries: - Add MIPI-DSI Driver, and dt bindigs - Add S6E8AA0 MIPI-DSI based panel drivers, and dt bindings - Add … [View More]LD9040 parallel panel driver . this driver is placed in drivers/gpu/drm/panel, and it seems to be used for exynos drm as of now, - Some fixups Changelog v2: - Remove super device support, and relevant dt bindings for more reviews. - Fix module build errors you pointed out. - Re-based it to drm-next again. If there is any problem, please kindly let me know. Thanks, Inki Dae The following changes since commit 66e514c14a1cb9c2540c685c40d94dc6ef6b6bb5: Merge tag 'drm-intel-next-2014-03-21' of git://anongit.freedesktop.org/drm-intel into drm-next (2014-04-03 07:51:54 +1000) 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 96e112c44477edea1c01fbb976205e751f4229b9: drm/bridge: export ptn3460_init function (2014-04-04 21:24:50 +0900) ---------------------------------------------------------------- Andrzej Hajda (15): drm/mipi_dsi: add flags to DSI messages drm/mipi_dsi: create dsi devices only for nodes with reg property drm/exynos: disallow fbdev initialization if no device is connected exynos/dsim: add DT bindings drm/exynos: add DSIM driver panel/s6e8aa0: add DT bindings panel/ld9040: add DT bindings drm/panel: add ld9040 driver ARM: dts: exynos4210-universal_c210: add proper panel node drm/panel: add S6E8AA0 driver ARM: dts: exynos4: add MIPI DSI Master node ARM: dts: exynos4210-trats: add panel node ARM: dts: exynos4412-trats2: add panel node ARM: dts: exynos4210-trats: enable exynos/fimd node ARM: dts: exynos4412-trats2: enable exynos/fimd node Inki Dae (2): drm/exynos: remove MODULE_DEVICE_TABLE definitions drm/bridge: export ptn3460_init function .../devicetree/bindings/panel/samsung,ld9040.txt | 66 + .../devicetree/bindings/panel/samsung,s6e8aa0.txt | 56 + .../devicetree/bindings/video/exynos_dsim.txt | 80 + arch/arm/boot/dts/exynos4.dtsi | 14 + arch/arm/boot/dts/exynos4210-trats.dts | 61 + arch/arm/boot/dts/exynos4210-universal_c210.dts | 71 +- arch/arm/boot/dts/exynos4412-trats2.dts | 70 + drivers/gpu/drm/bridge/ptn3460.c | 1 + drivers/gpu/drm/drm_mipi_dsi.c | 6 +- drivers/gpu/drm/exynos/Kconfig | 9 + drivers/gpu/drm/exynos/Makefile | 1 + drivers/gpu/drm/exynos/exynos_dp_core.c | 1 - drivers/gpu/drm/exynos/exynos_drm_drv.c | 15 + drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1524 ++++++++++++++++++++ drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 21 + drivers/gpu/drm/panel/Kconfig | 14 + drivers/gpu/drm/panel/Makefile | 2 + drivers/gpu/drm/panel/panel-ld9040.c | 376 +++++ drivers/gpu/drm/panel/panel-s6e8aa0.c | 1069 ++++++++++++++ include/drm/drm_mipi_dsi.h | 6 + 21 files changed, 3445 insertions(+), 19 deletions(-) create mode 100644 Documentation/devicetree/bindings/panel/samsung,ld9040.txt create mode 100644 Documentation/devicetree/bindings/panel/samsung,s6e8aa0.txt create mode 100644 Documentation/devicetree/bindings/video/exynos_dsim.txt create mode 100644 drivers/gpu/drm/exynos/exynos_drm_dsi.c create mode 100644 drivers/gpu/drm/panel/panel-ld9040.c create mode 100644 drivers/gpu/drm/panel/panel-s6e8aa0.c [View Less]

1 0

← Newer
1
...
87
88
89
90
91
92
93
...
97
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel April 2014