Merge branch 'drm-intel-fixes' into drm-intel-next
Chris Wilson [Sun, 5 Dec 2010 10:43:39 +0000 (10:43 +0000)]
Immediate merge for the conflicting introduction of HAS_COHERENT_RINGS.

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
include/drm/i915_drm.h

1  2 
drivers/char/agp/intel-gtt.c
drivers/gpu/drm/i915/i915_dma.c

Simple merge
@@@ -772,9 -767,9 +772,12 @@@ static int i915_getparam(struct drm_dev
        case I915_PARAM_HAS_BLT:
                value = HAS_BLT(dev);
                break;
 +      case I915_PARAM_HAS_RELAXED_FENCING:
 +              value = 1;
 +              break;
+       case I915_PARAM_HAS_COHERENT_RINGS:
+               value = 1;
+               break;
        default:
                DRM_DEBUG_DRIVER("Unknown parameter %d\n",
                                 param->param);