From: Chris Wilson <chris@chris-wilson.co.uk>
To: Ben Widawsky <ben@bwidawsk.net>
Cc: Intel GFX <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 2/9] drm/i915: Convert renderctx to a regular context
Date: Mon, 15 Jul 2013 11:24:18 +0100 [thread overview]
Message-ID: <20130715102418.GA32386@cantiga.alporthouse.com> (raw)
In-Reply-To: <1373818974-23102-3-git-send-email-ben@bwidawsk.net>
On Sun, Jul 14, 2013 at 09:22:46AM -0700, Ben Widawsky wrote:
> @@ -3650,10 +3650,14 @@ static int ironlake_setup_rc6(struct drm_device *dev)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
>
> - if (dev_priv->ips.renderctx == NULL)
> - dev_priv->ips.renderctx = intel_alloc_context_page(dev);
> - if (!dev_priv->ips.renderctx)
> + if (dev_priv->ips.renderctx.obj == NULL)
> + dev_priv->ips.renderctx.obj = intel_alloc_context_page(dev);
> + if (!dev_priv->ips.renderctx.obj)
> return -ENOMEM;
> + else {
> + dev_priv->ips.renderctx.id = DEFAULT_CONTEXT_ID;
> + dev_priv->ips.renderctx.ring = &dev_priv->ring[RCS];
> + }
Make this a bit more consistent style wise. You are mixing here !obj and
obj == NULL, along with a superfluous else{}.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
next prev parent reply other threads:[~2013-07-15 10:24 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-14 16:22 [PATCH 0/9] HW contest support for Ironlake Ben Widawsky
2013-07-14 16:22 ` [PATCH 1/9] drm/i915: move ilk rc6 context setup Ben Widawsky
2013-07-14 16:22 ` [PATCH 2/9] drm/i915: Convert renderctx to a regular context Ben Widawsky
2013-07-15 10:24 ` Chris Wilson [this message]
2013-07-15 18:04 ` [PATCH 2/9] [v2] " Ben Widawsky
2013-07-14 16:22 ` [PATCH 3/9] drm/i915: Make ILK context objects more like others Ben Widawsky
2013-07-14 19:10 ` [PATCH 3/9] [v2] " Ben Widawsky
2013-07-14 16:22 ` [PATCH 4/9] drm/i915: Add gen5 support to mi_set_context Ben Widawsky
2013-07-14 16:22 ` [PATCH 5/9] drm/i915: Use do_switch for ILK renderctx Ben Widawsky
2013-07-14 16:22 ` [PATCH 6/9] drm/i915: HW contexts for ILK Ben Widawsky
2013-07-14 16:22 ` [PATCH 7/9] drm/i915: Use only the default context " Ben Widawsky
2013-07-14 16:22 ` [PATCH 8/9] drm/i915: Restore ILK powerctx pin attributes Ben Widawsky
2013-07-15 10:30 ` Chris Wilson
2013-07-15 17:58 ` Ben Widawsky
2013-07-15 22:12 ` Chris Wilson
2013-07-14 16:22 ` [PATCH 9/9] drm/i915: Re-enable rc6 on ILK (again^5) Ben Widawsky
2013-07-14 18:35 ` Daniel Vetter
2013-07-14 19:09 ` [PATCH 9/9] [v2] drm/i915: enable rc6 on ILK again^5 Ben Widawsky
2013-07-14 16:22 ` [PATCH] i965: Gen5: Use HW contexts on Ironlake Ben Widawsky
2013-07-14 16:24 ` [PATCH 0/9] HW contest support for Ironlake Ben Widawsky
2013-07-14 17:38 ` [PATCH 0/9] HW context support for Ironlake (was: Re: [PATCH 0/9] HW contest support for Ironlake) Ben Widawsky
2013-07-15 10:32 ` [PATCH 0/9] HW contest support for Ironlake Chris Wilson
2013-07-15 12:44 ` Chris Wilson
2013-07-15 17:24 ` Ben Widawsky
2013-07-15 18:52 ` Chris Wilson
2013-07-16 18:21 ` Ben Widawsky
-- strict thread matches above, loose matches on Subject: below --
2013-09-05 13:18 [PATCH 1/9] drm/i915: move ilk rc6 context setup Chris Wilson
2013-09-05 13:18 ` [PATCH 2/9] drm/i915: Convert renderctx to a regular context Chris Wilson
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=20130715102418.GA32386@cantiga.alporthouse.com \
--to=chris@chris-wilson.co.uk \
--cc=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox