From mboxrd@z Thu Jan 1 00:00:00 1970 From: Zhenyu Wang Subject: Re: [PULL] gvt-next Date: Tue, 16 Apr 2019 16:48:14 +0800 Message-ID: <20190416084814.GH17995@zhen-hp.sh.intel.com> References: <20190409040500.GM17995@zhen-hp.sh.intel.com> <155539974336.31447.265673967377405617@jlahtine-desk.ger.corp.intel.com> Reply-To: Zhenyu Wang Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0682496751==" Return-path: In-Reply-To: <155539974336.31447.265673967377405617@jlahtine-desk.ger.corp.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Joonas Lahtinen Cc: Jani Nikula , intel-gfx , "Yuan, Hang" , "Lv, Zhiyuan" , intel-gvt-dev List-Id: intel-gfx@lists.freedesktop.org --===============0682496751== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="my6/OtttYtn8dhky" Content-Disposition: inline --my6/OtttYtn8dhky Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2019.04.16 10:29:03 +0300, Joonas Lahtinen wrote: > I'm getting an error while pulling this, could you check it: >=20 > From https://github.com/intel/gvt-linux > * tag gvt-next-2019-04-09 -> FETCH_HEAD > dim: 66bd9f69d615 ("drm/i915/gvt: addressed guest GPU hang with HWS ind= ex mode"): Fixes: SHA1 in not pointing at an ancestor: > dim: 54939ea0bd85 ("drm/i915: Switch to use HWS indices rather than= addresses") > dim: ERROR: issues in commits detected, aborting >=20 Sorry for this, I applied gvt change earlier than back-merge one, which cau= sed this. Now generated new one, pls help to pull. Thanks. -- The following changes since commit 28d618e9ab86f26a31af0b235ced55beb3e343c8: drm/i915: Update DRIVER_DATE to 20190404 (2019-04-04 17:43:58 +0300) are available in the Git repository at: https://github.com/intel/gvt-linux.git tags/gvt-next-2019-04-16 for you to fetch changes up to 2bfc4975083ace0e5777116514c3a75e59b3dbcd: drm/i915/gvt: Fix incorrect mask of mmio 0x22028 in gen8/9 mmio list (201= 9-04-16 16:52:51 +0800) ---------------------------------------------------------------- gvt-next-2019-04-16 - Refine range of MCHBAR snapshot (Yakui) - Refine out-of-sync page struct (Yakui) - Remove unused vGPU sreg (Yan) - Refind MMIO reg names (Xiaolin) - Proper handling of sync/async flip (Colin) - Proper handling of PIPE_CONTROL/MI_FLUSH_DW index mode (Xiaolin) - EXCC reg mask fix (Colin) ---------------------------------------------------------------- Colin Xu (5): drm/i915/gvt: Use consist max display pipe numbers as i915 definition drm/i915/gvt: Add macro define for mmio 0x50080 and gvt flip event drm/i915/gvt: Enable synchronous flip on handling MI_DISPLAY_FLIP drm/i915/gvt: Enable async flip on plane surface mmio writes drm/i915/gvt: Fix incorrect mask of mmio 0x22028 in gen8/9 mmio list Xiaolin Zhang (2): drm/i915/gvt: replaced register address with name drm/i915/gvt: addressed guest GPU hang with HWS index mode Yan Zhao (1): drm/i915/gvt: remove the unused sreg Zhao Yakui (2): drm/i915/gvt: Refine the snapshort range of I915 MCHBAR to optimize g= vt-g boot time drm/i915/gvt: Refine the combined intel_vgpu_oos_page struct to save = memory Zhenyu Wang (1): Merge tag 'drm-intel-next-2019-04-04' into gvt-next drivers/gpu/drm/i915/gvt/cmd_parser.c | 30 +++++- drivers/gpu/drm/i915/gvt/display.c | 1 - drivers/gpu/drm/i915/gvt/gtt.c | 7 ++ drivers/gpu/drm/i915/gvt/gtt.h | 2 +- drivers/gpu/drm/i915/gvt/gvt.h | 9 +- drivers/gpu/drm/i915/gvt/handlers.c | 159 +++++++++++++++++++---------= ---- drivers/gpu/drm/i915/gvt/mmio.c | 8 +- drivers/gpu/drm/i915/gvt/mmio_context.c | 4 +- drivers/gpu/drm/i915/gvt/reg.h | 34 +++++++ 9 files changed, 172 insertions(+), 82 deletions(-) --=20 Open Source Technology Center, Intel ltd. $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827 --my6/OtttYtn8dhky Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQTXuabgHDW6LPt9CICxBBozTXgYJwUCXLWWzgAKCRCxBBozTXgY J535AJ49THsH7RARQAEV0ZzMlY9UBvoHYwCgnAshtxehwoxsgq0DLYetN9Xwy0M= =9254 -----END PGP SIGNATURE----- --my6/OtttYtn8dhky-- --===============0682496751== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 --===============0682496751==--