summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk@arm.linux.org.uk>2016-01-08 11:13:56 +0000
committerRussell King <rmk@arm.linux.org.uk>2016-01-08 11:13:56 +0000
commit248f32afc9acd3fc398b92be823a804653bc0f9b (patch)
tree185e968ba5ade71144c6b1bb2aeb3bc0afbe4ed3
parent8acfb2b61dc5aeb28b99e3221876b4f0bd3bfeb3 (diff)
etnaviv: only support etnaviv DRM for DRI2
Drop support for DRI2 with galcore; we only support this using DRM drivers and the etnaviv mesa-1 repository. This also allows us to use "etnaviv" as the DRI2 module for Xorg to load, instead of "etnadrm" vs "etnaviv". This aligns with the etnaviv mesa-1 repository. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
-rw-r--r--etnaviv/etnaviv.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/etnaviv/etnaviv.c b/etnaviv/etnaviv.c
index 7e334ee..2662fc3 100644
--- a/etnaviv/etnaviv.c
+++ b/etnaviv/etnaviv.c
@@ -940,11 +940,6 @@ static Bool etnaviv_ScreenInit(ScreenPtr pScreen, struct drm_armada_bufmgr *mgr)
/* etnadrm fd, etnadrm buffer management */
dri_fd = etnaviv->conn->fd;
- name = "etnadrm";
- } else if (mgr) {
- /* armada fd, armada buffer management */
- dri_fd = GET_DRM_INFO(pScrn)->fd;
- etnaviv->dri2_armada = TRUE;
name = "etnaviv";
}