From patchwork Tue Sep 8 11:56:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7140291 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B5F089F1D5 for ; Tue, 8 Sep 2015 11:53:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EF2FE206F2 for ; Tue, 8 Sep 2015 11:53:58 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 06D1D206EB for ; Tue, 8 Sep 2015 11:53:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 214806E59B; Tue, 8 Sep 2015 04:53:56 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4C9996E569 for ; Tue, 8 Sep 2015 04:53:55 -0700 (PDT) Received: by wicge5 with SMTP id ge5so113436896wic.0 for ; Tue, 08 Sep 2015 04:53:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yOMHO2+hinQPDEuuFW8epd2YRxYNBBLbGqma6uWFTqo=; b=Esrcw24tyt6pcukpAty5oGRvKAPd7zFF3i0U83/rOH9G+rRmIe8qAoh2e5JcxOl1aV CezvZmYnjo1rrvfF//UyUoh4iwz1pQbvVjZNEYkIUwsRstTd4FHFwDprRwNzzUoAraEL KlCj/LIrqaivipf/aYoUj+bAdzCpQed9AloDc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yOMHO2+hinQPDEuuFW8epd2YRxYNBBLbGqma6uWFTqo=; b=gho5qgIASzmBXp04AV3xGxpB+HRWaCj4O9sCg9ZvUWflJFfxJmI1RuVBDr0pUN0I34 JDjAjRDJdk40UTsn05Bx6JzXwN5z674PgYjtLdXOAGrdmSclkr9R0ob8YXRe9bRd0wnA Z8HHPeI00i2PFbyUMk1L6rXkeG2tjr4CR1vhsR+7v4V47JnKJiTXu0fr+X1S/9tfL42B 5HOoSMc5MGuPDpV2KFZDhEB49EbigZSxe9xQ+MwsrPLgoWVcLhCzTxzteEAWGfs4bdUj 2quJ4InRtNR+dbKrPi2IRywNZ4wjrQISlD3WlmTSaGvvyBXbkfo/h/8GqtPUSNjbMzzq 8OJw== X-Gm-Message-State: ALoCoQlQ4R291R7S+TiN92KL+8QyOulwjnH3b1knRmU/s4IeZ14+UAjLRrsH82gvPArzHMshi3BR X-Received: by 10.180.211.239 with SMTP id nf15mr45850714wic.13.1441713233903; Tue, 08 Sep 2015 04:53:53 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id o10sm4480145wia.4.2015.09.08.04.53.52 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Sep 2015 04:53:53 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 02/11] drm/i915: Kill cross-module option depencies Date: Tue, 8 Sep 2015 13:56:22 +0200 Message-Id: <1441713391-24732-3-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1441713391-24732-1-git-send-email-daniel.vetter@ffwll.ch> References: <1441713391-24732-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Makes it really hard to reason about these since there are dependency loops. Also if you touch them and don't know what you're doing you get to keep all the pieces. v2: Move marking debug module options as _unsafe into a separate patch, as requested by Jani. Cc: Jani Nikula Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 87862813cfde..92287dfffceb 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -140,7 +140,7 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt) return 0; } - if (INTEL_INFO(dev)->gen >= 8 && i915.enable_execlists) + if (INTEL_INFO(dev)->gen >= 8) return 2; else return has_aliasing_ppgtt ? 1 : 0; diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 28a712e7d2d0..07b316a72c02 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -248,8 +248,7 @@ int intel_sanitize_enable_execlists(struct drm_device *dev, int enable_execlists if (enable_execlists == 0) return 0; - if (HAS_LOGICAL_RING_CONTEXTS(dev) && USES_PPGTT(dev) && - i915.use_mmio_flip >= 0) + if (HAS_LOGICAL_RING_CONTEXTS(dev)) return 1; return 0;