dri-devel December 2014

dri-devel@lists.freedesktop.org

156 participants
1053 discussions

[PATCH] drm: fix a typo in a comment
by Martin Peres 09 Dec '14

09 Dec '14

Spotted while reviewing the DRM changes in Linux 3.18 for LinuxFR. Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Signed--off-by: Martin Peres <martin.peres(a)free.fr> --- drivers/gpu/drm/drm_irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 0e47df4..f5a5f18 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -166,7 +166,7 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc) spin_lock_irqsave(&dev->vblank_time_lock, irqflags); /* - * If the vblank interrupt was already disbled update the count + * If the vblank interrupt was already disabled update the count * and timestamp to maintain the appearance that the counter * has been ticking all along until this time. This makes the * count account for the entire time between drm_vblank_on() and -- 2.1.3

2 1

[PATCH 1/6] drm/radeon: take a fence reference in the sync code
by Christian König 09 Dec '14

09 Dec '14

From: Christian König <christian.koenig(a)amd.com> Just to be sure that fences we sync to won't be released while accessed. Signed-off-by: Christian König <christian.koenig(a)amd.com> --- drivers/gpu/drm/radeon/radeon_sync.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_sync.c b/drivers/gpu/drm/radeon/radeon_sync.c index 02ac8a1..6fccaaf 100644 --- a/drivers/gpu/drm/radeon/radeon_sync.c +++ b/drivers/gpu/drm/radeon/radeon_sync.c @@ -69,11 +69,15 @@ void radeon_sync_fence(struct radeon_sync *sync, return; other = sync->sync_to[fence->ring]; - sync->sync_to[fence->ring] = radeon_fence_later(fence, other); + sync->sync_to[fence->ring] = radeon_fence_ref( + radeon_fence_later(fence, other)); + radeon_fence_unref(&other); if (fence->is_vm_update) { other = sync->last_vm_update; - sync->last_vm_update = radeon_fence_later(fence, other); + sync->last_vm_update = radeon_fence_ref( + radeon_fence_later(fence, other)); + radeon_fence_unref(&other); } } @@ -217,4 +221,9 @@ void radeon_sync_free(struct radeon_device *rdev, for (i = 0; i < RADEON_NUM_SYNCS; ++i) radeon_semaphore_free(rdev, &sync->semaphores[i], fence); + + for (i = 0; i < RADEON_NUM_RINGS; ++i) + radeon_fence_unref(&sync->sync_to[i]); + + radeon_fence_unref(&sync->last_vm_update); } -- 1.9.1

2 7

[PATCH] drm/dp: retry AUX transactions 32 times (v1.1)
by Dave Airlie 09 Dec '14

09 Dec '14

From: Dave Airlie <airlied(a)redhat.com> At least on two MST devices I've tested with, when they are link training downstream, they are totally unable to handle aux ch msgs, so they defer like nuts. I tried 16, it wasn't enough, 32 seems better. This fixes one Dell 4k monitor and one of the MST hubs. v1.1: fixup comment (Tom). Signed-off-by: Dave Airlie <airlied(a)redhat.com> --- drivers/gpu/drm/drm_dp_helper.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index 959e207..79968e3 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -186,10 +186,11 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, /* * The specification doesn't give any recommendation on how often to - * retry native transactions, so retry 7 times like for I2C-over-AUX - * transactions. + * retry native transactions. We used to retry 7 times like for + * aux i2c transactions but real world devices this wasn't + * sufficient, bump to 32 which makes Dell 4k monitors happier. */ - for (retry = 0; retry < 7; retry++) { + for (retry = 0; retry < 32; retry++) { mutex_lock(&aux->hw_mutex); err = aux->transfer(aux, &msg); -- 2.1.0

3 4

[PATCH 1/2] drm/dp: retry AUX transactions 32 times
by Dave Airlie 08 Dec '14

08 Dec '14

From: Dave Airlie <airlied(a)redhat.com> At least on two MST devices I've tested with, when they are link training downstream, they are totally unable to handle aux ch msgs, so they defer like nuts. I tried 16, it wasn't enough, 32 seems better. This fixes one Dell 4k monitor and one of the MST hubs. Signed-off-by: Dave Airlie <airlied(a)redhat.com> --- drivers/gpu/drm/drm_dp_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index 959e207..db0993f 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -189,7 +189,7 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, * retry native transactions, so retry 7 times like for I2C-over-AUX * transactions. */ - for (retry = 0; retry < 7; retry++) { + for (retry = 0; retry < 32; retry++) { mutex_lock(&aux->hw_mutex); err = aux->transfer(aux, &msg); -- 2.1.0

4 6

[UDL] NULL pointer dereference in udl_driver_unload->drm_vblank_cleanup
by Thomas Meyer 08 Dec '14

08 Dec '14

Dez 08 22:21:08 localhost.localdomain kernel: Restarting tasks ... done. Dez 08 22:21:08 localhost.localdomain kernel: video LNXVIDEO:00: Restoring backlight state Dez 08 22:21:08 localhost.localdomain kernel: BUG: unable to handle kernel NULL pointer dereference at (null) Dez 08 22:21:12 localhost.localdomain kernel: IP: [< (null)>] (null) Dez 08 22:21:12 localhost.localdomain kernel: PGD 235638067 PUD 235284067 PMD 0 Dez 08 22:21:12 localhost.localdomain kernel: Oops: 0010 [#1] PREEMPT SMP Dez 08 22:21:12 localhost.localdomain kernel: Modules linked in: bluetooth fuse ip6t_rpfilter ip6t_REJECT nf_reject_ipv6 xt_conntrack ip6table_nat nf_conntrack_ipv6 nf_defrag_ipv6 nf_nat_ipv Dez 08 22:21:12 localhost.localdomain kernel: CPU: 0 PID: 984 Comm: Xorg.bin Not tainted 3.18.0-rc6-00565-g3314bf6 #171 Dez 08 22:21:12 localhost.localdomain kernel: Hardware name: Acer Aspire 1810T/JM11-MS, BIOS v1.3310 03/25/2010 Dez 08 22:21:12 localhost.localdomain kernel: task: ffff8802360dd330 ti: ffff8800b49dc000 task.ti: ffff8800b49dc000 Dez 08 22:21:12 localhost.localdomain kernel: RIP: 0010:[<0000000000000000>] [< (null)>] (null) Dez 08 22:21:12 localhost.localdomain kernel: RSP: 0018:ffff8800b49dfcf0 EFLAGS: 00010046 Dez 08 22:21:12 localhost.localdomain kernel: RAX: ffffffffc0187140 RBX: 0000000000000000 RCX: 0000000000000000 Dez 08 22:21:12 localhost.localdomain kernel: RDX: 00000000000a0eb2 RSI: 0000000000000000 RDI: ffff88009d41d000 Dez 08 22:21:12 localhost.localdomain kernel: RBP: ffff8800b49dfd78 R08: 000000008baf7fc7 R09: 0000000000000000 Dez 08 22:21:12 localhost.localdomain kernel: R10: 0000000000000000 R11: 0000000000000246 R12: ffff880190380dc0 Dez 08 22:21:12 localhost.localdomain kernel: R13: 0000000000000003 R14: ffff88009d41d000 R15: ffff88009693fac8 Dez 08 22:21:12 localhost.localdomain kernel: FS: 00007f4fd62409c0(0000) GS:ffff88023fc00000(0000) knlGS:0000000000000000 Dez 08 22:21:12 localhost.localdomain kernel: CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 Dez 08 22:21:12 localhost.localdomain kernel: CR2: 0000000000000000 CR3: 0000000234c74000 CR4: 00000000000407f0 Dez 08 22:21:12 localhost.localdomain kernel: Stack: Dez 08 22:21:12 localhost.localdomain kernel: ffffffff813dc235 ffff8800b49dfd28 0000000000000000 0000000000000086 Dez 08 22:21:12 localhost.localdomain kernel: ffff88009d41d188 ffff8800b49dfd30 0000000000000282 ffff8800b49dfd58 Dez 08 22:21:12 localhost.localdomain kernel: 000000000003f519 00000000000a0eb2 00000000c36727a9 ffff880190380e00 Dez 08 22:21:12 localhost.localdomain kernel: Call Trace: Dez 08 22:21:12 localhost.localdomain kernel: [<ffffffff813dc235>] ? vblank_disable_and_save+0x95/0x1f0 Dez 08 22:21:12 localhost.localdomain kernel: [<ffffffff813ddc2d>] drm_vblank_cleanup+0x5d/0xa0 Dez 08 22:21:12 localhost.localdomain kernel: [<ffffffffc01842b3>] udl_driver_unload+0x13/0x50 [udl] Dez 08 22:21:12 localhost.localdomain kernel: [<ffffffff813df488>] drm_dev_unregister+0x28/0xb0 Dez 08 22:21:12 localhost.localdomain kernel: [<ffffffff813dfb62>] drm_put_dev+0x22/0x80 Dez 08 22:21:12 localhost.localdomain kernel: [<ffffffff813d9eaf>] drm_release+0x33f/0x520 Dez 08 22:21:12 localhost.localdomain kernel: [<ffffffff8117b4d6>] __fput+0xc6/0x1e0 Dez 08 22:21:12 localhost.localdomain kernel: [<ffffffff8117b639>] ____fput+0x9/0x10 Dez 08 22:21:12 localhost.localdomain kernel: [<ffffffff8106d1e7>] task_work_run+0x97/0xd0 Dez 08 22:21:12 localhost.localdomain kernel: [<ffffffff81003d19>] do_notify_resume+0x59/0x80 Dez 08 22:21:12 localhost.localdomain kernel: [<ffffffff81693dbf>] int_signal+0x12/0x17 Dez 08 22:21:12 localhost.localdomain kernel: Code: Bad RIP value. Dez 08 22:21:12 localhost.localdomain kernel: RIP [< (null)>] (null) Dez 08 22:21:12 localhost.localdomain kernel: RSP <ffff8800b49dfcf0> Dez 08 22:21:12 localhost.localdomain kernel: CR2: 0000000000000000 Dez 08 22:21:12 localhost.localdomain kernel: ---[ end trace da2688dc2851fa3a ]--- Dez 08 22:21:12 localhost.localdomain kernel: note: Xorg.bin[984] exited with preempt_count 2

1 0

[PATCH] Add new DRM_MODE_CONNECTOR and _ENCODER defines
by Adam Cheney 08 Dec '14

08 Dec '14

Update drm_mode.h defines from kernel upstream for connector and encoder types to expose DSI and other newly defined types. Signed-off-by: Adam Cheney <acheney(a)nvidia.com<mailto:acheney@nvidia.com>> --- include/drm/drm_mode.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index 76fd76b..263cf07 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h @@ -173,6 +173,9 @@ struct drm_mode_get_plane_res { #define DRM_MODE_ENCODER_TMDS 2 #define DRM_MODE_ENCODER_LVDS 3 #define DRM_MODE_ENCODER_TVDAC 4 +#define DRM_MODE_ENCODER_VIRTUAL 5 +#define DRM_MODE_ENCODER_DSI 6 +#define DRM_MODE_ENCODER_DPMST 7 struct drm_mode_get_encoder { __u32 encoder_id; @@ -210,6 +213,8 @@ struct drm_mode_get_encoder { #define DRM_MODE_CONNECTOR_HDMIB 12 #define DRM_MODE_CONNECTOR_TV 13 #define DRM_MODE_CONNECTOR_eDP 14 +#define DRM_MODE_CONNECTOR_VIRTUAL 15 +#define DRM_MODE_CONNECTOR_DSI 16 struct drm_mode_get_connector { -- 1.9.1 ----------------------------------------------------------------------------------- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. -----------------------------------------------------------------------------------

1 0

nouveau: Do you really want these new links in the kernel tree?
by Mark Hounschell 08 Dec '14

08 Dec '14

/usr/src/linux-3.18> find drivers/ -type l | xargs ls -al lrwxrwxrwx 1 markh users 21 Dec 7 17:21 ./drivers/gpu/drm/nouveau/core/include/nvif/class.h -> ../../../nvif/class.h lrwxrwxrwx 1 markh users 21 Dec 7 17:21 ./drivers/gpu/drm/nouveau/core/include/nvif/event.h -> ../../../nvif/event.h lrwxrwxrwx 1 markh users 21 Dec 7 17:21 ./drivers/gpu/drm/nouveau/core/include/nvif/ioctl.h -> ../../../nvif/ioctl.h lrwxrwxrwx 1 markh users 22 Dec 7 17:21 ./drivers/gpu/drm/nouveau/core/include/nvif/unpack.h -> ../../../nvif/unpack.h lrwxrwxrwx 1 markh users 12 Dec 7 17:21 ./drivers/gpu/drm/nouveau/nvif/os.h -> ../core/os.h Regards Mark

1 0

[PATCH] drm/atomic: fix potential null ptr on plane enable
by Rob Clark 08 Dec '14

08 Dec '14

When a plane is being enabled, plane->crtc has not been set yet. Use plane->state->crtc. Signed-off-by: Rob Clark <robdclark(a)gmail.com> --- Looks like this is still missing on drm-next.. I probably forgot to send it earlier. drivers/gpu/drm/drm_atomic_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 4a78a77..bbdbe47 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -61,7 +61,7 @@ drm_atomic_helper_plane_changed(struct drm_atomic_state *state, struct drm_crtc_state *crtc_state; if (plane->state->crtc) { - crtc_state = state->crtc_states[drm_crtc_index(plane->crtc)]; + crtc_state = state->crtc_states[drm_crtc_index(plane->state->crtc)]; if (WARN_ON(!crtc_state)) return; -- 1.9.3

3 2

[PATCH] gpu: drm: i915: intel_display.c: Remove unused function
by Rickard Strandqvist 08 Dec '14

08 Dec '14

Remove the function intel_output_name() that is not used anywhere. This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist(a)spectrumdigital.se> --- drivers/gpu/drm/i915/intel_display.c | 22 ---------------------- drivers/gpu/drm/i915/intel_drv.h | 1 - 2 files changed, 23 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f0a1a56..14c47cf 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12258,28 +12258,6 @@ static bool has_edp_a(struct drm_device *dev) return true; } -const char *intel_output_name(int output) -{ - static const char *names[] = { - [INTEL_OUTPUT_UNUSED] = "Unused", - [INTEL_OUTPUT_ANALOG] = "Analog", - [INTEL_OUTPUT_DVO] = "DVO", - [INTEL_OUTPUT_SDVO] = "SDVO", - [INTEL_OUTPUT_LVDS] = "LVDS", - [INTEL_OUTPUT_TVOUT] = "TV", - [INTEL_OUTPUT_HDMI] = "HDMI", - [INTEL_OUTPUT_DISPLAYPORT] = "DisplayPort", - [INTEL_OUTPUT_EDP] = "eDP", - [INTEL_OUTPUT_DSI] = "DSI", - [INTEL_OUTPUT_UNKNOWN] = "Unknown", - }; - - if (output < 0 || output >= ARRAY_SIZE(names) || !names[output]) - return "Invalid"; - - return names[output]; -} - static bool intel_crt_present(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index ba71522..7dde496 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -793,7 +793,6 @@ void intel_ddi_clock_get(struct intel_encoder *encoder, void intel_ddi_set_vc_payload_alloc(struct drm_crtc *crtc, bool state); /* intel_display.c */ -const char *intel_output_name(int output); bool intel_has_pending_fb_unpin(struct drm_device *dev); int intel_pch_rawclk(struct drm_device *dev); void intel_mark_busy(struct drm_device *dev); -- 1.7.10.4

3 4

[Bug 88911] New: Radeon: Patch "drm/radeon: fix speaker allocation setup" causes kernel lockup
by bugzilla-daemon＠bugzilla.kernel.org 08 Dec '14

08 Dec '14

https://bugzilla.kernel.org/show_bug.cgi?id=88911 Bug ID: 88911 Summary: Radeon: Patch "drm/radeon: fix speaker allocation setup" causes kernel lockup Product: Drivers Version: 2.5 Kernel Version: 3.17.3 Hardware: All OS: Linux Tree: Mainline Status: NEW Severity: high Priority: P1 Component: Video(DRI - non Intel) Assignee: drivers_video-dri(a)kernel-bugs.osdl.org Reporter: klaus.kusche(a)computerix.info Regression: No Since 3.17.3, my system (Dell precision M 6700 notebook with AMD Cap Verde graphics) locks up hard as soon as I connect a beamer via HDMI (both when connected to the HDMI output and when connected to the DP output via a DP/HDMI adapter) while X is running or before starting X (console mode only is fine). 3.17.2 worked. With good luck, the system is still alive, but keyboard, display and mouse are locked up, because X hangs. The system shuts down on soft power off, but with 10 seconds delay and the filesystems still mounted: X seems to be unkillable. With bad luck, the fan goes to 100 % and the kernel seems to be dead: Zero disk activity, hard power off is the only way out. The faulty patch is "drm/radeon: fix speaker allocation setup": Applying or reverting this patch only makes the difference. -- You are receiving this mail because: You are watching the assignee of the bug.

1 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel December 2014