diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2015-02-10 14:01:17 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2015-02-10 14:01:17 +0000 |
| commit | 5568b24a328d13494a26cffb6e6f2b7168475aee (patch) | |
| tree | af75a2cc679ceb4340617a5aa648d97a68af47b8 | |
| parent | d1ebd27a31ad3fa76db408b05dea2a5c70cac75c (diff) | |
dri2: Disable integration with render-nodes
The executive decision has been made to render DRI2 inoperable with
render-nodes, so keep on passing the master device path to clients.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/intel_device.c | 6 | ||||
| -rw-r--r-- | src/intel_driver.h | 1 | ||||
| -rw-r--r-- | src/sna/sna_dri2.c | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/intel_device.c b/src/intel_device.c index c835a5d3..3e84413d 100644 --- a/src/intel_device.c +++ b/src/intel_device.c @@ -682,6 +682,12 @@ struct intel_device *intel_get_device(ScrnInfoPtr scrn, int *fd) return dev; } +const char *intel_get_master_name(struct intel_device *dev) +{ + assert(dev && dev->master_node); + return dev->master_node; +} + const char *intel_get_client_name(struct intel_device *dev) { assert(dev && dev->render_node); diff --git a/src/intel_driver.h b/src/intel_driver.h index 28ed1a0e..fc9beaf0 100644 --- a/src/intel_driver.h +++ b/src/intel_driver.h @@ -127,6 +127,7 @@ int intel_open_device(int entity_num, int __intel_peek_fd(ScrnInfoPtr scrn); struct intel_device *intel_get_device(ScrnInfoPtr scrn, int *fd); int intel_has_render_node(struct intel_device *dev); +const char *intel_get_master_name(struct intel_device *dev); const char *intel_get_client_name(struct intel_device *dev); int intel_get_client_fd(struct intel_device *dev); int intel_get_device_id(struct intel_device *dev); diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c index 4a6ea15d..f4e2ced2 100644 --- a/src/sna/sna_dri2.c +++ b/src/sna/sna_dri2.c @@ -3349,7 +3349,7 @@ bool sna_dri2_open(struct sna *sna, ScreenPtr screen) memset(&info, '\0', sizeof(info)); info.fd = sna->kgem.fd; info.driverName = dri_driver_name(sna); - info.deviceName = intel_get_client_name(sna->dev); + info.deviceName = intel_get_master_name(sna->dev); DBG(("%s: loading dri driver '%s' [gen=%d] for device '%s'\n", __FUNCTION__, info.driverName, sna->kgem.gen, info.deviceName)); |