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

Commit 8c1812ad authored by Chris Wilson's avatar Chris Wilson
Browse files

Merge branch 'drm-intel-fixes' into drm-intel-next 

Immediate merge to resolve conflicts from applying a stability fix to
both branches.

Conflicts:
	drivers/gpu/drm/i915/intel_ringbuffer.c
	drivers/gpu/drm/i915/intel_ringbuffer.h
parents 8d19215b 55889788

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ unsigned int i915_fbpercrtc = 0; 
module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400);



unsigned int i915_powersave = 1;

module_param_named(powersave, i915_powersave, int, 0400);

module_param_named(powersave, i915_powersave, int, 0600);



unsigned int i915_lvds_downclock = 0;

module_param_named(lvds_downclock, i915_lvds_downclock, int, 0400);

drivers/gpu/drm/i915/intel_display.c

+4 −5
Original line number Diff line number Diff line
@@ -5588,20 +5588,19 @@ void ironlake_enable_drps(struct drm_device *dev) 
	fmin = (rgvmodectl & MEMMODE_FMIN_MASK);

	fstart = (rgvmodectl & MEMMODE_FSTART_MASK) >>

		MEMMODE_FSTART_SHIFT;

	fstart = fmax;



	vstart = (I915_READ(PXVFREQ_BASE + (fstart * 4)) & PXVFREQ_PX_MASK) >>

		PXVFREQ_PX_SHIFT;



	dev_priv->fmax = fstart; /* IPS callback will increase this */

	dev_priv->fmax = fmax; /* IPS callback will increase this */

	dev_priv->fstart = fstart;



	dev_priv->max_delay = fmax;

	dev_priv->max_delay = fstart;

	dev_priv->min_delay = fmin;

	dev_priv->cur_delay = fstart;



	DRM_DEBUG_DRIVER("fmax: %d, fmin: %d, fstart: %d\n", fmax, fmin,

			 fstart);

	DRM_DEBUG_DRIVER("fmax: %d, fmin: %d, fstart: %d\n",

			 fmax, fmin, fstart);



	I915_WRITE(MEMINTREN, MEMINT_CX_SUPR_EN | MEMINT_EVAL_CHG_EN);