From: Daniel Vetter Subject: Re: [RFC 11/12] drm/i915: Remove dead code Date: Tue, 4 Mar 2014 09:58:16 +0100 Message-ID: <20140304085816.GO17001@phenom.ffwll.local> References: <1392969328-23133-1-git-send-email-thierry.reding@gmail.com> <1392969328-23133-12-git-send-email-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ea0-f181.google.com (mail-ea0-f181.google.com [209.85.215.181]) by gabe.freedesktop.org (Postfix) with ESMTP id 8A1A2FC060 for ; Tue, 4 Mar 2014 00:58:21 -0800 (PST) Received: by mail-ea0-f181.google.com with SMTP id k10so185371eaj.40 for ; Tue, 04 Mar 2014 00:58:20 -0800 (PST) Content-Disposition: inline In-Reply-To: <1392969328-23133-12-git-send-email-thierry.reding@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: Thierry Reding Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Fri, Feb 21, 2014 at 08:55:27AM +0100, Thierry Reding wrote: > From: Thierry Reding > > The i915 driver sets DRIVER_GEM unconditionally, so testing for the > feature will always fail. > > Signed-off-by: Thierry Reding Queued for -next, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/i915_gem_context.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c > index e9bba3c29ec6..da74522f377d 100644 > --- a/drivers/gpu/drm/i915/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/i915_gem_context.c > @@ -746,9 +746,6 @@ int i915_gem_context_create_ioctl(struct drm_device *dev, void *data, > struct i915_hw_context *ctx; > int ret; > > - if (!drm_core_check_feature(dev, DRIVER_GEM)) > - return -ENODEV; > - > if (!HAS_HW_CONTEXTS(dev)) > return -ENODEV; > > @@ -775,9 +772,6 @@ int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data, > struct i915_hw_context *ctx; > int ret; > > - if (!drm_core_check_feature(dev, DRIVER_GEM)) > - return -ENODEV; > - > if (args->ctx_id == DEFAULT_CONTEXT_ID) > return -ENOENT; > > -- > 1.8.4.2 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch