From: Zhenyu Wang <zhenyuw@linux.intel.com>
To: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>,
intel-gfx <intel-gfx@lists.freedesktop.org>,
"Yuan, Hang" <hang.yuan@intel.com>,
"Lv, Zhiyuan" <zhiyuan.lv@intel.com>,
intel-gvt-dev <intel-gvt-dev@lists.freedesktop.org>
Subject: Re: [Intel-gfx] [PULL] gvt-fixes
Date: Tue, 23 Jun 2020 11:07:11 +0800 [thread overview]
Message-ID: <20200623030711.GA5687@zhen-hp.sh.intel.com> (raw)
In-Reply-To: <159248448107.8757.1901135788098329902@jlahtine-desk.ger.corp.intel.com>
[-- Attachment #1.1: Type: text/plain, Size: 3231 bytes --]
On 2020.06.18 15:48:01 +0300, Joonas Lahtinen wrote:
> Quoting Zhenyu Wang (2020-06-17 07:34:18)
> >
> > Hi,
> >
> > This contains misc fixes for gvt. Two MMIO handler fixes on SKL/CFL,
> > one mask register bit checking fix exposed in suspend/resume path and
> > one lockdep error fix for debugfs entry access.
>
> Could not pull this one due to the extra hassle with CI this week.
>
> Jani, can you please pull this next week.
>
Got it. Please help to pull then.
One thing I forgot to mention that change in "drm/i915/gvt: Fix incorrect check of enabled bits in mask registers"
would cause a minor conflict if backmerging from linux master to dinq, which
is because of new IS_COMETLAKE. Change like below could resolve that.
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
index 9f48db0bf9d5..78ba2857144e 100644
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -1734,14 +1734,9 @@ static int ring_mode_mmio_write(struct intel_vgpu *vgpu, unsigned int offset,
return 0;
}
-<<<<<<< HEAD
if ((IS_COFFEELAKE(vgpu->gvt->gt->i915) ||
IS_COMETLAKE(vgpu->gvt->gt->i915)) &&
- data & _MASKED_BIT_ENABLE(2)) {
-=======
- if (IS_COFFEELAKE(vgpu->gvt->gt->i915) &&
IS_MASKED_BITS_ENABLED(data, 2)) {
->>>>>>> origin/gvt-next-fixes
enter_failsafe_mode(vgpu, GVT_FAILSAFE_UNSUPPORTED_GUEST);
return 0;
}
>
> > Thanks.
> > --
> > The following changes since commit 8e68c6340d5833077b3753eabedab40755571383:
> >
> > drm/i915/display: Fix the encoder type check (2020-06-16 11:34:24 +0300)
> >
> > are available in the Git repository at:
> >
> > https://github.com/intel/gvt-linux tags/gvt-fixes-2020-06-17
> >
> > for you to fetch changes up to a291e4fba259a56a6a274c1989997acb6f0bb03a:
> >
> > drm/i915/gvt: Use GFP_ATOMIC instead of GFP_KERNEL in atomic context (2020-06-17 12:36:19 +0800)
> >
> > ----------------------------------------------------------------
> > gvt-fixes-2020-06-17
> >
> > - Two missed MMIO handler fixes for SKL/CFL (Colin)
> > - Fix mask register bits check (Colin)
> > - Fix one lockdep error for debugfs entry access (Colin)
> >
> > ----------------------------------------------------------------
> > Colin Xu (4):
> > drm/i915/gvt: Add one missing MMIO handler for D_SKL_PLUS
> > drm/i915/gvt: Fix two CFL MMIO handling caused by regression.
> > drm/i915/gvt: Fix incorrect check of enabled bits in mask registers
> > drm/i915/gvt: Use GFP_ATOMIC instead of GFP_KERNEL in atomic context
> >
> > drivers/gpu/drm/i915/gvt/debugfs.c | 2 +-
> > drivers/gpu/drm/i915/gvt/handlers.c | 24 +++++++++++++-----------
> > drivers/gpu/drm/i915/gvt/mmio_context.h | 6 +++---
> > drivers/gpu/drm/i915/gvt/reg.h | 5 +++++
> > 4 files changed, 22 insertions(+), 15 deletions(-)
> _______________________________________________
> intel-gvt-dev mailing list
> intel-gvt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev
--
Open Source Technology Center, Intel ltd.
$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 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
next prev parent reply other threads:[~2020-06-23 3:23 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 4:34 [Intel-gfx] [PULL] gvt-fixes Zhenyu Wang
2020-06-18 12:48 ` Joonas Lahtinen
2020-06-23 3:07 ` Zhenyu Wang [this message]
2020-06-29 8:18 ` Jani Nikula
2020-06-23 3:27 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for gvt-fixes Patchwork
-- strict thread matches above, loose matches on Subject: below --
2023-08-02 5:54 [Intel-gfx] [PULL] gvt-fixes Zhenyu Wang
2023-08-02 7:17 ` Tvrtko Ursulin
2023-01-04 8:05 Zhenyu Wang
2023-01-04 11:34 ` Rodrigo Vivi
2023-01-05 0:15 ` Zhenyu Wang
2023-01-05 13:10 ` Rodrigo Vivi
2022-11-11 9:02 Zhenyu Wang
2022-11-22 5:11 ` Zhenyu Wang
2022-11-22 8:02 ` Tvrtko Ursulin
2022-08-15 2:38 Zhenyu Wang
2022-08-15 23:32 ` Rodrigo Vivi
2022-08-16 4:05 ` Zhenyu Wang
2022-08-16 4:43 ` Zhenyu Wang
2022-08-17 20:07 ` Vivi, Rodrigo
2022-08-17 21:34 ` Colin King (gmail)
2022-08-18 10:15 ` Jani Nikula
2022-08-18 14:27 ` Jani Nikula
2022-08-18 15:43 ` Vivi, Rodrigo
2022-08-22 3:00 ` Zhenyu Wang
2022-07-11 5:20 Zhenyu Wang
2022-07-12 22:24 ` Rodrigo Vivi
2021-09-18 7:11 Zhenyu Wang
2021-09-27 9:39 ` Jani Nikula
2021-08-10 5:01 Zhenyu Wang
2021-08-10 13:52 ` Rodrigo Vivi
2021-07-15 2:22 Zhenyu Wang
2021-07-15 13:56 ` Rodrigo Vivi
2021-05-19 7:49 Zhenyu Wang
2021-05-19 8:50 ` Jani Nikula
2021-04-20 2:33 Zhenyu Wang
2021-04-20 13:43 ` Rodrigo Vivi
2021-01-08 4:59 Zhenyu Wang
2021-01-11 18:13 ` Jani Nikula
2020-11-17 2:39 Zhenyu Wang
2020-11-19 6:53 ` Rodrigo Vivi
2020-10-27 3:17 Zhenyu Wang
2020-10-27 20:46 ` Rodrigo Vivi
2020-10-28 11:18 ` Vivi, Rodrigo
2020-10-30 3:09 ` Zhenyu Wang
2020-10-30 5:21 ` Zhenyu Wang
2020-10-30 22:57 ` Vivi, Rodrigo
2020-09-17 6:42 Zhenyu Wang
2020-09-22 17:27 ` Jani Nikula
2020-05-12 2:48 Zhenyu Wang
2020-05-12 7:00 ` Rodrigo Vivi
2020-04-14 8:36 Zhenyu Wang
2020-04-14 13:11 ` Rodrigo Vivi
2020-03-10 8:09 Zhenyu Wang
2020-03-10 9:33 ` Jani Nikula
2020-02-26 10:30 Zhenyu Wang
2020-02-26 22:00 ` Jani Nikula
2020-02-12 6:59 Zhenyu Wang
2020-02-12 14:54 ` Jani Nikula
2019-12-18 5:16 Zhenyu Wang
2019-12-18 9:20 ` Joonas Lahtinen
2019-11-22 3:33 Zhenyu Wang
2019-11-22 3:33 ` [Intel-gfx] " Zhenyu Wang
2019-11-12 6:18 Zhenyu Wang
2019-11-12 6:18 ` [Intel-gfx] " Zhenyu Wang
2019-11-12 20:36 ` Vivi, Rodrigo
2019-11-12 20:36 ` [Intel-gfx] " Vivi, Rodrigo
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=20200623030711.GA5687@zhen-hp.sh.intel.com \
--to=zhenyuw@linux.intel.com \
--cc=hang.yuan@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-gvt-dev@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=zhiyuan.lv@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).