From: Imre Deak <imre.deak@intel.com>
To: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Tejun Heo <tj@kernel.org>, Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH 2/2] Revert "drm/i915: set dummy page for stolen objects"
Date: Tue, 26 Mar 2013 15:14:19 +0200 [thread overview]
Message-ID: <1364303659-1951-3-git-send-email-imre.deak@intel.com> (raw)
In-Reply-To: <1364303659-1951-1-git-send-email-imre.deak@intel.com>
Since for_each_sg_page supports already memory w/o backing pages we can
revert the corresponding workaround.
This reverts commit 5bd4687e57bbacec20930f580d025aee9fa1f4d8.
---
drivers/gpu/drm/i915/i915_gem_stolen.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index efaaba5..69d97cb 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -222,8 +222,8 @@ i915_pages_create_for_stolen(struct drm_device *dev,
}
sg = st->sgl;
- /* we set the dummy page here only to make for_each_sg_page work */
- sg_set_page(sg, dev_priv->gtt.scratch_page, size, offset);
+ sg->offset = offset;
+ sg->length = size;
sg_dma_address(sg) = (dma_addr_t)dev_priv->mm.stolen_base + offset;
sg_dma_len(sg) = size;
--
1.7.10.4
next prev parent reply other threads:[~2013-03-26 13:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-26 13:14 [PATCH 0/2] lib/scatterlist: sg_page_iter: support for memory w/o backing pages Imre Deak
2013-03-26 13:14 ` [PATCH 1/2] lib/scatterlist: sg_page_iter: support sg lists " Imre Deak
2013-03-26 13:14 ` Imre Deak [this message]
2013-03-26 14:50 ` [PATCH 0/2] lib/scatterlist: sg_page_iter: support for memory " Daniel Vetter
2013-03-26 19:57 ` Andrew Morton
2013-03-27 0:21 ` Daniel Vetter
2013-03-26 22:50 ` [Intel-gfx] " Damien Lespiau
2013-03-27 0:20 ` Daniel Vetter
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=1364303659-1951-3-git-send-email-imre.deak@intel.com \
--to=imre.deak@intel.com \
--cc=akpm@linux-foundation.org \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®