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

Commit aa0011a8 authored by Arun Siluvery's avatar Arun Siluvery Committed by Daniel Vetter
Browse files

drm/i915/gen9: Handle error returned by gen9_init_workarounds 



Signed-off-by: default avatarArun Siluvery <arun.siluvery@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1170f28c

drivers/gpu/drm/i915/intel_ringbuffer.c

+8 −2
Original line number Diff line number Diff line
@@ -1041,10 +1041,13 @@ static int skl_tune_iz_hashing(struct intel_engine_cs *ring) 


static int skl_init_workarounds(struct intel_engine_cs *ring)

{

	int ret;

	struct drm_device *dev = ring->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;



	gen9_init_workarounds(ring);

	ret = gen9_init_workarounds(ring);

	if (ret)

		return ret;



	/* WaDisablePowerCompilerClockGating:skl */

	if (INTEL_REVID(dev) == SKL_REVID_B0)
@@ -1081,10 +1084,13 @@ static int skl_init_workarounds(struct intel_engine_cs *ring) 


static int bxt_init_workarounds(struct intel_engine_cs *ring)

{

	int ret;

	struct drm_device *dev = ring->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;



	gen9_init_workarounds(ring);

	ret = gen9_init_workarounds(ring);

	if (ret)

		return ret;



	/* WaDisableThreadStallDopClockGating:bxt */

	WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,