All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: ben@bwidawsk.net, miku@iki.fi
Subject: [PATCH 1/3] drm/i915: export vmap_batch from command parser
Date: Tue, 22 Apr 2014 20:19:42 +0300	[thread overview]
Message-ID: <1398187184-14919-2-git-send-email-mika.kuoppala@intel.com> (raw)
In-Reply-To: <1398187184-14919-1-git-send-email-mika.kuoppala@intel.com>

as need it for generating batch commands and state
in subsequent commit

Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
---
 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

  reply	other threads:[~2014-04-22 17:19 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-22 17:19 [RFC 0/3] render state initialization (bdw rc6) Mika Kuoppala
2014-04-22 17:19 ` Mika Kuoppala [this message]
2014-04-22 17:19 ` [PATCH 2/3] drm/i915: add render state initialization Mika Kuoppala
2014-04-22 20:26   ` Daniel Vetter
2014-05-06  1:20   ` Ben Widawsky
2014-05-06 13:33     ` Mika Kuoppala
2014-04-22 17:19 ` [PATCH 3/3] drm/i915: add null render states for gen6, gen7 and gen8 Mika Kuoppala
2014-05-02 20:43   ` Damien Lespiau
2014-05-02 22:09     ` Damien Lespiau
2014-04-22 20:51 ` [RFC 0/3] render state initialization (bdw rc6) Chris Wilson
2014-04-23 18:04   ` Ben Widawsky
2014-04-24 18:51 ` Kristen Carlson Accardi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1398187184-14919-2-git-send-email-mika.kuoppala@intel.com \
    --to=mika.kuoppala@linux.intel.com \
    --cc=ben@bwidawsk.net \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=miku@iki.fi \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.