OSDN Git Service

Merge branch 'drm-next-ast-fixes' of ssh://people.freedesktop.org/~/linux into drm...
authorDave Airlie <airlied@redhat.com>
Tue, 16 Sep 2014 04:59:16 +0000 (14:59 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 16 Sep 2014 04:59:16 +0000 (14:59 +1000)
commit29a7d1795a0376beee6c0f7515fae3789277e03e
tree2f12e492430e3dd7e1802b7c5f77e06b1423929b
parent94d12b137c2dccdd9a8c6586c96404484e2ab1df
parent37b9b81f3074ce35fadf64d321b79292494220d1
Merge branch 'drm-next-ast-fixes' of ssh://people.freedesktop.org/~/linux into drm-next

Pull in first set of changes from Ben for ast on ppc.

I've done a quick boot test on x86 and it still seems to boot.

* 'drm-next-ast-fixes' of ssh://people.freedesktop.org/~/linux:
  drm/ast: Cleanup analog init code path
  drm/ast: Don't assume DVO enabled means SIL164 on uninitialized chips
  drm/ast: Properly initialize P2A base before using it in ast_init_3rdtx()
  drm/ast: POST chip at probe time if VGA not enabled
  drm/ast: Try to use MMIO registers when PIO isn't supported
drivers/gpu/drm/ast/ast_main.c