2013-09-19 02:07:23

by Dave Airlie

[permalink] [raw]
Subject: [git pull] drm radeon/nouveau/core fixes

Hi Linus,

mostly radeon fixes, with some nouveau bios parser, ttm fix and a fix
for AST driver.

Dave.

The following changes since commit 01172772c7c973debf5b4881fcb9463891ea97ec:

drm/nouveau: fix oops on runtime suspend/resume (2013-09-10 12:38:53 +1000)

are available in the git repository at:

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

for you to fetch changes up to 928c2f0c006bf7f381f58af2b2786d2a858ae311:

drm/fb-helper: don't sleep for screen unblank when an oops is in
progress (2013-09-19 11:54:34 +1000)

----------------------------------------------------------------
Alex Deucher (24):
drm/radeon/cik: properly handle internal cp ints
drm/radeon/si: properly handle internal cp ints
drm/radeon/dce6/audio: make sure pin is valid before accessing it
drm/radeon: add a connector property for audio
drm/radeon: dpm updates for KV
drm/radeon: protect concurrent smc register access with a spinlock
drm/radeon: add spinlocks for indirect register accesss
drm/radeon/cik: update gpu_init for an additional berlin gpu
drm/radeon: add some additional berlin pci ids
drm/radeon: fix typo in PG flags
drm/radeon/r6xx: add a stubbed out set_uvd_clocks callback
drm/radeon/dpm: fix fallback for empty UVD clocks
drm/radeon/atom: workaround vbios bug in transmitter table on rs880 (v2)
drm/radeon/dpm: handle bapm on trinity
drm/radeon/dpm: handle bapm on kb/kv
drm/radeon/dpm: add infrastructure to properly handle bapm
drm/radeon/dpm: add bapm callback for trinity
drm/radeon/dpm: add bapm callback for kb/kv
drm/radeon/dpm/rs780: use drm_mode_vrefresh()
drm/radeon/dpm/rs780: add some sanity checking to sclk scaling
drm/radeon/dpm/rs780: don't enable sclk scaling if not required
drm/radeon/dpm/rs780: fix force_performance state for same sclks
drm/radeon/dpm: rework auto performance level enable
drm/radeon: fix panel scaling with eDP and LVDS bridges

Anthoine Bourgeois (1):
drm/radeon/dpm: implement force performance levels for rs780 (v2)

Ben Skeggs (5):
drm/nouveau/bios/init: stub opcode 0xaa
drm/nouveau/kms: enable for non-vga pci classes
drm/nouveau/bios/init: fix thinko in INIT_CONFIGURE_MEM
drm/nouveau/ttm: prevent double-free in
nouveau_sgdma_create_ttm() failure path
drm/ttm: fix the tt_populated check in ttm_tt_destroy()

Christian K?nig (3):
drm/radeon: remove stale radeon_fence_retire tracepoint
drm/radeon: add command submission tracepoint
drm/radeon: avoid UVD corruptions on AGP cards

Damien Lespiau (1):
drm/radeon: Fix hmdi typo

Dan Carpenter (2):
drm/radeon: clean up r600_free_extended_power_table()
drm/radeon: signedness bug in kv_dpm.c

Daniel Vetter (2):
drm/udl: rip out set_need_resched
drm/fb-helper: don't sleep for screen unblank when an oops is in progress

Dave Airlie (4):
drm/ast: fix the ast open key function
Merge branch 'drm-fixes-3.12' of
git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge branch 'drm-fixes-3.12' of
git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge branch 'drm-nouveau-next' of
git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

Jean Delvare (2):
drm/radeon: simplify driver data retrieval
drm/radeon: expose DPM thermal thresholds through sysfs

Prarit Bhargava (1):
drm, ttm Fix uninitialized warning

drivers/gpu/drm/ast/ast_drv.h | 2 +-
drivers/gpu/drm/drm_fb_helper.c | 8 ++
drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 21 ++-
drivers/gpu/drm/nouveau/nouveau_display.c | 35 +++--
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 3 +-
drivers/gpu/drm/nouveau/nouveau_sgdma.c | 4 +-
drivers/gpu/drm/radeon/atombios_encoders.c | 23 ++--
drivers/gpu/drm/radeon/btc_dpm.c | 6 -
drivers/gpu/drm/radeon/ci_dpm.c | 6 -
drivers/gpu/drm/radeon/ci_smc.c | 39 ++++--
drivers/gpu/drm/radeon/cik.c | 36 +++++-
drivers/gpu/drm/radeon/cypress_dpm.c | 6 -
drivers/gpu/drm/radeon/dce6_afmt.c | 12 +-
drivers/gpu/drm/radeon/kv_dpm.c | 164 +++++++++++++++++++-----
drivers/gpu/drm/radeon/kv_dpm.h | 1 +
drivers/gpu/drm/radeon/kv_smc.c | 8 ++
drivers/gpu/drm/radeon/ni_dpm.c | 6 -
drivers/gpu/drm/radeon/ppsmc.h | 2 +
drivers/gpu/drm/radeon/r100.c | 7 +
drivers/gpu/drm/radeon/r420.c | 7 +
drivers/gpu/drm/radeon/r600.c | 19 +++
drivers/gpu/drm/radeon/r600_dpm.c | 38 ++----
drivers/gpu/drm/radeon/r600d.h | 2 +-
drivers/gpu/drm/radeon/radeon.h | 82 +++++++++++-
drivers/gpu/drm/radeon/radeon_asic.c | 11 +-
drivers/gpu/drm/radeon/radeon_asic.h | 5 +
drivers/gpu/drm/radeon/radeon_connectors.c | 69 +++++++++-
drivers/gpu/drm/radeon/radeon_cs.c | 11 +-
drivers/gpu/drm/radeon/radeon_device.c | 11 ++
drivers/gpu/drm/radeon/radeon_display.c | 12 ++
drivers/gpu/drm/radeon/radeon_drv.c | 2 +-
drivers/gpu/drm/radeon/radeon_mode.h | 9 ++
drivers/gpu/drm/radeon/radeon_pm.c | 81 +++++++++---
drivers/gpu/drm/radeon/radeon_trace.h | 27 +++-
drivers/gpu/drm/radeon/rs400.c | 7 +
drivers/gpu/drm/radeon/rs600.c | 12 +-
drivers/gpu/drm/radeon/rs690.c | 7 +
drivers/gpu/drm/radeon/rs780_dpm.c | 112 +++++++++++++---
drivers/gpu/drm/radeon/rv515.c | 8 ++
drivers/gpu/drm/radeon/rv6xx_dpm.c | 2 -
drivers/gpu/drm/radeon/rv770_dpm.c | 16 +--
drivers/gpu/drm/radeon/rv770_smc.c | 44 ++++---
drivers/gpu/drm/radeon/rv770_smc.h | 2 -
drivers/gpu/drm/radeon/rv770d.h | 2 +-
drivers/gpu/drm/radeon/si.c | 21 ++-
drivers/gpu/drm/radeon/si_dpm.c | 6 -
drivers/gpu/drm/radeon/si_smc.c | 43 ++++---
drivers/gpu/drm/radeon/sumo_dpm.c | 2 -
drivers/gpu/drm/radeon/trinity_dpm.c | 17 ++-
drivers/gpu/drm/radeon/trinity_dpm.h | 2 +
drivers/gpu/drm/radeon/trinity_smc.c | 8 ++
drivers/gpu/drm/ttm/ttm_object.c | 2 +-
drivers/gpu/drm/ttm/ttm_tt.c | 2 +-
drivers/gpu/drm/udl/udl_gem.c | 1 -
include/drm/drm_pciids.h | 3 +
55 files changed, 835 insertions(+), 259 deletions(-)


2013-09-19 02:20:20

by Linus Torvalds

[permalink] [raw]
Subject: Re: [git pull] drm radeon/nouveau/core fixes

On Wed, Sep 18, 2013 at 9:07 PM, Dave Airlie <[email protected]> wrote:
>
> mostly radeon fixes, with some nouveau bios parser, ttm fix and a fix
> for AST driver.

Ugh. I hope things calm down from here.

Linus

2013-09-19 02:39:00

by Dave Airlie

[permalink] [raw]
Subject: Re: [git pull] drm radeon/nouveau/core fixes

On Thu, Sep 19, 2013 at 12:20 PM, Linus Torvalds
<[email protected]> wrote:
> On Wed, Sep 18, 2013 at 9:07 PM, Dave Airlie <[email protected]> wrote:
>>
>> mostly radeon fixes, with some nouveau bios parser, ttm fix and a fix
>> for AST driver.
>
> Ugh. I hope things calm down from here.

It shouldn't be that bad, this stuff was a bit delayed, some of it was
in my tree before the merge closed, I was just distracting myself with
other stuff,

The radeon stuff is for new hw that was merged in the merge window,
and more DPM fixes which is still off by default,

The only coming thing that worries me is the VGA arbitration fixes for
Intel GPUs is really screwed up and fixing it looks like resorting to
slightly drastic measures.

Dave.

2013-09-20 12:07:52

by Dieter Nützel

[permalink] [raw]
Subject: Re: [git pull] drm radeon/nouveau/core fixes

Am 19.09.2013 04:07, schrieb Dave Airlie:
> Hi Linus,
>
> mostly radeon fixes, with some nouveau bios parser, ttm fix and a fix
> for AST driver.
>
> Dave.
>
> The following changes since commit
> 01172772c7c973debf5b4881fcb9463891ea97ec:
>
> drm/nouveau: fix oops on runtime suspend/resume (2013-09-10 12:38:53
> +1000)
>
> are available in the git repository at:
>
> git://people.freedesktop.org/~airlied/linux drm-fixes
>
> for you to fetch changes up to
> 928c2f0c006bf7f381f58af2b2786d2a858ae311:
>
> drm/fb-helper: don't sleep for screen unblank when an oops is in
> progress (2013-09-19 11:54:34 +1000)

[-]

> Christian König (3):
> drm/radeon: remove stale radeon_fence_retire tracepoint
> drm/radeon: add command submission tracepoint
> drm/radeon: avoid UVD corruptions on AGP cards

Alex,

I think your PCIE AGP (radeon.agpmode=-1) UVD fix is missing, here.

Thanks for working UVD and dpm on mostly all asics!

-Dieter

2013-09-20 13:09:40

by Alex Deucher

[permalink] [raw]
Subject: Re: [git pull] drm radeon/nouveau/core fixes

On Fri, Sep 20, 2013 at 8:01 AM, Dieter N?tzel <[email protected]> wrote:
> Am 19.09.2013 04:07, schrieb Dave Airlie:
>
>> Hi Linus,
>>
>> mostly radeon fixes, with some nouveau bios parser, ttm fix and a fix
>> for AST driver.
>>
>> Dave.
>>
>> The following changes since commit
>> 01172772c7c973debf5b4881fcb9463891ea97ec:
>>
>> drm/nouveau: fix oops on runtime suspend/resume (2013-09-10 12:38:53
>> +1000)
>>
>> are available in the git repository at:
>>
>> git://people.freedesktop.org/~airlied/linux drm-fixes
>>
>> for you to fetch changes up to 928c2f0c006bf7f381f58af2b2786d2a858ae311:
>>
>> drm/fb-helper: don't sleep for screen unblank when an oops is in
>> progress (2013-09-19 11:54:34 +1000)
>
>
> [-]
>
>
>> Christian K?nig (3):
>> drm/radeon: remove stale radeon_fence_retire tracepoint
>> drm/radeon: add command submission tracepoint
>> drm/radeon: avoid UVD corruptions on AGP cards
>
>
> Alex,
>
> I think your PCIE AGP (radeon.agpmode=-1) UVD fix is missing, here.
>

It didn't get into this pull. I'll be in my next -fixes pull.

Alex

> Thanks for working UVD and dpm on mostly all asics!
>
> -Dieter