diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-03 11:09:25 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-03 11:09:36 +0100 |
| commit | 17aad8a340e6f98b62c2482d02bc3814eebde9a5 (patch) | |
| tree | b03fc5a159452bd24cde6e08f29bc66ce6bfa154 /drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c | |
| parent | 7e6328fd1f84f366b4cc17dc757025f485139f1a (diff) | |
| parent | 99743ae4c5f52f8f8ceb17783056fcc9b4f8b64c (diff) | |
| download | op-kernel-dev-17aad8a340e6f98b62c2482d02bc3814eebde9a5.zip op-kernel-dev-17aad8a340e6f98b62c2482d02bc3814eebde9a5.tar.gz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
Yet another backmerge to get at latest etnaviv code, which is need for
Chris' drm_mm patch.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c b/drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c index 2a2e5e3..6e3bbcf 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c @@ -56,6 +56,8 @@ static const struct { ST(0x0644, 1), ST(0x064c, 1), ST(0x0680, 8), + ST(0x086c, 1), + ST(0x1028, 1), ST(0x1410, 1), ST(0x1430, 1), ST(0x1458, 1), @@ -73,8 +75,12 @@ static const struct { ST(0x16c0, 8), ST(0x16e0, 8), ST(0x1740, 8), + ST(0x17c0, 8), + ST(0x17e0, 8), ST(0x2400, 14 * 16), ST(0x10800, 32 * 16), + ST(0x14600, 16), + ST(0x14800, 8 * 8), #undef ST }; |
