2014-07-05 22:13:34

by Dave Airlie

[permalink] [raw]
Subject: [git pull] drm fixes


Hi Linus,

i915, tda998x and vmwgfx fixes, the main one is i915 fix for missing VGA
connectors, along with some fixes for the tda998x from Russell fixing some
modesetting problems.

(still on holidays, but got a spare moment to find these).

Dave.

The following changes since commit e1a08b855f56d6528e7f85aae9ca8123f4c3ae04:

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux (2014-07-05 10:12:52 -0700)

are available in the git repository at:


git://people.freedesktop.org/~airlied/linux drm-fixes

for you to fetch changes up to dfd7aecfd6d227831d77719379d4c7137f444fee:

Merge tag 'drm-intel-fixes-2014-07-03' of git://anongit.freedesktop.org/drm-intel (2014-07-06 07:49:59 +1000)

----------------------------------------------------------------

Dave Airlie (3):
Merge branch 'tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox
Merge branch 'vmwgfx-fixes-3.16' of git://people.freedesktop.org/~thomash/linux
Merge tag 'drm-intel-fixes-2014-07-03' of git://anongit.freedesktop.org/drm-intel

Deepak S (1):
drm/i915: Drop early VLV WA to fix Voltage not getting dropped to Vmin

Guido Mart?nez (1):
drm/i2c: tda998x: move drm_i2c_encoder_destroy call

Jesse Barnes (1):
drm/i915: only apply crt_present check on VLV

Russell King (2):
drm/i2c: tda998x: faster polling for edid
drm/i2c: tda998x: add some basic mode validation

Thomas Hellstrom (1):
drm/vmwgfx: Fix incorrect write to read-only register v2:

Ville Syrj?l? (1):
drm/i915: Wait for vblank after enabling the primary plane on BDW

drivers/gpu/drm/i2c/tda998x_drv.c | 12 +++++++++---
drivers/gpu/drm/i915/intel_display.c | 27 ++++++++++++++++++++++++++-
drivers/gpu/drm/i915/intel_pm.c | 8 ++++++++
drivers/gpu/drm/i915/intel_sprite.c | 8 ++++++++
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 1 -
5 files changed, 51 insertions(+), 5 deletions(-)


2014-07-06 02:25:01

by Ed Tomlinson

[permalink] [raw]
Subject: Re: [git pull] drm fixes

Hi Dave,

This is NOT fixing problems with a stalled boot due to VGA problems as
reported in thread: [PATCH 5/5] drm/i915: Kick out vga console
It can be fixed by reverting: a4de05268e674e8ed31df6348269e22d6c6a1803
or applying the patch from Chris Wilson which can be found as a reply to my report.

Thanks
Ed Tomlinson

On Saturday 05 July 2014 23:13:27 Dave Airlie wrote:
>
> Hi Linus,
>
> i915, tda998x and vmwgfx fixes, the main one is i915 fix for missing VGA
> connectors, along with some fixes for the tda998x from Russell fixing some
> modesetting problems
>
> (still on holidays, but got a spare moment to find these).
>
> Dave.
>
> The following changes since commit e1a08b855f56d6528e7f85aae9ca8123f4c3ae04:
>
> Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux (2014-07-05 10:12:52 -0700)
>
> are available in the git repository at:
>
>
> git://people.freedesktop.org/~airlied/linux drm-fixes
>
> for you to fetch changes up to dfd7aecfd6d227831d77719379d4c7137f444fee:
>
> Merge tag 'drm-intel-fixes-2014-07-03' of git://anongit.freedesktop.org/drm-intel (2014-07-06 07:49:59 +1000)
>
> ----------------------------------------------------------------
>
> Dave Airlie (3):
> Merge branch 'tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox
> Merge branch 'vmwgfx-fixes-3.16' of git://people.freedesktop.org/~thomash/linux
> Merge tag 'drm-intel-fixes-2014-07-03' of git://anongit.freedesktop.org/drm-intel
>
> Deepak S (1):
> drm/i915: Drop early VLV WA to fix Voltage not getting dropped to Vmin
>
> Guido Martínez (1):
> drm/i2c: tda998x: move drm_i2c_encoder_destroy call
>
> Jesse Barnes (1):
> drm/i915: only apply crt_present check on VLV
>
> Russell King (2):
> drm/i2c: tda998x: faster polling for edid
> drm/i2c: tda998x: add some basic mode validation
>
> Thomas Hellstrom (1):
> drm/vmwgfx: Fix incorrect write to read-only register v2:
>
> Ville Syrjälä (1):
> drm/i915: Wait for vblank after enabling the primary plane on BDW
>
> drivers/gpu/drm/i2c/tda998x_drv.c | 12 +++++++++---
> drivers/gpu/drm/i915/intel_display.c | 27 ++++++++++++++++++++++++++-
> drivers/gpu/drm/i915/intel_pm.c | 8 ++++++++
> drivers/gpu/drm/i915/intel_sprite.c | 8 ++++++++
> drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 1 -
> 5 files changed, 51 insertions(+), 5 deletions(-)

2014-07-06 08:49:41

by Dave Airlie

[permalink] [raw]
Subject: Re: [git pull] drm fixes

On 6 July 2014 12:24, Ed Tomlinson <[email protected]> wrote:
> Hi Dave,
>
> This is NOT fixing problems with a stalled boot due to VGA problems as
> reported in thread: [PATCH 5/5] drm/i915: Kick out vga console
> It can be fixed by reverting: a4de05268e674e8ed31df6348269e22d6c6a1803
> or applying the patch from Chris Wilson which can be found as a reply to my report.

I was hoping Daniel would get to it, but he is on holidays (as am I
really!), I'll take a look at the fix when I'm back in the office
myself if nobody has sent it to me.

Dave.

2014-07-07 13:34:55

by Daniel Vetter

[permalink] [raw]
Subject: Re: [git pull] drm fixes

On Sun, Jul 6, 2014 at 10:49 AM, Dave Airlie <[email protected]> wrote:
> On 6 July 2014 12:24, Ed Tomlinson <[email protected]> wrote:
>> Hi Dave,
>>
>> This is NOT fixing problems with a stalled boot due to VGA problems as
>> reported in thread: [PATCH 5/5] drm/i915: Kick out vga console
>> It can be fixed by reverting: a4de05268e674e8ed31df6348269e22d6c6a1803
>> or applying the patch from Chris Wilson which can be found as a reply to my report.
>
> I was hoping Daniel would get to it, but he is on holidays (as am I
> really!), I'll take a look at the fix when I'm back in the office
> myself if nobody has sent it to me.

I've just sent Ed a refined diff for testing to make sure that we only
unbind vgacon if necessariy, but still unregister it (to make sure it
can't ever interfere with module unloading). If that checks out I'll
submit this as a real patch, otherwise we can go with Chris' slightly
bigger cannon.

In any case there seems to be a bigger dragon lurking since unbinding
the radeon fbcon really should kill the machine (but it can result in
a bit of a black screen, so checking that vgacon is bound is trtdt
nevertheless).
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch