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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os 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

Linus Torvalds 10 years ago ce42af94 b4b29f94

+8 -11

5 changed files

expand all

drivers

gpu

drm

drm_probe_helper.c

i915

i915_gem_context.c

intel_display.c

intel_pm.c

omapdrm

omap_fbdev.c

+2 -1

drivers/gpu/drm/drm_probe_helper.c

··· 229 229 mode_flags |= DRM_MODE_FLAG_3D_MASK; 230 230 231 231 list_for_each_entry(mode, &connector->modes, head) { 232 - mode->status = drm_mode_validate_basic(mode); 232 + if (mode->status == MODE_OK) 233 + mode->status = drm_mode_validate_basic(mode); 233 234 234 235 if (mode->status == MODE_OK) 235 236 mode->status = drm_mode_validate_size(mode, maxX, maxY);

-2

drivers/gpu/drm/i915/i915_gem_context.c

··· 141 141 if (!ppgtt) 142 142 return; 143 143 144 - WARN_ON(!list_empty(&ppgtt->base.active_list)); 145 - 146 144 list_for_each_entry_safe(vma, next, &ppgtt->base.inactive_list, 147 145 mm_list) { 148 146 if (WARN_ON(__i915_vma_unbind_no_wait(vma)))

+3 -1

drivers/gpu/drm/i915/intel_display.c

··· 6309 6309 if (to_intel_plane_state(crtc->primary->state)->visible) { 6310 6310 intel_crtc_wait_for_pending_flips(crtc); 6311 6311 intel_pre_disable_primary(crtc); 6312 + 6313 + intel_crtc_disable_planes(crtc, 1 << drm_plane_index(crtc->primary)); 6314 + to_intel_plane_state(crtc->primary->state)->visible = false; 6312 6315 } 6313 6316 6314 - intel_crtc_disable_planes(crtc, crtc->state->plane_mask); 6315 6317 dev_priv->display.crtc_disable(crtc); 6316 6318 intel_crtc->active = false; 6317 6319 intel_update_watermarks(crtc);

+2 -3

drivers/gpu/drm/i915/intel_pm.c

··· 4782 4782 /* 2b: Program RC6 thresholds.*/ 4783 4783 4784 4784 /* WaRsDoubleRc6WrlWithCoarsePowerGating: Doubling WRL only when CPG is enabled */ 4785 - if (IS_SKYLAKE(dev) && !((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) && 4786 - (INTEL_REVID(dev) <= SKL_REVID_E0))) 4785 + if (IS_SKYLAKE(dev)) 4787 4786 I915_WRITE(GEN6_RC6_WAKE_RATE_LIMIT, 108 << 16); 4788 4787 else 4789 4788 I915_WRITE(GEN6_RC6_WAKE_RATE_LIMIT, 54 << 16); ··· 4824 4825 * WaRsDisableCoarsePowerGating:skl,bxt - Render/Media PG need to be disabled with RC6. 4825 4826 */ 4826 4827 if ((IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) || 4827 - ((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) && (INTEL_REVID(dev) <= SKL_REVID_E0))) 4828 + ((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) && (INTEL_REVID(dev) <= SKL_REVID_F0))) 4828 4829 I915_WRITE(GEN9_PG_ENABLE, 0); 4829 4830 else 4830 4831 I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?

+1 -4

drivers/gpu/drm/omapdrm/omap_fbdev.c

··· 112 112 dma_addr_t paddr; 113 113 int ret; 114 114 115 - /* only doing ARGB32 since this is what is needed to alpha-blend 116 - * with video overlays: 117 - */ 118 115 sizes->surface_bpp = 32; 119 - sizes->surface_depth = 32; 116 + sizes->surface_depth = 24; 120 117 121 118 DBG("create fbdev: %dx%d@%d (%dx%d)", sizes->surface_width, 122 119 sizes->surface_height, sizes->surface_bpp,