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

Commit ce42af94 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Some i915 fixes, one omap fix, one core regression fix.

  Not even enough fixes for a twelve days of xmas song, which seemms
  good"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm: Don't overwrite UNVERFIED mode status to OK
  drm/omap: fix fbdev pix format to support all platforms
  drm/i915: Do a better job at disabling primary plane in the noatomic case.
  drm/i915/skl: Double RC6 WRL always on
  drm/i915/skl: Disable coarse power gating up until F0
  drm/i915: Remove incorrect warning in context cleanup
parents b4b29f94 4655a12b

drivers/gpu/drm/drm_probe_helper.c

+2 −1
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect 
		mode_flags |= DRM_MODE_FLAG_3D_MASK;



	list_for_each_entry(mode, &connector->modes, head) {

		if (mode->status == MODE_OK)

			mode->status = drm_mode_validate_basic(mode);



		if (mode->status == MODE_OK)

drivers/gpu/drm/i915/i915_gem_context.c

+0 −2
Original line number Diff line number Diff line
@@ -141,8 +141,6 @@ static void i915_gem_context_clean(struct intel_context *ctx) 
	if (!ppgtt)

		return;



	WARN_ON(!list_empty(&ppgtt->base.active_list));



	list_for_each_entry_safe(vma, next, &ppgtt->base.inactive_list,

				 mm_list) {

		if (WARN_ON(__i915_vma_unbind_no_wait(vma)))

drivers/gpu/drm/i915/intel_display.c

+3 −1
Original line number Diff line number Diff line
@@ -6309,9 +6309,11 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc) 
	if (to_intel_plane_state(crtc->primary->state)->visible) {

		intel_crtc_wait_for_pending_flips(crtc);

		intel_pre_disable_primary(crtc);



		intel_crtc_disable_planes(crtc, 1 << drm_plane_index(crtc->primary));

		to_intel_plane_state(crtc->primary->state)->visible = false;

	}



	intel_crtc_disable_planes(crtc, crtc->state->plane_mask);

	dev_priv->display.crtc_disable(crtc);

	intel_crtc->active = false;

	intel_update_watermarks(crtc);

drivers/gpu/drm/i915/intel_pm.c

+2 −3
Original line number Diff line number Diff line
@@ -4782,8 +4782,7 @@ static void gen9_enable_rc6(struct drm_device *dev) 
	/* 2b: Program RC6 thresholds.*/



	/* WaRsDoubleRc6WrlWithCoarsePowerGating: Doubling WRL only when CPG is enabled */

	if (IS_SKYLAKE(dev) && !((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) &&

				 (INTEL_REVID(dev) <= SKL_REVID_E0)))

	if (IS_SKYLAKE(dev))

		I915_WRITE(GEN6_RC6_WAKE_RATE_LIMIT, 108 << 16);

	else

		I915_WRITE(GEN6_RC6_WAKE_RATE_LIMIT, 54 << 16);
@@ -4825,7 +4824,7 @@ static void gen9_enable_rc6(struct drm_device *dev) 
	 * WaRsDisableCoarsePowerGating:skl,bxt - Render/Media PG need to be disabled with RC6.

	 */

	if ((IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) ||

	    ((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) && (INTEL_REVID(dev) <= SKL_REVID_E0)))

	    ((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) && (INTEL_REVID(dev) <= SKL_REVID_F0)))

		I915_WRITE(GEN9_PG_ENABLE, 0);

	else

		I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?

drivers/gpu/drm/omapdrm/omap_fbdev.c

+1 −4
Original line number Diff line number Diff line
@@ -112,11 +112,8 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, 
	dma_addr_t paddr;

	int ret;



	/* only doing ARGB32 since this is what is needed to alpha-blend

	 * with video overlays:

	 */

	sizes->surface_bpp = 32;

	sizes->surface_depth = 32;

	sizes->surface_depth = 24;



	DBG("create fbdev: %dx%d@%d (%dx%d)", sizes->surface_width,

			sizes->surface_height, sizes->surface_bpp,