Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71fb5539 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2018-12-07' of... 

Merge tag 'drm-intel-fixes-2018-12-07' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

- Fix for system crash after GPU hang (Bugzilla #107945)
- GVT fix for guest graphics corruption (https://github.com/intel/gvt-linux/issues/61

)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181207104352.GA18214@jlahtine-desk.ger.corp.intel.com
parents 40e020c1 d76b21eb

drivers/gpu/drm/i915/gvt/fb_decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ int intel_vgpu_decode_primary_plane(struct intel_vgpu *vgpu, 
		plane->bpp = skl_pixel_formats[fmt].bpp;

		plane->drm_format = skl_pixel_formats[fmt].drm_format;

	} else {

		plane->tiled = !!(val & DISPPLANE_TILED);

		plane->tiled = val & DISPPLANE_TILED;

		fmt = bdw_format_to_drm(val & DISPPLANE_PIXFORMAT_MASK);

		plane->bpp = bdw_pixel_formats[fmt].bpp;

		plane->drm_format = bdw_pixel_formats[fmt].drm_format;

drivers/gpu/drm/i915/i915_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -1444,6 +1444,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv) 


	intel_uncore_sanitize(dev_priv);



	intel_gt_init_workarounds(dev_priv);

	i915_gem_load_init_fences(dev_priv);



	/* On the 945G/GM, the chipset reports the MSI capability on the

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#include "intel_ringbuffer.h"

#include "intel_uncore.h"

#include "intel_wopcm.h"

#include "intel_workarounds.h"

#include "intel_uc.h"



#include "i915_gem.h"
@@ -1805,6 +1806,7 @@ struct drm_i915_private { 
	int dpio_phy_iosf_port[I915_NUM_PHYS_VLV];



	struct i915_workarounds workarounds;

	struct i915_wa_list gt_wa_list;



	struct i915_frontbuffer_tracking fb_tracking;

drivers/gpu/drm/i915/i915_gem.c

+3 −1
Original line number Diff line number Diff line
@@ -5305,7 +5305,7 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv) 
		}

	}



	intel_gt_workarounds_apply(dev_priv);

	intel_gt_apply_workarounds(dev_priv);



	i915_gem_init_swizzling(dev_priv);
@@ -5677,6 +5677,8 @@ void i915_gem_fini(struct drm_i915_private *dev_priv) 
	i915_gem_contexts_fini(dev_priv);

	mutex_unlock(&dev_priv->drm.struct_mutex);



	intel_wa_list_free(&dev_priv->gt_wa_list);



	intel_cleanup_gt_powersave(dev_priv);



	intel_uc_fini_misc(dev_priv);

drivers/gpu/drm/i915/intel_engine_cs.c

+2 −0
Original line number Diff line number Diff line
@@ -720,6 +720,8 @@ void intel_engine_cleanup_common(struct intel_engine_cs *engine) 
	__intel_context_unpin(i915->kernel_context, engine);



	i915_timeline_fini(&engine->timeline);



	intel_wa_list_free(&engine->wa_list);

}



u64 intel_engine_get_active_head(const struct intel_engine_cs *engine)