From: Mika Kuoppala Subject: [PATCH 1/3] drm/i915: export vmap_batch from command parser Date: Tue, 22 Apr 2014 20:19:42 +0300 Message-ID: <1398187184-14919-2-git-send-email-mika.kuoppala@intel.com> References: <1398187184-14919-1-git-send-email-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 6EC076E911 for ; Tue, 22 Apr 2014 10:19:45 -0700 (PDT) In-Reply-To: <1398187184-14919-1-git-send-email-mika.kuoppala@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: ben@bwidawsk.net, miku@iki.fi List-Id: intel-gfx@lists.freedesktop.org as need it for generating batch commands and state in subsequent commit Signed-off-by: Mika Kuoppala --- drivers/gpu/drm/i915/i915_cmd_parser.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c index 9bac097..5fab893 100644 --- a/drivers/gpu/drm/i915/i915_cmd_parser.c +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c @@ -704,7 +704,7 @@ static bool valid_reg(const u32 *table, int count, u32 addr) return false; } -static u32 *vmap_batch(struct drm_i915_gem_object *obj) +void *i915_gem_vmap_obj(struct drm_i915_gem_object *obj) { int i; void *addr = NULL; @@ -882,7 +882,7 @@ int i915_parse_cmds(struct intel_ring_buffer *ring, return ret; } - batch_base = vmap_batch(batch_obj); + batch_base = i915_gem_vmap_obj(batch_obj); if (!batch_base) { DRM_DEBUG_DRIVER("CMD: Failed to vmap batch\n"); i915_gem_object_unpin_pages(batch_obj); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 92c3095..43b022c 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2413,6 +2413,7 @@ void i915_get_extra_instdone(struct drm_device *dev, uint32_t *instdone); const char *i915_cache_level_str(int type); /* i915_cmd_parser.c */ +void __must_check *i915_gem_vmap_obj(struct drm_i915_gem_object *obj); int i915_cmd_parser_get_version(void); void i915_cmd_parser_init_ring(struct intel_ring_buffer *ring); bool i915_needs_cmd_parser(struct intel_ring_buffer *ring); -- 1.7.9.5