Mesa (master): radeon: Fix command type for DRM_RADEON_IRQ_EMIT ioctl.

Jesse Barnes jbarnes at kemper.freedesktop.org
Mon Apr 19 16:56:56 UTC 2010


Module: Mesa
Branch: master
Commit: c39ab02ae9be9c6adf8f2d1382fed88f1daf03bf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c39ab02ae9be9c6adf8f2d1382fed88f1daf03bf

Author: Owain Ainsworth <zerooa at googlemail.com>
Date:   Sun Apr 18 16:55:37 2010 -0700

radeon: Fix command type for DRM_RADEON_IRQ_EMIT ioctl.

This should be drmCommandWriteRead to avoid an EINVAL error on systems
that strictly check ioctl args. This command has been r/w for ever.
Discussion with airlied agreed that this was the correct course.

Signed-off-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/drivers/dri/radeon/radeon_cs_legacy.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c b/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
index cc951a1..c2722a4 100644
--- a/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
+++ b/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
@@ -326,7 +326,7 @@ static int cs_emit(struct radeon_cs_int *cs)
         (!IS_R600_CLASS(csm->ctx->radeonScreen))) { /* +r6/r7 : No irq for r6/r7 yet. */
 	drm_radeon_irq_emit_t emit_cmd;
 	emit_cmd.irq_seq = (int*)&csm->pending_age;
-	r = drmCommandWrite(cs->csm->fd, DRM_RADEON_IRQ_EMIT, &emit_cmd, sizeof(emit_cmd));
+	r = drmCommandWriteRead(cs->csm->fd, DRM_RADEON_IRQ_EMIT, &emit_cmd, sizeof(emit_cmd));
 	if (r) {
 		return r;
 	}




More information about the mesa-commit mailing list