diff options
author | Gustavo Padovan <gustavo.padovan@collabora.com> | 2017-12-04 16:04:45 -0200 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.com> | 2017-12-04 16:04:45 -0200 |
commit | 7b47c66cfa203288c43851260edeeb0fae56f692 (patch) | |
tree | fa729735fdaf1d77fbbf13062fd53c31b59d682d /Documentation/gpu | |
parent | ca0e68e21aae10220eff71a297e7d794425add77 (diff) | |
parent | ca797d29cd63e7b71b4eea29aff3b1cefd1ecb59 (diff) | |
download | linux-7b47c66cfa203288c43851260edeeb0fae56f692.tar.bz2 |
Merge arlied/drm-next into drm-misc-next
We need to pull 66660d4cf21b (drm: add connector info/property for
non-desktop displays [v2]) into drm-misc-next to continue the development
of the display rotation series.
Effectively this also pulls 4.15-r2 into drm-misc-next.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Diffstat (limited to 'Documentation/gpu')
-rw-r--r-- | Documentation/gpu/i915.rst | 4 | ||||
-rw-r--r-- | Documentation/gpu/todo.rst | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst index 2e7ee0313c1c..21577eabaf78 100644 --- a/Documentation/gpu/i915.rst +++ b/Documentation/gpu/i915.rst @@ -350,10 +350,10 @@ GuC-specific firmware loader GuC-based command submission ---------------------------- -.. kernel-doc:: drivers/gpu/drm/i915/i915_guc_submission.c +.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_submission.c :doc: GuC-based command submission -.. kernel-doc:: drivers/gpu/drm/i915/i915_guc_submission.c +.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_submission.c :internal: GuC Firmware Layout diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst index 6bce1beafabe..af614746d9c5 100644 --- a/Documentation/gpu/todo.rst +++ b/Documentation/gpu/todo.rst @@ -417,5 +417,15 @@ those drivers as simple as possible, so lots of room for refactoring: Contact: Noralf Trønnes, Daniel Vetter +AMD DC Display Driver +--------------------- + +AMD DC is the display driver for AMD devices starting with Vega. There has been +a bunch of progress cleaning it up but there's still plenty of work to be done. + +See drivers/gpu/drm/amd/display/TODO for tasks. + +Contact: Harry Wentland, Alex Deucher + Outside DRM =========== |