Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

* 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (135 commits)
  drm/radeon/kms: fix DP training for DPEncoderService revision bigger than 1.1
  drm/radeon/kms: add missing vddci setting on NI+
  drm/radeon: Add a rmb() in IH processing
  drm/radeon: ATOM Endian fix for atombios_crtc_program_pll()
  drm/radeon: Fix the definition of RADEON_BUF_SWAP_32BIT
  drm/radeon: Do an MMIO read on interrupts when not uisng MSIs
  drm/radeon: Writeback endian fixes
  drm/radeon: Remove a bunch of useless _iomem casts
  drm/gem: add support for private objects
  DRM: clean up and document parsing of video= parameter
  DRM: Radeon: Fix section mismatch.
  drm: really make debug levels match in edid failure code
  drm/radeon/kms: fix i2c map for rv250/280
  drm/nouveau/gr: disable fifo access and idle before suspend ctx unload
  drm/nouveau: pass flag to engine fini() method on suspend
  drm/nouveau: replace nv04_graph_fifo_access() use with direct reg bashing
  drm/nv40/gr: rewrite/split context takedown functions
  drm/nouveau: detect disabled device in irq handler and return IRQ_NONE
  drm/nouveau: ignore connector type when deciding digital/analog on DVI-I
  drm/nouveau: Add a quirk for Gigabyte NX86T
  ...

diff --cc drivers/gpu/drm/i915/i915_drv.h
index ce7914c4c044662153545e7c2d87e277432fbc34,78cdd158287aee6d2ff6f981ac961c745f12affa..6867e193d85e6f9e8b9ab07eadef040f42904624
--- 1/drivers/gpu/drm/i915/i915_drv.h
--- 2/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -262,9 -264,9 +264,10 @@@ enum intel_pch 
  };
  
  #define QUIRK_PIPEA_FORCE (1<<0)
 +#define QUIRK_LVDS_SSC_DISABLE (1<<1)
  
  struct intel_fbdev;
+ struct intel_fbc_work;
  
  typedef struct drm_i915_private {
        struct drm_device *dev;
@@@ -1195,10 -1199,11 +1200,13 @@@ void i915_gem_free_all_phys_object(stru
  void i915_gem_release(struct drm_device *dev, struct drm_file *file);
  
  uint32_t
 -i915_gem_get_unfenced_gtt_alignment(struct drm_i915_gem_object *obj);
 +i915_gem_get_unfenced_gtt_alignment(struct drm_device *dev,
 +                                  uint32_t size,
 +                                  int tiling_mode);
  
+ int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj,
+                                   enum i915_cache_level cache_level);
+ 
  /* i915_gem_gtt.c */
  void i915_gem_restore_gtt_mappings(struct drm_device *dev);
  int __must_check i915_gem_gtt_bind_object(struct drm_i915_gem_object *obj);

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
index 0f1c799afea1be623f38cd019ca9fbfe42d37516,b5b15bda71d9be4c8e546db18a90fd655fd343f4..393a39922e53345b7cb0c525b7c255f0ea204f24
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -4305,10 -4466,136 +4466,137 @@@ static void intel_update_watermarks(str
  
  static inline bool intel_panel_use_ssc(struct drm_i915_private *dev_priv)
  {
 -      return dev_priv->lvds_use_ssc && i915_panel_use_ssc;
 +      return dev_priv->lvds_use_ssc && i915_panel_use_ssc
 +              && !(dev_priv->quirks & QUIRK_LVDS_SSC_DISABLE);
  }
  
+ /**
+  * intel_choose_pipe_bpp_dither - figure out what color depth the pipe should send
+  * @crtc: CRTC structure
+  *
+  * A pipe may be connected to one or more outputs.  Based on the depth of the
+  * attached framebuffer, choose a good color depth to use on the pipe.
+  *
+  * If possible, match the pipe depth to the fb depth.  In some cases, this
+  * isn't ideal, because the connected output supports a lesser or restricted
+  * set of depths.  Resolve that here:
+  *    LVDS typically supports only 6bpc, so clamp down in that case
+  *    HDMI supports only 8bpc or 12bpc, so clamp to 8bpc with dither for 10bpc
+  *    Displays may support a restricted set as well, check EDID and clamp as
+  *      appropriate.
+  *
+  * RETURNS:
+  * Dithering requirement (i.e. false if display bpc and pipe bpc match,
+  * true if they don't match).
+  */
+ static bool intel_choose_pipe_bpp_dither(struct drm_crtc *crtc,
+                                        unsigned int *pipe_bpp)
+ {
+       struct drm_device *dev = crtc->dev;
+       struct drm_i915_private *dev_priv = dev->dev_private;
+       struct drm_encoder *encoder;
+       struct drm_connector *connector;
+       unsigned int display_bpc = UINT_MAX, bpc;
+ 
+       /* Walk the encoders & connectors on this crtc, get min bpc */
+       list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+               struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
+ 
+               if (encoder->crtc != crtc)
+                       continue;
+ 
+               if (intel_encoder->type == INTEL_OUTPUT_LVDS) {
+                       unsigned int lvds_bpc;
+ 
+                       if ((I915_READ(PCH_LVDS) & LVDS_A3_POWER_MASK) ==
+                           LVDS_A3_POWER_UP)
+                               lvds_bpc = 8;
+                       else
+                               lvds_bpc = 6;
+ 
+                       if (lvds_bpc < display_bpc) {
+                               DRM_DEBUG_DRIVER("clamping display bpc (was %d) to LVDS (%d)\n", display_bpc, lvds_bpc);
+                               display_bpc = lvds_bpc;
+                       }
+                       continue;
+               }
+ 
+               if (intel_encoder->type == INTEL_OUTPUT_EDP) {
+                       /* Use VBT settings if we have an eDP panel */
+                       unsigned int edp_bpc = dev_priv->edp.bpp / 3;
+ 
+                       if (edp_bpc < display_bpc) {
+                               DRM_DEBUG_DRIVER("clamping display bpc (was %d) to eDP (%d)\n", display_bpc, edp_bpc);
+                               display_bpc = edp_bpc;
+                       }
+                       continue;
+               }
+ 
+               /* Not one of the known troublemakers, check the EDID */
+               list_for_each_entry(connector, &dev->mode_config.connector_list,
+                                   head) {
+                       if (connector->encoder != encoder)
+                               continue;
+ 
+                       if (connector->display_info.bpc < display_bpc) {
+                               DRM_DEBUG_DRIVER("clamping display bpc (was %d) to EDID reported max of %d\n", display_bpc, connector->display_info.bpc);
+                               display_bpc = connector->display_info.bpc;
+                       }
+               }
+ 
+               /*
+                * HDMI is either 12 or 8, so if the display lets 10bpc sneak
+                * through, clamp it down.  (Note: >12bpc will be caught below.)
+                */
+               if (intel_encoder->type == INTEL_OUTPUT_HDMI) {
+                       if (display_bpc > 8 && display_bpc < 12) {
+                               DRM_DEBUG_DRIVER("forcing bpc to 12 for HDMI\n");
+                               display_bpc = 12;
+                       } else {
+                               DRM_DEBUG_DRIVER("forcing bpc to 8 for HDMI\n");
+                               display_bpc = 8;
+                       }
+               }
+       }
+ 
+       /*
+        * We could just drive the pipe at the highest bpc all the time and
+        * enable dithering as needed, but that costs bandwidth.  So choose
+        * the minimum value that expresses the full color range of the fb but
+        * also stays within the max display bpc discovered above.
+        */
+ 
+       switch (crtc->fb->depth) {
+       case 8:
+               bpc = 8; /* since we go through a colormap */
+               break;
+       case 15:
+       case 16:
+               bpc = 6; /* min is 18bpp */
+               break;
+       case 24:
+               bpc = min((unsigned int)8, display_bpc);
+               break;
+       case 30:
+               bpc = min((unsigned int)10, display_bpc);
+               break;
+       case 48:
+               bpc = min((unsigned int)12, display_bpc);
+               break;
+       default:
+               DRM_DEBUG("unsupported depth, assuming 24 bits\n");
+               bpc = min((unsigned int)8, display_bpc);
+               break;
+       }
+ 
+       DRM_DEBUG_DRIVER("setting pipe bpc to %d (max display bpc %d)\n",
+                        bpc, display_bpc);
+ 
+       *pipe_bpp = bpc * 3;
+ 
+       return display_bpc != bpc;
+ }
+ 
  static int i9xx_crtc_mode_set(struct drm_crtc *crtc,
                              struct drm_display_mode *mode,
                              struct drm_display_mode *adjusted_mode,

diff --cc drivers/gpu/drm/nouveau/nv50_graph.c
Simple merge

diff --cc drivers/gpu/drm/radeon/evergreen.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_reg.h
Simple merge

diff --cc drivers/gpu/drm/radeon/rs600.c
Simple merge