Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next

Two regressions fixes from snowboarding land

* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: Revert hdmi HDP pin checks
  drm/i915: Handle untiled planes when computing their offsets

4 files changed, 34 insertions, 51 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 6337196b7931..a05ac2c91ba2 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2001,18 +2001,29 @@ void intel_unpin_fb_obj(struct drm_i915_gem_object *obj)
 
 /* Computes the linear offset to the base tile and adjusts x, y. bytes per pixel
  * is assumed to be a power-of-two. */
-unsigned long intel_gen4_compute_offset_xtiled(int *x, int *y,
-                                               unsigned int bpp,
-                                               unsigned int pitch)
+unsigned long intel_gen4_compute_page_offset(int *x, int *y,
+                                             unsigned int tiling_mode,
+                                             unsigned int cpp,
+                                             unsigned int pitch)
 {
-        int tile_rows, tiles;
+        if (tiling_mode != I915_TILING_NONE) {
+                unsigned int tile_rows, tiles;
 
-        tile_rows = *y / 8;
-        *y %= 8;
-        tiles = *x / (512/bpp);
-        *x %= 512/bpp;
+                tile_rows = *y / 8;
+                *y %= 8;
 
-        return tile_rows * pitch * 8 + tiles * 4096;
+                tiles = *x / (512/cpp);
+                *x %= 512/cpp;
+
+                return tile_rows * pitch * 8 + tiles * 4096;
+        } else {
+                unsigned int offset;
+
+                offset = *y * pitch + *x * cpp;
+                *y = 0;
+                *x = (offset & 4095) / cpp;
+                return offset & -4096;
+        }
 }
 
 static int i9xx_update_plane(struct drm_crtc *crtc, struct drm_framebuffer *fb,
@@ -2089,9 +2100,9 @@ static int i9xx_update_plane(struct drm_crtc *crtc, struct drm_framebuffer *fb,
 
         if (INTEL_INFO(dev)->gen >= 4) {
                 intel_crtc->dspaddr_offset =
-                        intel_gen4_compute_offset_xtiled(&x, &y,
-                                                         fb->bits_per_pixel / 8,
-                                                         fb->pitches[0]);
+                        intel_gen4_compute_page_offset(&x, &y, obj->tiling_mode,
+                                                       fb->bits_per_pixel / 8,
+                                                       fb->pitches[0]);
                 linear_offset -= intel_crtc->dspaddr_offset;
         } else {
                 intel_crtc->dspaddr_offset = linear_offset;
@@ -2182,9 +2193,9 @@ static int ironlake_update_plane(struct drm_crtc *crtc,
 
         linear_offset = y * fb->pitches[0] + x * (fb->bits_per_pixel / 8);
         intel_crtc->dspaddr_offset =
-                intel_gen4_compute_offset_xtiled(&x, &y,
-                                                 fb->bits_per_pixel / 8,
-                                                 fb->pitches[0]);
+                intel_gen4_compute_page_offset(&x, &y, obj->tiling_mode,
+                                               fb->bits_per_pixel / 8,
+                                               fb->pitches[0]);
         linear_offset -= intel_crtc->dspaddr_offset;
 
         DRM_DEBUG_KMS("Writing base %08X %08lX %d %d %d\n",
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index d282052aadd4..07ebac6fe8ca 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -648,9 +648,10 @@ extern void intel_update_sprite_watermarks(struct drm_device *dev, int pipe,
 extern void intel_update_linetime_watermarks(struct drm_device *dev, int pipe,
                          struct drm_display_mode *mode);
 
-extern unsigned long intel_gen4_compute_offset_xtiled(int *x, int *y,
-                                                      unsigned int bpp,
-                                                      unsigned int pitch);
+extern unsigned long intel_gen4_compute_page_offset(int *x, int *y,
+                                                    unsigned int tiling_mode,
+                                                    unsigned int bpp,
+                                                    unsigned int pitch);
 
 extern int intel_sprite_set_colorkey(struct drm_device *dev, void *data,
                                      struct drm_file *file_priv);
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 3ea0c8b6a00f..83d66602414b 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -793,28 +793,6 @@ bool intel_hdmi_mode_fixup(struct drm_encoder *encoder,
         return true;
 }
 
-static bool g4x_hdmi_connected(struct intel_hdmi *intel_hdmi)
-{
-        struct drm_device *dev = intel_hdmi_to_dev(intel_hdmi);
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_digital_port *intel_dig_port = hdmi_to_dig_port(intel_hdmi);
-        uint32_t bit;
-
-        switch (intel_dig_port->port) {
-        case PORT_B:
-                bit = PORTB_HOTPLUG_LIVE_STATUS;
-                break;
-        case PORT_C:
-                bit = PORTC_HOTPLUG_LIVE_STATUS;
-                break;
-        default:
-                bit = 0;
-                break;
-        }
-
-        return I915_READ(PORT_HOTPLUG_STAT) & bit;
-}
-
 static enum drm_connector_status
 intel_hdmi_detect(struct drm_connector *connector, bool force)
 {
@@ -827,13 +805,6 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
         struct edid *edid;
         enum drm_connector_status status = connector_status_disconnected;
 
-
-        if (IS_G4X(dev) && !g4x_hdmi_connected(intel_hdmi))
-                return status;
-        else if (HAS_PCH_SPLIT(dev) &&
-                 !ibx_digital_port_connected(dev_priv, intel_dig_port))
-                 return status;
-
         intel_hdmi->has_hdmi_sink = false;
         intel_hdmi->has_audio = false;
         intel_hdmi->rgb_quant_range_selectable = false;
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index d086e48a831a..1b6eb76beb7c 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -122,8 +122,8 @@ ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
 
         linear_offset = y * fb->pitches[0] + x * pixel_size;
         sprsurf_offset =
-                intel_gen4_compute_offset_xtiled(&x, &y,
-                                                 pixel_size, fb->pitches[0]);
+                intel_gen4_compute_page_offset(&x, &y, obj->tiling_mode,
+                                               pixel_size, fb->pitches[0]);
         linear_offset -= sprsurf_offset;
 
         /* HSW consolidates SPRTILEOFF and SPRLINOFF into a single SPROFFSET
@@ -295,8 +295,8 @@ ilk_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
 
         linear_offset = y * fb->pitches[0] + x * pixel_size;
         dvssurf_offset =
-                intel_gen4_compute_offset_xtiled(&x, &y,
-                                                 pixel_size, fb->pitches[0]);
+                intel_gen4_compute_page_offset(&x, &y, obj->tiling_mode,
+                                               pixel_size, fb->pitches[0]);
         linear_offset -= dvssurf_offset;
 
         if (obj->tiling_mode != I915_TILING_NONE)