diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-02-23 14:54:20 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-02-23 14:56:11 +0100 |
| commit | ff5f4b0585620e5c158ecaad84d91c5bf3c5d0a1 (patch) | |
| tree | 18867fdd805f1beefd3592bca76f4794bdc094b8 /tools/perf/scripts/python | |
| parent | Revert "drivers/gpu/drm/i915/intel_overlay.c needs seq_file.h" (diff) | |
| parent | drm: add some caps for userspace to discover more info for dumb KMS driver (v2) (diff) | |
| download | linux-ff5f4b0585620e5c158ecaad84d91c5bf3c5d0a1.tar.gz linux-ff5f4b0585620e5c158ecaad84d91c5bf3c5d0a1.zip | |
Merge remote-tracking branch 'airlied/drm-next' into for-airlied
Manually resolve the conflict between the new enum drm property
helpers in drm-next and the new "force-dvi" option that the "audio" output
property gained in drm-intel-next.
While resolving this conflict, switch the new drm_prop_enum_list to
use the newly introduced enum defines instead of magic values.
Conflicts:
drivers/gpu/drm/i915/intel_modes.c
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions