diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2017-09-06 14:11:28 -0400 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2017-09-06 16:34:13 -0400 |
| commit | 426ca2cb69cda59f32c251d1f3e111aee8c42814 (patch) | |
| tree | c4d8741df615aeee0b6612d87629c738cb7851f0 | |
| parent | bcd7726f7d4f3c7d9c7e6d0a833520c61dd9eb21 (diff) | |
| parent | d02fd5f7709f1296bad5d92e7e8515ef1a05dec4 (diff) | |
Merge tag 'gvt-fixes-2017-09-06' of https://github.com/01org/gvt-linux into drm-intel-next-fixes
gvt-fixes-2017-09-06
- regression fix for gvt init failure from Jianjun
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170906035924.2225krr6snv2duvq@zhen-hp.sh.intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/handlers.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c index 3502a59166ff..2294466dd415 100644 --- a/drivers/gpu/drm/i915/gvt/handlers.c +++ b/drivers/gpu/drm/i915/gvt/handlers.c | |||
| @@ -2659,7 +2659,6 @@ static int init_skl_mmio_info(struct intel_gvt *gvt) | |||
| 2659 | MMIO_D(HSW_PWR_WELL_CTL_BIOS(SKL_DISP_PW_MISC_IO), D_SKL_PLUS); | 2659 | MMIO_D(HSW_PWR_WELL_CTL_BIOS(SKL_DISP_PW_MISC_IO), D_SKL_PLUS); |
| 2660 | MMIO_DH(HSW_PWR_WELL_CTL_DRIVER(SKL_DISP_PW_MISC_IO), D_SKL_PLUS, NULL, | 2660 | MMIO_DH(HSW_PWR_WELL_CTL_DRIVER(SKL_DISP_PW_MISC_IO), D_SKL_PLUS, NULL, |
| 2661 | skl_power_well_ctl_write); | 2661 | skl_power_well_ctl_write); |
| 2662 | MMIO_DH(GEN6_PCODE_MAILBOX, D_SKL_PLUS, NULL, mailbox_write); | ||
| 2663 | 2662 | ||
| 2664 | MMIO_D(0xa210, D_SKL_PLUS); | 2663 | MMIO_D(0xa210, D_SKL_PLUS); |
| 2665 | MMIO_D(GEN9_MEDIA_PG_IDLE_HYSTERESIS, D_SKL_PLUS); | 2664 | MMIO_D(GEN9_MEDIA_PG_IDLE_HYSTERESIS, D_SKL_PLUS); |