2013-06-06 05:14:26

by Dave Airlie

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


Hi Linus,

regression fixers for the big 3:
nouveau: hdmi audio, dac load detect, s/r regressions fixed
radeon: long standing system hang fixed, hdmi audio and rs780 fast fb
fixes
intel: one old regression, a WARN removal, and a stop X dying fix

otherwise one mgag200 fix, a couple of arm build fixes, and a core use
after free fix.

Dave.

The following changes since commit c89b65e7fffef745bdd36c372aa0dea778fecbab:

qxl: fix Kconfig deps - select FB_DEFERRED_IO (2013-05-28 17:03:37 +1000)

are available in the git repository at:

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

for you to fetch changes up to 970fa986fadb1165cf38b45b70e98302a3bee497:

drm/qxl: fix build warnings on 32-bit (2013-05-31 12:45:09 +1000)

----------------------------------------------------------------
Alex Deucher (4):
drm/radeon: fix typo in cu_per_sh on verde
drm/radeon: fix card_posted check for newer asics
drm/radeon: don't check crtcs in card_posted() on cards without DCE
drm/radeon: narrow scope of Apple re-POST hack

Christian K?nig (1):
drm/radeon: UVD block on SUMO2 is the same as on SUMO

Dave Airlie (2):
Merge branch 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux into drm-next
drm/qxl: fix build warnings on 32-bit

Kleber Sacilotto de Souza (1):
radeon: use max_bus_speed to activate gen2 speeds

drivers/gpu/drm/qxl/qxl_ioctl.c | 4 ++--
drivers/gpu/drm/qxl/qxl_kms.c | 9 +++++----
drivers/gpu/drm/radeon/evergreen.c | 10 +++-------
drivers/gpu/drm/radeon/r600.c | 9 ++-------
drivers/gpu/drm/radeon/radeon_device.c | 27 ++++++++++++++++-----------
drivers/gpu/drm/radeon/rv770.c | 13 +++----------
drivers/gpu/drm/radeon/si.c | 2 +-
7 files changed, 32 insertions(+), 42 deletions(-)


2013-06-06 05:22:12

by Linus Torvalds

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

On Thu, Jun 6, 2013 at 2:14 PM, Dave Airlie <[email protected]> wrote:
>
> 7 files changed, 32 insertions(+), 42 deletions(-)

That's not at all what I get (including shortlog). I got

29 files changed, 188 insertions(+), 68 deletions(-)

from a lot of commits you don't list.

Linus

2013-06-06 05:25:42

by Dave Airlie

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

On Thu, Jun 6, 2013 at 3:22 PM, Linus Torvalds
<[email protected]> wrote:
> On Thu, Jun 6, 2013 at 2:14 PM, Dave Airlie <[email protected]> wrote:
>>
>> 7 files changed, 32 insertions(+), 42 deletions(-)
>
> That's not at all what I get (including shortlog). I got
>
> 29 files changed, 188 insertions(+), 68 deletions(-)
>
> from a lot of commits you don't list.

doh I slurped in the wrong file to my emailer.

Will resend.

Sorry,
Dave.