linux.git/drivers/gpu, branch v4.3-rc4

drm/dp/mst: add some defines for logical/physical ports

2015-10-02T05:34:42+00:00

This just removes the magic number.

Acked-by: Daniel Vetter 
Signed-off-by: Dave Airlie

drm/dp/mst: drop cancel work sync in the mstb destroy path (v2)

2015-10-02T05:34:42+00:00

Since 9eb1e57f564d4e6e10991402726cc83fe0b9172f
drm/dp/mst: make sure mst_primary mstb is valid in work function

we validate the mstb structs in the work function, and doing
that takes a reference. So we should never get here with the
work function running using the mstb device, only if the work
function hasn't run yet or is running for another mstb.

So we don't need to sync the work here, this was causing
lockdep spew as below.

[  +0.000160] =============================================
[  +0.000001] [ INFO: possible recursive locking detected ]
[  +0.000002] 3.10.0-320.el7.rhel72.stable.backport.3.x86_64.debug #1 Tainted: G        W      ------------
[  +0.000001] ---------------------------------------------
[  +0.000001] kworker/4:2/1262 is trying to acquire lock:
[  +0.000001]  ((&mgr->work)){+.+.+.}, at: [] flush_work+0x5/0x2e0
[  +0.000007]
but task is already holding lock:
[  +0.000001]  ((&mgr->work)){+.+.+.}, at: [] process_one_work+0x1b4/0x710
[  +0.000004]
other info that might help us debug this:
[  +0.000001]  Possible unsafe locking scenario:

[  +0.000002]        CPU0
[  +0.000000]        ----
[  +0.000001]   lock((&mgr->work));
[  +0.000002]   lock((&mgr->work));
[  +0.000001]
 *** DEADLOCK ***

[  +0.000001]  May be due to missing lock nesting notation

[  +0.000002] 2 locks held by kworker/4:2/1262:
[  +0.000001]  #0:  (events_long){.+.+.+}, at: [] process_one_work+0x1b4/0x710
[  +0.000004]  #1:  ((&mgr->work)){+.+.+.}, at: [] process_one_work+0x1b4/0x710
[  +0.000003]
stack backtrace:
[  +0.000003] CPU: 4 PID: 1262 Comm: kworker/4:2 Tainted: G        W      ------------   3.10.0-320.el7.rhel72.stable.backport.3.x86_64.debug #1
[  +0.000001] Hardware name: LENOVO 20EGS0R600/20EGS0R600, BIOS GNET71WW (2.19 ) 02/05/2015
[  +0.000008] Workqueue: events_long drm_dp_mst_link_probe_work [drm_kms_helper]
[  +0.000001]  ffffffff82c26c90 00000000a527b914 ffff88046399bae8 ffffffff816fe04d
[  +0.000004]  ffff88046399bb58 ffffffff8110f47f ffff880461438000 0001009b840fc003
[  +0.000002]  ffff880461438a98 0000000000000000 0000000804dc26e1 ffffffff824a2c00
[  +0.000003] Call Trace:
[  +0.000004]  [] dump_stack+0x19/0x1b
[  +0.000004]  [] __lock_acquire+0x115f/0x1250
[  +0.000002]  [] lock_acquire+0x99/0x1e0
[  +0.000002]  [] ? flush_work+0x5/0x2e0
[  +0.000002]  [] flush_work+0x4e/0x2e0
[  +0.000002]  [] ? flush_work+0x5/0x2e0
[  +0.000004]  [] ? native_sched_clock+0x35/0x80
[  +0.000002]  [] ? sched_clock+0x9/0x10
[  +0.000002]  [] ? local_clock+0x25/0x30
[  +0.000002]  [] ? mark_held_locks+0xb9/0x140
[  +0.000003]  [] ? __cancel_work_timer+0x95/0x160
[  +0.000002]  [] __cancel_work_timer+0xa8/0x160
[  +0.000002]  [] cancel_work_sync+0x10/0x20
[  +0.000007]  [] drm_dp_destroy_mst_branch_device+0x27/0x120 [drm_kms_helper]
[  +0.000006]  [] drm_dp_mst_link_probe_work+0x78/0xa0 [drm_kms_helper]
[  +0.000002]  [] process_one_work+0x220/0x710
[  +0.000002]  [] ? process_one_work+0x1b4/0x710
[  +0.000005]  [] worker_thread+0x11b/0x3a0
[  +0.000003]  [] ? process_one_work+0x710/0x710
[  +0.000002]  [] kthread+0xed/0x100
[  +0.000003]  [] ? insert_kthread_work+0x80/0x80
[  +0.000003]  [] ret_from_fork+0x58/0x90

v2: add flush_work.

Reviewed-by: Daniel Vetter 
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie

drm/dp/mst: split connector registration into two parts (v2)

2015-10-02T05:34:41+00:00

In order to cache the EDID properly for tiled displays, we
need to retrieve it before we register the connector with
userspace, otherwise userspace can call get resources
and try and get the edid before we've even cached it.

This fixes some problems when hotplugging mst monitors,
with X/mutter running. As mutter seems to get 0 modes
for one of the monitors in the tile.

v2: fix warning in radeon
handle tile setting in cached path rather than
get edid path.

Reviewed-by: Daniel Vetter 
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie

drm/dp/mst: update the link_address_sent before sending the link address (v3)

2015-10-02T05:34:41+00:00

Update the state before sending the msg to close it.

v2: reset value if return indicates we haven't send the msg.
v3: just clean the code up.
Pointed out by Adam J Richter on

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91481

Reviewed-by: Daniel Vetter 
Signed-off-by: Dave Airlie

drm/dp/mst: fixup handling hotplug on port removal.

2015-10-02T05:34:40+00:00

output ports should always have a connector, unless
in the rare case connector allocation fails in the
driver.

In this case we only need to teardown the pdt,
and free the struct, and there is no need to
send a hotplug msg.

In the case were we add the port to the destroy
list we need to send a hotplug if we destroy
any connectors, so userspace knows to reprobe
stuff.

this patch also handles port->connector allocation
failing which should be a rare event, but makes
the code consistent.

Reviewed-by: Daniel Vetter 
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie

drm/dp/mst: don't pass port into the path builder function

2015-10-02T05:34:40+00:00

This is unnecessary and it makes it easier to see what is needed
from port.

also add blank line to make things nicer.

Reviewed-by: Daniel Vetter 
Signed-off-by: Dave Airlie

drm/radeon: drop radeon_fb_helper_set_par

2015-10-02T05:31:00+00:00

It was just a wrapper around drm_fb_helper_set_par that
called cursor_set2 in addition.  Now that the core handles
this, drop this radeon specific version.

Signed-off-by: Alex Deucher 
Reviewed-by: Christian König 
Reviewed-by: Michel Dänzer 
Signed-off-by: Dave Airlie

drm: handle cursor_set2 in restore_fbdev_mode

2015-10-02T05:30:41+00:00

If a driver uses the cursor_set2 crtc callback rather than
cursor_set, use that.  This fixes the fbdev helper for drivers
that use cursor_set2.

Signed-off-by: Alex Deucher 
Reviewed-by: Christian König 
Reviewed-by: Michel Dänzer 
Signed-off-by: Dave Airlie

Merge tag 'drm-intel-fixes-2015-10-01' of git://anongit.freedesktop.org/drm-intel into drm-fixes

2015-10-02T00:47:29+00:00

a few i915 fixes for v4.3.

* tag 'drm-intel-fixes-2015-10-01' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Call non-locking version of drm_kms_helper_poll_enable(), v2
  drm: Add a non-locking version of drm_kms_helper_poll_enable(), v2
  drm/i915: Consider HW CSB write pointer before resetting the sw read pointer
  drm/i915/skl: Don't call intel_prepare_ddi when encoder list isn't yet initialized.

Merge tag 'vmwgfx-fixes-4.3-151001' of git://people.freedesktop.org/~thomash/linux into drm-fixes

2015-10-02T00:46:51+00:00

A single commit to fix a command submission hang regression.

Pull request of 2015-10-01

* tag 'vmwgfx-fixes-4.3-151001' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix a command submission hang regression