Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"As soon as I sent the non-urgent stack, two important fixes come in:
- i915: fixes SNB GPU hangs in a number of 3D apps
- radeon: initial fix for VGA on LLano system, 3 or 4 of us have
spent time debugging this, and Jerome finally figured out the magic
bit the BIOS/fglrx set that we didn't. This at least should get
things working, there may be future reliability fixes."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/i915: Set the Stencil Cache eviction policy to non-LRA mode.
drm/radeon/kms: need to set up ss on DP bridges as well
+11
-2
+1
drivers/gpu/drm/i915/i915_reg.h
+1
drivers/gpu/drm/i915/i915_reg.h
···
568
568
#define CM0_MASK_SHIFT 16
569
569
#define CM0_IZ_OPT_DISABLE (1<<6)
570
570
#define CM0_ZR_OPT_DISABLE (1<<5)
571
+
#define CM0_STC_EVICT_DISABLE_LRA_SNB (1<<5)
571
572
#define CM0_DEPTH_EVICT_DISABLE (1<<4)
572
573
#define CM0_COLOR_EVICT_DISABLE (1<<3)
573
574
#define CM0_DEPTH_WRITE_DISABLE (1<<1)
+8
drivers/gpu/drm/i915/intel_ringbuffer.c
+8
drivers/gpu/drm/i915/intel_ringbuffer.c
···
401
401
if (INTEL_INFO(dev)->gen >= 6) {
402
402
I915_WRITE(INSTPM,
403
403
INSTPM_FORCE_ORDERING << 16 | INSTPM_FORCE_ORDERING);
404
+
405
+
/* From the Sandybridge PRM, volume 1 part 3, page 24:
406
+
* "If this bit is set, STCunit will have LRA as replacement
407
+
* policy. [...] This bit must be reset. LRA replacement
408
+
* policy is not supported."
409
+
*/
410
+
I915_WRITE(CACHE_MODE_0,
411
+
CM0_STC_EVICT_DISABLE_LRA_SNB << CM0_MASK_SHIFT);
404
412
}
405
413
406
414
return ret;
+2
-2
drivers/gpu/drm/radeon/atombios_crtc.c
+2
-2
drivers/gpu/drm/radeon/atombios_crtc.c
···
958
958
break;
959
959
}
960
960
961
-
if (radeon_encoder->active_device &
962
-
(ATOM_DEVICE_LCD_SUPPORT | ATOM_DEVICE_DFP_SUPPORT)) {
961
+
if ((radeon_encoder->active_device & (ATOM_DEVICE_LCD_SUPPORT | ATOM_DEVICE_DFP_SUPPORT)) ||
962
+
(radeon_encoder_get_dp_bridge_encoder_id(encoder) != ENCODER_OBJECT_ID_NONE)) {
963
963
struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
964
964
struct drm_connector *connector =
965
965
radeon_get_connector_for_encoder(encoder);