diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-03-04 10:29:19 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-03-04 10:29:19 -0300 |
commit | d46eec8e975a8180e178e01ba505801c44bc9a6c (patch) | |
tree | bff067e554fc03c576e107297085d30c8e381370 /drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |
parent | fdb64822443ec9fb8c3a74b598a74790ae8d2e22 (diff) | |
parent | c395c3553d6870541f1c283479aea2a6f26364d5 (diff) | |
download | linux-d46eec8e975a8180e178e01ba505801c44bc9a6c.tar.gz linux-d46eec8e975a8180e178e01ba505801c44bc9a6c.tar.bz2 linux-d46eec8e975a8180e178e01ba505801c44bc9a6c.zip |
Merge remote-tracking branch 'acme/perf/urgent' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 94e2fd758e01..42f4febe24c6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -1389,7 +1389,7 @@ amdgpu_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe, static struct drm_driver kms_driver = { .driver_features = - DRIVER_USE_AGP | DRIVER_ATOMIC | + DRIVER_ATOMIC | DRIVER_GEM | DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ | DRIVER_SYNCOBJ_TIMELINE, |