From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH] drm/i915: properly check for MODESET for kms driver ioctls Date: Tue, 24 Apr 2012 09:21:59 +0100 Message-ID: <1335255749_35096@CP5-2952> References: <1335219824_31493@CP5-2952> <1335248371-8571-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from fireflyinternet.com (smtp.fireflyinternet.com [109.228.6.236]) by gabe.freedesktop.org (Postfix) with ESMTP id 78A9C9F753 for ; Tue, 24 Apr 2012 01:22:36 -0700 (PDT) In-Reply-To: <1335248371-8571-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Intel Graphics Development Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org On Tue, 24 Apr 2012 08:19:31 +0200, Daniel Vetter wrote: > diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c > index 0f0fe31..aa14235 100644 > --- a/drivers/gpu/drm/i915/intel_overlay.c > +++ b/drivers/gpu/drm/i915/intel_overlay.c > @@ -1122,10 +1122,8 @@ int intel_overlay_put_image(struct drm_device *dev, void *data, > struct put_image_params *params; > int ret; > > - if (!dev_priv) { > - DRM_ERROR("called with no initialization\n"); > - return -EINVAL; > - } > + if (!drm_core_check_feature(dev, DRIVER_MODESET)) > + return -ENODEV; For the overlay case, we don't setup dev_priv->overlay either with nomodeset or on arches where we don't support overlays. So if (!dev_priv->overlay) return -ENODEV; seems to be the more generic test. Might want a comment that prevents the nomodeset case as well. -Chris -- Chris Wilson, Intel Open Source Technology Centre