From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: [PATCH 12/15] drm/i915: infrastructure to support scheduler types Date: Fri, 18 Nov 2011 18:24:29 -0800 Message-ID: <1321669472-8045-13-git-send-email-ben@bwidawsk.net> References: <1321669472-8045-1-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from cloud01.chad-versace.us (184-106-247-128.static.cloud-ips.com [184.106.247.128]) by gabe.freedesktop.org (Postfix) with ESMTP id 23CCAA0EF8 for ; Fri, 18 Nov 2011 18:25:04 -0800 (PST) In-Reply-To: <1321669472-8045-1-git-send-email-ben@bwidawsk.net> 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-gfx@lists.freedesktop.org Cc: Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org As of now there are only two types, fairness, and none. This can be set using the same module parameter, and will use default values for whatever type is chosen. Those values should be readable through debugfs. --- drivers/gpu/drm/i915/i915_drv.h | 4 ++++ drivers/gpu/drm/i915/i915_gem.c | 9 ++++++--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 3ce03a0..a12445b 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -744,6 +744,10 @@ typedef struct drm_i915_private { * we'd want to abstract this better. */ struct { + #define I915_SCHEDULER_NONE 0 + #define I915_SCHEDULER_FAIR 1 + #define I915_SCHEDULER_INVALID 2 + unsigned type; /* Point at which we consider blocking */ unsigned high_watermark; /* Point when we consider unblocking */ diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 5b7072d..69d4a59 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3943,9 +3943,12 @@ i915_gem_load(struct drm_device *dev) dev_priv->mm.inactive_shrinker.seeks = DEFAULT_SEEKS; register_shrinker(&dev_priv->mm.inactive_shrinker); - /* Set some decent defaults for the scheudler */ - dev_priv->scheduler.high_watermark = 50; - dev_priv->scheduler.low_watermark = 5; + if (i915_scheduler <= I915_SCHEDULER_INVALID) { + dev_priv->scheduler.type = i915_scheduler; + /* Set some decent defaults for the fair scheduler */ + dev_priv->scheduler.high_watermark = 50; + dev_priv->scheduler.low_watermark = 5; + } } /* diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 744ff9b..c2e96be 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -970,7 +970,7 @@ i915_schedule(struct drm_device *dev, struct intel_ring_buffer *ring, struct drm int ret, i = 0; #define BLOCK_CONDITION ( \ - i915_scheduler && \ + (dev_priv->scheduler.type != I915_SCHEDULER_NONE) && \ (file_priv->outstanding_requests > dev_priv->scheduler.high_watermark)) #define OUT_CONDITION ( \ (atomic_read(&dev_priv->mm.wedged)) || \ -- 1.7.7.3