From: "Goel, Akash" <akash.goel@intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Cc: akash.goel@intel.com
Subject: Re: [PATCH 10/11] drm/i915: Support to create write combined type vmaps
Date: Tue, 28 Jun 2016 15:55:15 +0530 [thread overview]
Message-ID: <96c0bfc2-4f9d-117d-f681-d17e004d2a6f@intel.com> (raw)
In-Reply-To: <20160628095239.GK25424@nuc-i3427.alporthouse.com>
On 6/28/2016 3:22 PM, Chris Wilson wrote:
> On Mon, Jun 27, 2016 at 05:46:57PM +0530, akash.goel@intel.com wrote:
>> From: Chris Wilson <chris@chris-wilson.co.uk>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>> index 20c701c..3ef1ee5 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -3197,6 +3197,7 @@ static inline void i915_gem_object_unpin_pages(struct drm_i915_gem_object *obj)
>> /**
>> * i915_gem_object_pin_map - return a contiguous mapping of the entire object
>> * @obj - the object to map into kernel address space
>> + * &use_wc - whether the mapping should be using WC or WB pgprot_t
>
> s/&/@/ I think
Sorry my bad.
>
>> /* get, pin, and map the pages of the object into kernel space */
>> -void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj)
>> +void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj, bool use_wc)
>> {
>> + void *ptr;
>> + bool has_wc;
>> + bool pinned;
>> int ret;
>>
>> lockdep_assert_held(&obj->base.dev->struct_mutex);
>> + GEM_BUG_ON((obj->ops->flags & I915_GEM_OBJECT_HAS_STRUCT_PAGE) == 0);
>>
>> ret = i915_gem_object_get_pages(obj);
>> if (ret)
>> return ERR_PTR(ret);
>>
>> + GEM_BUG_ON(obj->pages == NULL);
>> i915_gem_object_pin_pages(obj);
>>
>> - if (!obj->mapping) {
>> - obj->mapping = i915_gem_object_map(obj);
>> - if (!obj->mapping) {
>> - i915_gem_object_unpin_pages(obj);
>> - return ERR_PTR(-ENOMEM);
>> + pinned = (obj->pages_pin_count > 1);
>
> Too many ()
Sorry is the above condition not correct ?
If pin count is more than 1 then it implies that pages have been pinned
elsewhere also, so pages were already pinned before they were pinned
one more time, inside this function.
Please let me know, will fix it.
Best regards
Akash
>
> Hmm. It may look a bit dubious if I add my r-b here. But I didn't spot
> any rebasing errors.
> -Chris
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-06-28 10:25 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-27 12:16 [PATCH v2 00/11] Support for sustained capturing of GuC firmware logs akash.goel
2016-06-27 12:16 ` [PATCH 01/11] drm/i915: Decouple GuC log setup from verbosity parameter akash.goel
2016-06-27 15:00 ` Tvrtko Ursulin
2016-06-27 15:32 ` Goel, Akash
2016-06-27 15:56 ` Tvrtko Ursulin
2016-06-27 16:25 ` Goel, Akash
2016-06-27 12:16 ` [PATCH 02/11] drm/i915: Add GuC ukernel logging related fields to fw interface file akash.goel
2016-06-27 15:09 ` Tvrtko Ursulin
2016-06-27 12:16 ` [PATCH 03/11] drm/i915: Add low level set of routines for programming PM IER/IIR/IMR register set akash.goel
2016-06-27 15:46 ` Tvrtko Ursulin
2016-06-27 16:35 ` Goel, Akash
2016-06-28 8:35 ` Tvrtko Ursulin
2016-06-28 9:21 ` Goel, Akash
2016-06-27 12:16 ` [PATCH 04/11] drm/i915: Support for GuC interrupts akash.goel
2016-06-28 10:03 ` Tvrtko Ursulin
2016-06-28 11:12 ` Goel, Akash
2016-06-28 13:44 ` Tvrtko Ursulin
2016-07-01 6:16 ` Goel, Akash
2016-07-01 8:47 ` Tvrtko Ursulin
2016-07-01 9:57 ` Goel, Akash
2016-06-27 12:16 ` [PATCH 05/11] drm/i915: Handle log buffer flush interrupt event from GuC akash.goel
2016-06-27 12:16 ` [PATCH 06/11] drm/i915: Add a relay backed debugfs interface for capturing GuC logs akash.goel
2016-06-27 14:23 ` kbuild test robot
2016-06-27 17:50 ` kbuild test robot
2016-06-28 9:47 ` Chris Wilson
2016-06-28 10:01 ` Goel, Akash
2016-06-27 12:16 ` [PATCH 07/11] drm/i915: Forcefully flush GuC log buffer on reset akash.goel
2016-06-27 12:16 ` [PATCH 08/11] drm/i915: Debugfs support for GuC logging control akash.goel
2016-06-27 12:16 ` [PATCH 09/11] drm/i915: New module param to control the size of buffer used for storing GuC firmware logs akash.goel
2016-06-27 13:31 ` Jani Nikula
2016-06-27 14:55 ` Goel, Akash
2016-06-27 12:16 ` [PATCH 10/11] drm/i915: Support to create write combined type vmaps akash.goel
2016-06-28 9:52 ` Chris Wilson
2016-06-28 10:25 ` Goel, Akash [this message]
2016-06-28 10:42 ` Chris Wilson
2016-06-27 12:16 ` [PATCH 11/11] drm/i915: Use uncached(WC) mapping for acessing the GuC log buffer akash.goel
2016-06-27 13:46 ` ✗ Ro.CI.BAT: failure for Support for sustained capturing of GuC firmware logs (rev3) Patchwork
-- strict thread matches above, loose matches on Subject: below --
2016-06-10 13:36 [PATCH 00/11] Support for sustained capturing of GuC firmware logs akash.goel
2016-06-10 13:36 ` [PATCH 10/11] drm/i915: Support to create write combined type vmaps akash.goel
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=96c0bfc2-4f9d-117d-f681-d17e004d2a6f@intel.com \
--to=akash.goel@intel.com \
--cc=chris@chris-wilson.co.uk \
--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.