drm: Branch 'master'

[<kw...@ke...>]

 intel/intel_bufmgr_gem.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 992e2afd59539d169689bf21d78fac8b5cea4e3c
Author: Kenneth Graunke <ke...@wh...>
Date:   Thu Jul 12 13:41:11 2012 -0700

    intel: Change context create failure message to from fprintf to DBG().
    
    Since there is no getparam for hardware context support, Mesa always
    tries to obtain a context by calling drm_intel_gem_context_create and
    NULL-checking the result.  On an older kernel without context support,
    this caused libdrm to print an unwanted message to stderr:
    
    DRM_IOCTL_I915_GEM_CONTEXT_CREATE failed: Invalid argument
    
    In fact, this caused every Piglit test to fail with a "warn" status due
    to the unrecognized error message.
    
    Change the message to use DBG() rather than fprintf(), so people can
    still get the debug message, but it won't spam normally.
    
    Reviewed-by: Ben Widawsky <be...@bw...>
    Signed-off-by: Kenneth Graunke <ke...@wh...>

diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index a957c28..12a3197 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -2851,8 +2851,8 @@ drm_intel_gem_context_create(drm_intel_bufmgr *bufmgr)
 
 	ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_CONTEXT_CREATE, &create);
 	if (ret != 0) {
-		fprintf(stderr, "DRM_IOCTL_I915_GEM_CONTEXT_CREATE failed: %s\n",
-			strerror(errno));
+		DBG("DRM_IOCTL_I915_GEM_CONTEXT_CREATE failed: %s\n",
+		    strerror(errno));
 		return NULL;
 	}