All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ben Widawsky <ben@bwidawsk.net>
To: intel-gfx@lists.freedesktop.org
Cc: Ben Widawsky <ben@bwidawsk.net>
Subject: [PATCH 02/10] drm/i915: Add dev to ppgtt
Date: Mon, 22 Oct 2012 18:34:07 -0700	[thread overview]
Message-ID: <1350956055-3224-3-git-send-email-ben@bwidawsk.net> (raw)
In-Reply-To: <1350956055-3224-1-git-send-email-ben@bwidawsk.net>

Some subsequent commits will need to know what generation we're running
on to do different pte encoding for the ppgtt. Since it's not much
hassle or overhead to store it in the ppgtt structure, do that.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
 drivers/gpu/drm/i915/i915_drv.h     | 1 +
 drivers/gpu/drm/i915/i915_gem_gtt.c | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index af0e97e..bf628c4 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -344,6 +344,7 @@ struct intel_device_info {
 #define I915_PPGTT_PD_ENTRIES 512
 #define I915_PPGTT_PT_ENTRIES 1024
 struct i915_hw_ppgtt {
+	struct drm_device *dev;
 	unsigned num_pd_entries;
 	struct page **pt_pages;
 	uint32_t pd_offset;
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 5751ad2..2b75028 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -78,6 +78,7 @@ int i915_gem_init_aliasing_ppgtt(struct drm_device *dev)
 	if (!ppgtt)
 		return ret;
 
+	ppgtt->dev = dev;
 	ppgtt->num_pd_entries = I915_PPGTT_PD_ENTRIES;
 	ppgtt->pt_pages = kzalloc(sizeof(struct page *)*ppgtt->num_pd_entries,
 				  GFP_KERNEL);
@@ -219,7 +220,7 @@ void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt,
 	switch (cache_level) {
 	case I915_CACHE_LLC_MLC:
 		/* Haswell doesn't set L3 this way */
-		if (IS_HASWELL(obj->base.dev))
+		if (IS_HASWELL(ppgtt->dev))
 			pte_flags |= GEN6_PTE_CACHE_LLC;
 		else
 			pte_flags |= GEN6_PTE_CACHE_LLC_MLC;
@@ -228,7 +229,7 @@ void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt,
 		pte_flags |= GEN6_PTE_CACHE_LLC;
 		break;
 	case I915_CACHE_NONE:
-		if (IS_HASWELL(obj->base.dev))
+		if (IS_HASWELL(ppgtt->dev))
 			pte_flags |= HSW_PTE_UNCACHED;
 		else
 			pte_flags |= GEN6_PTE_UNCACHED;
-- 
1.7.12.4

  parent reply	other threads:[~2012-10-23  1:34 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-23  1:34 [PATCH 00/10] Kill AGP dependencies for Gen6+ Ben Widawsky
2012-10-23  1:34 ` [PATCH 01/10] drm/i915: No LLC_MLC for HSW Ben Widawsky
2012-10-23 10:15   ` Mika Kuoppala
2012-10-25 20:47   ` Jesse Barnes
2012-10-26  1:03     ` Ben Widawsky
2012-10-23  1:34 ` Ben Widawsky [this message]
2012-10-25 20:48   ` [PATCH 02/10] drm/i915: Add dev to ppgtt Jesse Barnes
2012-10-23  1:34 ` [PATCH 03/10] drm/i915: introduce gtt_pte_t Ben Widawsky
2012-10-25 20:49   ` Jesse Barnes
2012-10-23  1:34 ` [PATCH 04/10] drm/i915: Extract PPGTT pte encoding Ben Widawsky
2012-10-25 20:50   ` Jesse Barnes
2012-10-23  1:34 ` [PATCH 05/10] drm/i915: move more pte encoding to pte encode Ben Widawsky
2012-10-25 20:51   ` Jesse Barnes
2012-10-31 10:52     ` Daniel Vetter
2012-10-23  1:34 ` [PATCH 06/10] drm/i915: Stop using AGP layer for GEN6+ Ben Widawsky
2012-10-23  9:59   ` Chris Wilson
2012-10-23 14:57     ` Ben Widawsky
2012-10-23 14:58       ` Daniel Vetter
2012-10-23 19:57         ` Ben Widawsky
2012-10-23 20:03           ` Daniel Vetter
2012-10-23 20:27             ` Ben Widawsky
2012-10-25 20:55           ` Jesse Barnes
2012-10-25 20:54       ` Jesse Barnes
     [not found]   ` <878vaxwk61.fsf@gaia.fi.intel.com>
2012-10-24 17:56     ` Ben Widawsky
2012-10-26 20:54   ` [PATCH 06/10 v2] " Ben Widawsky
2012-10-29  2:08     ` [PATCH 6/9 v3] " Ben Widawsky
2012-10-31  9:57       ` Daniel Vetter
2012-10-31 15:51         ` Ben Widawsky
2012-10-31 10:37     ` [PATCH 06/10 v2] " Chris Wilson
2012-10-23  1:34 ` [PATCH 07/10] drm/i915: Calculate correct stolen size for GEN7+ Ben Widawsky
2012-10-25 21:06   ` Jesse Barnes
2012-10-25 22:15     ` Ben Widawsky
2012-10-25 22:39       ` Jesse Barnes
2012-10-23  1:34 ` [PATCH 08/10] drm/i915: Kill off now unused gen6+ AGP code Ben Widawsky
2012-10-25 21:07   ` Jesse Barnes
2012-10-23  1:34 ` [PATCH 09/10] drm/i915: flush system agent TLBs on SNB Ben Widawsky
2012-10-23 14:17   ` Jesse Barnes
2012-10-23 14:28     ` Daniel Vetter
2012-10-23 14:35       ` Jesse Barnes
2012-10-23 14:42         ` Ben Widawsky
2012-10-25 21:07   ` Jesse Barnes
2012-10-26 20:55   ` [PATCH 09/10 v2] " Ben Widawsky
2012-10-23  1:34 ` [PATCH 10/10] drm/i915: Kill off actually requiring AGP Ben Widawsky
2012-10-23  2:03   ` Ben Widawsky
2012-10-25 21:09   ` Jesse Barnes
2012-10-25 22:15     ` Ben Widawsky
2012-10-25 22:39       ` Jesse Barnes
2012-10-25 22:47         ` Daniel Vetter
2012-10-26 20:52           ` Ben Widawsky
2012-10-26 20:58 ` [PATCH 00/10] Kill AGP dependencies for Gen6+ Ben Widawsky

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=1350956055-3224-3-git-send-email-ben@bwidawsk.net \
    --to=ben@bwidawsk.net \
    --cc=intel-gfx@lists.freedesktop.org \
    /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.