From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH 2/2] drm/i915: add context into request struct Date: Mon, 06 May 2013 12:28:18 +0300 Message-ID: <871u9k5ufh.fsf@gaia.fi.intel.com> References: <1367502488-4108-1-git-send-email-mika.kuoppala@intel.com> <1367502488-4108-2-git-send-email-mika.kuoppala@intel.com> <20130504000742.GA954@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 9589DE5F2E for ; Mon, 6 May 2013 02:28:38 -0700 (PDT) In-Reply-To: <20130504000742.GA954@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Ben Widawsky Cc: intel-gfx@lists.freedesktop.org, miku@iki.fi List-Id: intel-gfx@lists.freedesktop.org Ben Widawsky writes: > On Thu, May 02, 2013 at 04:48:08PM +0300, Mika Kuoppala wrote: >> Storing context reference into request struct >> allows us to inspect context and its associated >> objects when requests are retired. >> >> Both ppgtt and arb robustness work will need >> this. >> >> Signed-off-by: Mika Kuoppala > > Both 1&2 are: > Reviewed-by: Ben Widawsky > > You should add your sob to 1, since you modified it (slightly), and > maybe run them both my Chris to make sure he approves as well. I took 1/2 from: http://cgit.freedesktop.org/~bwidawsk/drm-intel/commit/?h=ppgtt-ctx&id=5e266650d53d42ebbc8c22f2846c8ed87d747b21 and i don't remember intentionally modifying it. Is there some merge fallout I missed? I couldn't spot any diff to original. -Mika