From patchwork Thu Feb 24 19:04:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Riesen X-Patchwork-Id: 588241 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1OJ4Bws029648 for ; Thu, 24 Feb 2011 19:04:31 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C91B29F2FC for ; Thu, 24 Feb 2011 11:04:10 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-bw0-f49.google.com (mail-bw0-f49.google.com [209.85.214.49]) by gabe.freedesktop.org (Postfix) with ESMTP id B07239E756 for ; Thu, 24 Feb 2011 11:04:02 -0800 (PST) Received: by bwz1 with SMTP id 1so1434911bwz.36 for ; Thu, 24 Feb 2011 11:04:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=Nsr0/zOLvMF2g5d+efSnmusFPcbIzRg6M/noQd9FRVA=; b=NF9jLuU8r5wdpNgogMbV9XSrjXliQI8dhLUMJ1q62tanwlI4gZMX7IFPc2Duc5Pklw aKCMSAPfyOuHRbt8hy7kaCl8BtaDZoRWrkRrVCv1anRdk4F9DDEm5Y76ailfnKwbpQ1I MUTjQ//K3lAxVjAPexlqJKB8K7SmKmBmmjjUU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=UuOYfb9UWzI2aEr0osgabShmcV3NOLCrhJAMGylyl/2DK3wrIUEfSn12wEukgkmcDA DUkkfaAoJbmkeE4m+741iGDPeH+iGDOM5lCzNwlxur56V/MiTGQ5S0/KJAchCP2lPUXF u7YS8vniLvV3Jj+IEapbYooVcwnlqb83n/adk= MIME-Version: 1.0 Received: by 10.204.52.138 with SMTP id i10mr1182720bkg.23.1298574240276; Thu, 24 Feb 2011 11:04:00 -0800 (PST) Received: by 10.204.102.14 with HTTP; Thu, 24 Feb 2011 11:04:00 -0800 (PST) In-Reply-To: References: <0d30dc$l7ehaa@orsmga001.jf.intel.com> Date: Thu, 24 Feb 2011 20:04:00 +0100 Message-ID: Subject: Re: [git pull] drm fixes From: Alex Riesen To: Indan Zupancic Cc: linux-kernel@vger.kernel.org, DRI mailing list , Linus Torvalds X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 24 Feb 2011 19:04:31 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 17bd766..8f8a6a3 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -764,7 +764,7 @@ static int i915_getparam(struct drm_device *dev, void *data, break; case I915_PARAM_HAS_RELAXED_FENCING: value = 1; - break; + return -EINVAL; case I915_PARAM_HAS_COHERENT_RINGS: value = 1; break;