tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'drm-fixes-for-v4.7-rc8-intel' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
"Two i915 regression fixes.

Intel have submitted some Kabylake fixes I'll send separately, since
this is the first kernel with kabylake support and they don't go much
outside that area I think they should be fine"

* tag 'drm-fixes-for-v4.7-rc8-intel' of git://people.freedesktop.org/~airlied/linux:
drm/i915: add missing condition for committing planes on crtc
drm/i915: Treat eDP as always connected, again

Linus Torvalds 3f2625d7 23218843

+7 -1
+6
drivers/gpu/drm/i915/intel_display.c
··· 11997 11997 ret = intel_color_check(crtc, crtc_state); 11998 11998 if (ret) 11999 11999 return ret; 12000 + 12001 + /* 12002 + * Changing color management on Intel hardware is 12003 + * handled as part of planes update. 12004 + */ 12005 + crtc_state->planes_changed = true; 12000 12006 } 12001 12007 12002 12008 ret = 0;
+1 -1
drivers/gpu/drm/i915/intel_dp.c
··· 4645 4645 4646 4646 intel_dp->detect_done = false; 4647 4647 4648 - if (intel_connector->detect_edid) 4648 + if (is_edp(intel_dp) || intel_connector->detect_edid) 4649 4649 return connector_status_connected; 4650 4650 else 4651 4651 return connector_status_disconnected;