xf86-video-intel: 2 commits - src/sna/kgem.c src/sna/sna_display.c

[Chris Wilson]

 src/sna/kgem.c        |    9 +--------
 src/sna/sna_display.c |    6 +++---
 2 files changed, 4 insertions(+), 11 deletions(-)

New commits:
commit a5be4210b7e8b4a895a70ba617fda45d2e0188f0
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Mar 26 09:05:48 2013 +0000

    sna: Trim removed fields from execbuffer2 for OpenBSD support
    
    Reported-by: Mark Kettenis <kettenis at openbsd.org>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index e0d864d..c6ed114 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -2622,18 +2622,11 @@ void _kgem_submit(struct kgem *kgem)
 			struct drm_i915_gem_execbuffer2 execbuf;
 			int ret, retry = 3;
 
-			VG_CLEAR(execbuf);
+			memset(&execbuf, 0, sizeof(execbuf));
 			execbuf.buffers_ptr = (uintptr_t)kgem->exec;
 			execbuf.buffer_count = kgem->nexec;
-			execbuf.batch_start_offset = 0;
 			execbuf.batch_len = batch_end*sizeof(uint32_t);
-			execbuf.cliprects_ptr = 0;
-			execbuf.num_cliprects = 0;
-			execbuf.DR1 = 0;
-			execbuf.DR4 = 0;
 			execbuf.flags = kgem->ring | kgem->batch_flags;
-			execbuf.rsvd1 = 0;
-			execbuf.rsvd2 = 0;
 
 			if (DBG_DUMP) {
 				int fd = open("/tmp/i915-batchbuffers.dump",
commit 761ab4124e00b3dbab15abe69a9b29d9c3d0da0d
Author: Mark Kettenis <kettenis at openbsd.org>
Date:   Mon Mar 25 22:40:35 2013 +0100

    sna: Fix OpenBSD backlight control implementation
    
    Fix cut'n'paste error such that this actually compiles.
    
    Signed-off-by: Mark Kettenis <kettenis at openbsd.org>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 7891c8d..6d61650 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -257,9 +257,9 @@ sna_output_backlight_init(xf86OutputPtr output)
 
 	DBG(("%s: found 'wscons'\n", __FUNCTION__));
 
-	intel_output->backlight_iface = "wscons";
-	intel_output->backlight_max = param.max;
-	intel_output->backlight_active_level = param.curval;
+	sna_output->backlight_iface = "wscons";
+	sna_output->backlight_max = param.max;
+	sna_output->backlight_active_level = param.curval;
 }
 
 #else