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

Commit 92ff59a6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2014-11-19' of git://anongit.freedesktop.org/drm-intel into drm-fixes 

two regression fixes.

* tag 'drm-intel-fixes-2014-11-19' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Kick fbdev before vgacon
  drm/i915: drop WaSetupGtModeTdRowDispatch:snb
parents fc14f9c1 0485c9dc

drivers/gpu/drm/i915/i915_dma.c

+6 −4
Original line number Diff line number Diff line
@@ -1670,15 +1670,17 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
		goto out_regs;



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		ret = i915_kick_out_vgacon(dev_priv);

		/* WARNING: Apparently we must kick fbdev drivers before vgacon,

		 * otherwise the vga fbdev driver falls over. */

		ret = i915_kick_out_firmware_fb(dev_priv);

		if (ret) {

			DRM_ERROR("failed to remove conflicting VGA console\n");

			DRM_ERROR("failed to remove conflicting framebuffer drivers\n");

			goto out_gtt;

		}



		ret = i915_kick_out_firmware_fb(dev_priv);

		ret = i915_kick_out_vgacon(dev_priv);

		if (ret) {

			DRM_ERROR("failed to remove conflicting framebuffer drivers\n");

			DRM_ERROR("failed to remove conflicting VGA console\n");

			goto out_gtt;

		}

	}

drivers/gpu/drm/i915/intel_pm.c

+0 −5
Original line number Diff line number Diff line
@@ -5469,11 +5469,6 @@ static void gen6_init_clock_gating(struct drm_device *dev) 
	I915_WRITE(_3D_CHICKEN,

		   _MASKED_BIT_ENABLE(_3D_CHICKEN_HIZ_PLANE_DISABLE_MSAA_4X_SNB));



	/* WaSetupGtModeTdRowDispatch:snb */

	if (IS_SNB_GT1(dev))

		I915_WRITE(GEN6_GT_MODE,

			   _MASKED_BIT_ENABLE(GEN6_TD_FOUR_ROW_DISPATCH_DISABLE));



	/* WaDisable_RenderCache_OperationalFlush:snb */

	I915_WRITE(CACHE_MODE_0, _MASKED_BIT_DISABLE(RC_OP_FLUSH_ENABLE));