2013-07-26 10:52:30

by Dave Airlie

[permalink] [raw]
Subject: [git pull] drm fixes - regular pull req


This is just a regular fixes pull apart from the qxl one, it has radeon
and intel bits in it,

the intel fixes are for a regression with the RC6 fix and a 3.10 hdmi
regression, whereas radeon is more DPM fixes, a few lockup fixes and
some rn50/r100 DAC fixes.

Dave.

The following changes since commit 07bc9dc1b01bad7084fed3d2659e5d83317869bc:

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (2013-07-24 11:07:18 -0700)

are available in the git repository at:


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

for you to fetch changes up to bf903e4141fce4b35072d5b8fa0ddd299aaf01ea:

Merge tag 'drm-intel-fixes-2013-07-25' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes (2013-07-26 20:38:14 +1000)

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

Alex Deucher (8):
drm/radeon: wait for 3D idle before using CP DMA
drm/radeon/vm: only align the pt base to 32k
drm/radeon: fix endian issues with DP handling (v3)
drm/radeon: improve dac adjust heuristics for legacy pdac
drm/radeon/dpm: fix a typo in the rv6xx mclk setup
drm/radeon/dpm: fix displaygap programming on rv6xx
drm/radeon/dpm: implement force performance levels for rv6xx
drm/radeon/dpm: fix r600_enable_sclk_control()

Daniel Vetter (1):
drm/i915: fix hdmi portclock limits

Dave Airlie (2):
Merge branch 'drm-fixes-3.11' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge tag 'drm-intel-fixes-2013-07-25' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

Jani Nikula (1):
drm/i915: initialize gt_lock early with other spin locks

Mark Kettenis (1):
drm/radeon: fix combios tables on older cards

Ondrej Zary (1):
drm/radeon: Another card with wrong primary dac adj

drivers/gpu/drm/i915/i915_dma.c | 1 +
drivers/gpu/drm/i915/intel_hdmi.c | 19 +++-
drivers/gpu/drm/i915/intel_pm.c | 2 -
drivers/gpu/drm/radeon/atombios_dp.c | 43 ++++++++-
drivers/gpu/drm/radeon/r600.c | 5 +-
drivers/gpu/drm/radeon/r600_dpm.c | 4 +-
drivers/gpu/drm/radeon/radeon_asic.c | 1 +
drivers/gpu/drm/radeon/radeon_asic.h | 2 +
drivers/gpu/drm/radeon/radeon_combios.c | 159 ++++++++++----------------------
drivers/gpu/drm/radeon/radeon_gart.c | 8 +-
drivers/gpu/drm/radeon/rv6xx_dpm.c | 41 +++++++-
11 files changed, 158 insertions(+), 127 deletions(-)


2013-07-27 09:57:11

by Jim Bos

[permalink] [raw]
Subject: Re: [git pull] drm fixes - regular pull req

On 07/26/2013 12:52 PM, Dave Airlie wrote:
>
> This is just a regular fixes pull apart from the qxl one, it has radeon
> and intel bits in it,
>
> the intel fixes are for a regression with the RC6 fix and a 3.10 hdmi
> regression, whereas radeon is more DPM fixes, a few lockup fixes and
> some rn50/r100 DAC fixes.
>
> Dave.
>
> The following changes since commit 07bc9dc1b01bad7084fed3d2659e5d83317869bc:
>
> Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (2013-07-24 11:07:18 -0700)
>
> are available in the git repository at:
>
>
> git://people.freedesktop.org/~airlied/linux drm-fixes
>
> for you to fetch changes up to bf903e4141fce4b35072d5b8fa0ddd299aaf01ea:
>
> Merge tag 'drm-intel-fixes-2013-07-25' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes (2013-07-26 20:38:14 +1000)
>
> ----------------------------------------------------------------
>
> Alex Deucher (8):
> drm/radeon: wait for 3D idle before using CP DMA
> drm/radeon/vm: only align the pt base to 32k
> drm/radeon: fix endian issues with DP handling (v3)
> drm/radeon: improve dac adjust heuristics for legacy pdac
> drm/radeon/dpm: fix a typo in the rv6xx mclk setup
> drm/radeon/dpm: fix displaygap programming on rv6xx
> drm/radeon/dpm: implement force performance levels for rv6xx
> drm/radeon/dpm: fix r600_enable_sclk_control()
>
> Daniel Vetter (1):
> drm/i915: fix hdmi portclock limits
>
> Dave Airlie (2):
> Merge branch 'drm-fixes-3.11' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
> Merge tag 'drm-intel-fixes-2013-07-25' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
>
> Jani Nikula (1):
> drm/i915: initialize gt_lock early with other spin locks
>
> Mark Kettenis (1):
> drm/radeon: fix combios tables on older cards
>
> Ondrej Zary (1):
> drm/radeon: Another card with wrong primary dac adj
>
> drivers/gpu/drm/i915/i915_dma.c | 1 +
> drivers/gpu/drm/i915/intel_hdmi.c | 19 +++-
> drivers/gpu/drm/i915/intel_pm.c | 2 -
> drivers/gpu/drm/radeon/atombios_dp.c | 43 ++++++++-
> drivers/gpu/drm/radeon/r600.c | 5 +-
> drivers/gpu/drm/radeon/r600_dpm.c | 4 +-
> drivers/gpu/drm/radeon/radeon_asic.c | 1 +
> drivers/gpu/drm/radeon/radeon_asic.h | 2 +
> drivers/gpu/drm/radeon/radeon_combios.c | 159 ++++++++++----------------------
> drivers/gpu/drm/radeon/radeon_gart.c | 8 +-
> drivers/gpu/drm/radeon/rv6xx_dpm.c | 41 +++++++-
> 11 files changed, 158 insertions(+), 127 deletions(-)
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>

FYI, with these commits, I'm still seeing attached stack trace and
" [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
VCPU!!! "
messages *after* resuming from Suspend-2-Ram.

This is with new power management enabled (radeon.dpm=1) which seems to
work just fine.

_
Jim



Attachments:
dmesg.slowpatch-UVD.txt (7.49 kB)