diff options
| author | Keith Packard <keithp@keithp.com> | 2017-10-12 21:24:03 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2017-10-12 21:24:03 -0700 |
| commit | fd3a78649e4ed986e621d8e6e88a247888139049 (patch) | |
| tree | 094d3eec3ae44eff3c670ca602aa8207c2c30dcd | |
| parent | f553081557572a55fbf343b3f3216cab2378399e (diff) | |
modesetting: Kernel no longer wants encoders for leases
They weren't useful anyways; don't add them.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | hw/xfree86/drivers/modesetting/drmmode_display.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index 38d078b60..7ca6cd996 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -2081,23 +2081,14 @@ drmmode_create_lease(RRLeasePtr lease, int *fd) drmmode_ptr drmmode = &ms->drmmode; int ncrtc = lease->numCrtcs; int noutput = lease->numOutputs; - int nencoder = 0; int nobjects; - int c, o, e; + int c, o; int i; int lease_fd; uint32_t *objects; drmmode_lease_private_ptr lease_private; - /* Find encoders for each output */ - for (o = 0; o < noutput; o++) { - xf86OutputPtr output = lease->outputs[o]->devPrivate; - drmmode_output_private_ptr drmmode_output = output->driver_private; - - nencoder += drmmode_output->mode_output->count_encoders; - } - - nobjects = ncrtc + noutput + nencoder; + nobjects = ncrtc + noutput; if (nobjects == 0) return BadValue; @@ -2123,15 +2114,13 @@ drmmode_create_lease(RRLeasePtr lease, int *fd) objects[i++] = drmmode_crtc->mode_crtc->crtc_id; } - /* Add connector and encoder ids */ + /* Add connector ids */ for (o = 0; o < noutput; o++) { xf86OutputPtr output = lease->outputs[o]->devPrivate; drmmode_output_private_ptr drmmode_output = output->driver_private; objects[i++] = drmmode_output->mode_output->connector_id; - for (e = 0; e < drmmode_output->mode_output->count_encoders; e++) - objects[i++] = drmmode_output->mode_encoders[e]->encoder_id; } /* call kernel to create lease */ |