All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>,
	DRI <dri-devel@lists.freedesktop.org>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Jani Nikula <jani.nikula@linux.intel.com>,
	Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
	Rodrigo Vivi <rodrigo.vivi@intel.com>,
	Intel Graphics <intel-gfx@lists.freedesktop.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
Date: Wed, 8 Jan 2020 13:28:14 +1100	[thread overview]
Message-ID: <20200108132814.2b170270@canb.auug.org.au> (raw)
In-Reply-To: <20200108120450.33ec0fdd@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 739 bytes --]

Hi all,

On Wed, 8 Jan 2020 12:04:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>  -		hw_flags = 0;
>  +		/* For resource streamer on HSW+ and power context elsewhere */
>  +		BUILD_BUG_ON(HSW_MI_RS_SAVE_STATE_EN != MI_SAVE_EXT_STATE_EN);
>  +		BUILD_BUG_ON(HSW_MI_RS_RESTORE_STATE_EN != MI_RESTORE_EXT_STATE_EN);
>  +
>  +		flags = MI_SAVE_EXT_STATE_EN | MI_MM_SPACE_GTT;
> - 		if (!i915_gem_context_is_kernel(rq->gem_context))
> + 		if (!test_bit(CONTEXT_VALID_BIT, &ce->flags))

I see from the drm-intel tree that this should have not have the '!'.
I have fixed up my resolution for tomorrow (and it has been fixed for
today's linux-next in the merge of the drm-intel tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>,
	DRI <dri-devel@lists.freedesktop.org>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Jani Nikula <jani.nikula@linux.intel.com>,
	Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
	Rodrigo Vivi <rodrigo.vivi@intel.com>,
	Intel Graphics <intel-gfx@lists.freedesktop.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
Date: Wed, 8 Jan 2020 13:28:14 +1100	[thread overview]
Message-ID: <20200108132814.2b170270@canb.auug.org.au> (raw)
In-Reply-To: <20200108120450.33ec0fdd@canb.auug.org.au>


[-- Attachment #1.1: Type: text/plain, Size: 739 bytes --]

Hi all,

On Wed, 8 Jan 2020 12:04:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>  -		hw_flags = 0;
>  +		/* For resource streamer on HSW+ and power context elsewhere */
>  +		BUILD_BUG_ON(HSW_MI_RS_SAVE_STATE_EN != MI_SAVE_EXT_STATE_EN);
>  +		BUILD_BUG_ON(HSW_MI_RS_RESTORE_STATE_EN != MI_RESTORE_EXT_STATE_EN);
>  +
>  +		flags = MI_SAVE_EXT_STATE_EN | MI_MM_SPACE_GTT;
> - 		if (!i915_gem_context_is_kernel(rq->gem_context))
> + 		if (!test_bit(CONTEXT_VALID_BIT, &ce->flags))

I see from the drm-intel tree that this should have not have the '!'.
I have fixed up my resolution for tomorrow (and it has been fixed for
today's linux-next in the merge of the drm-intel tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>,
	DRI <dri-devel@lists.freedesktop.org>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Jani Nikula <jani.nikula@linux.intel.com>,
	Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
	Rodrigo Vivi <rodrigo.vivi@intel.com>,
	Intel Graphics <intel-gfx@lists.freedesktop.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree
Date: Wed, 8 Jan 2020 13:28:14 +1100	[thread overview]
Message-ID: <20200108132814.2b170270@canb.auug.org.au> (raw)
In-Reply-To: <20200108120450.33ec0fdd@canb.auug.org.au>


[-- Attachment #1.1: Type: text/plain, Size: 739 bytes --]

Hi all,

On Wed, 8 Jan 2020 12:04:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>  -		hw_flags = 0;
>  +		/* For resource streamer on HSW+ and power context elsewhere */
>  +		BUILD_BUG_ON(HSW_MI_RS_SAVE_STATE_EN != MI_SAVE_EXT_STATE_EN);
>  +		BUILD_BUG_ON(HSW_MI_RS_RESTORE_STATE_EN != MI_RESTORE_EXT_STATE_EN);
>  +
>  +		flags = MI_SAVE_EXT_STATE_EN | MI_MM_SPACE_GTT;
> - 		if (!i915_gem_context_is_kernel(rq->gem_context))
> + 		if (!test_bit(CONTEXT_VALID_BIT, &ce->flags))

I see from the drm-intel tree that this should have not have the '!'.
I have fixed up my resolution for tomorrow (and it has been fixed for
today's linux-next in the merge of the drm-intel tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2020-01-08  2:28 UTC|newest]

Thread overview: 90+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-08  1:04 linux-next: manual merge of the drm tree with the drm-intel-fixes tree Stephen Rothwell
2020-01-08  1:04 ` [Intel-gfx] " Stephen Rothwell
2020-01-08  1:04 ` Stephen Rothwell
2020-01-08  2:28 ` Stephen Rothwell [this message]
2020-01-08  2:28   ` [Intel-gfx] " Stephen Rothwell
2020-01-08  2:28   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2024-03-07  2:10 Stephen Rothwell
2024-03-07  8:27 ` Joonas Lahtinen
2023-04-17 14:39 broonie
2023-04-17 14:39 ` broonie
2022-05-17  1:26 Stephen Rothwell
2022-05-17  1:26 ` Stephen Rothwell
2022-02-25 16:14 broonie
2022-02-25 16:14 ` broonie
2022-02-22 17:03 broonie
2022-02-22 17:03 ` broonie
2020-05-08  3:50 Stephen Rothwell
2020-05-08  3:50 ` Stephen Rothwell
2020-05-07  2:43 Stephen Rothwell
2020-05-07  2:43 ` Stephen Rothwell
2020-01-22  0:37 Stephen Rothwell
2020-01-22  0:37 ` Stephen Rothwell
2020-01-08  1:15 Stephen Rothwell
2020-01-08  1:15 ` Stephen Rothwell
2020-01-08  1:10 Stephen Rothwell
2020-01-08  1:10 ` Stephen Rothwell
2019-10-31  0:33 Stephen Rothwell
2019-10-31  0:33 ` Stephen Rothwell
2019-11-08  0:42 ` Stephen Rothwell
2019-11-08  0:42   ` Stephen Rothwell
2019-11-08  0:42   ` Stephen Rothwell
2018-01-05  1:00 Stephen Rothwell
2018-01-05  1:00 ` Stephen Rothwell
2017-07-21  1:26 Stephen Rothwell
2017-07-21  1:26 ` Stephen Rothwell
2017-06-14  0:56 Stephen Rothwell
2017-06-14  0:56 ` Stephen Rothwell
2017-06-14  0:50 Stephen Rothwell
2017-06-09  2:26 Stephen Rothwell
2017-06-08  2:53 Stephen Rothwell
2017-06-08  2:53 ` Stephen Rothwell
2017-03-30  1:14 Stephen Rothwell
2017-03-30  1:08 Stephen Rothwell
2017-03-30  1:08 ` Stephen Rothwell
2017-03-22  0:00 Stephen Rothwell
2017-03-22  0:00 ` Stephen Rothwell
2017-03-27 17:14 ` Paul McKenney
2017-03-21 23:57 Stephen Rothwell
2017-03-21 23:57 ` Stephen Rothwell
2017-03-21  0:28 Stephen Rothwell
2017-03-21  0:28 ` Stephen Rothwell
2016-06-14  2:10 Stephen Rothwell
2016-06-14  2:10 ` Stephen Rothwell
2015-12-22 23:06 Stephen Rothwell
2015-12-22 23:06 ` Stephen Rothwell
2015-12-09  2:35 Stephen Rothwell
2015-12-09  2:35 ` Stephen Rothwell
2015-12-03 14:51 Mark Brown
2015-12-03 15:49 ` Jani Nikula
2015-12-03 15:49   ` Jani Nikula
2015-12-03 14:47 Mark Brown
2015-12-03 14:52 ` Imre Deak
2015-08-17  3:23 Stephen Rothwell
2015-08-17  3:23 ` Stephen Rothwell
2015-06-05  5:46 mpe@ellerman.id.au
2015-06-05  8:03 ` Jani Nikula
2015-06-05  8:03   ` Jani Nikula
2015-06-09  1:58   ` Stephen Rothwell
2015-06-09  1:58     ` Stephen Rothwell
2015-03-16  2:30 Stephen Rothwell
2015-03-16  2:30 ` Stephen Rothwell
2015-03-16 13:43 ` Xi Ruoyao
2015-03-16 15:04   ` Jani Nikula
2014-12-03  2:27 Stephen Rothwell
2014-12-03  2:27 ` Stephen Rothwell
2014-12-03  8:24 ` Jani Nikula
2014-12-03  8:24   ` Jani Nikula
2014-12-03  8:28   ` Stephen Rothwell
2014-11-17  3:04 Stephen Rothwell
2014-11-17  3:04 ` Stephen Rothwell
2014-07-23  2:38 Stephen Rothwell
2014-07-23  2:38 ` Stephen Rothwell
2014-07-09  4:06 Stephen Rothwell
2014-05-22  5:44 Stephen Rothwell
2014-05-22  5:40 Stephen Rothwell
2014-05-07  3:24 Stephen Rothwell
2013-10-28  5:46 Stephen Rothwell
2013-10-28  5:46 ` Stephen Rothwell
2013-10-28  6:12 ` Stephen Rothwell
2013-10-28  6:12   ` Stephen Rothwell

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=20200108132814.2b170270@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=airlied@linux.ie \
    --cc=chris@chris-wilson.co.uk \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    --cc=joonas.lahtinen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rodrigo.vivi@intel.com \
    /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.