diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-07-22 09:40:14 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-07-22 09:41:24 +0100 |
| commit | aa5351dbbe0a50080efee35a3d494b3a20b7c9f6 (patch) | |
| tree | ea3f27ab2f319a98d3aa5f2aaede084e2dc39447 | |
| parent | feba651db8dd61356fb6296b55d46168bd4d7011 (diff) | |
| download | xorg-driver-xf86-video-intel-aa5351dbbe0a50080efee35a3d494b3a20b7c9f6.tar.gz | |
sna: Ensure errno is set after failure before reporting a modeset failure
A few paths we report a sanity check failure which do not set errno, but
we then print out the errno as part of our message to the user. Set it
to a sane value in those cases.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_display.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index fbd7cffc..af884c48 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -869,8 +869,10 @@ rotation_set(struct sna *sna, struct plane *p, uint32_t desired) if (desired == p->rotation.current) return true; - if ((desired & p->rotation.supported) == 0) + if ((desired & p->rotation.supported) == 0) { + errno = EINVAL; return false; + } DBG(("%s: obj=%d, type=%x prop=%d set-rotation=%x\n", __FUNCTION__, p->id, LOCAL_MODE_OBJECT_PLANE, p->rotation.prop, desired)); @@ -961,8 +963,10 @@ sna_crtc_apply(xf86CrtcPtr crtc) xf86IsEntityShared(crtc->scrn->entityList[0])); output_ids[output_count] = to_connector_id(output); - if (++output_count == ARRAY_SIZE(output_ids)) + if (++output_count == ARRAY_SIZE(output_ids)) { + errno = EINVAL; return false; + } } VG_CLEAR(arg); @@ -2055,6 +2059,8 @@ retry: /* Attach per-crtc pixmap or direct */ sna_crtc->bo = bo; mode_to_kmode(&sna_crtc->kmode, mode); if (!sna_crtc_apply(crtc)) { + int err = errno; + kgem_bo_destroy(&sna->kgem, bo); if (!sna_crtc->shadow) { @@ -2063,7 +2069,7 @@ retry: /* Attach per-crtc pixmap or direct */ } xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR, - "failed to set mode: %s\n", strerror(errno)); + "failed to set mode: %s [%d]\n", strerror(err), err); sna_crtc->offset = saved_offset; sna_crtc->transform = saved_transform; |