@@ -145,6 +145,8 @@ struct intel_framebuffer {
};
struct i915_address_space *dpt_vm;
+
+ unsigned int min_alignment;
};
enum intel_hotplug_state {
@@ -10,6 +10,7 @@
#include <linux/dma-resv.h>
#include "i915_drv.h"
+#include "intel_atomic_plane.h"
#include "intel_display.h"
#include "intel_display_types.h"
#include "intel_dpt.h"
@@ -1616,6 +1617,26 @@ bool intel_fb_supports_90_270_rotation(const struct intel_framebuffer *fb)
fb->base.modifier == I915_FORMAT_MOD_Yf_TILED;
}
+static unsigned int intel_fb_min_alignment(const struct drm_framebuffer *fb)
+{
+ struct drm_i915_private *i915 = to_i915(fb->dev);
+ struct intel_plane *plane;
+ unsigned int min_alignment = 0;
+
+ for_each_intel_plane(&i915->drm, plane) {
+ if (!drm_plane_has_format(&plane->base, fb->format->format, fb->modifier))
+ continue;
+
+ if (intel_plane_needs_physical(plane))
+ continue;
+
+ min_alignment = max(min_alignment,
+ plane->min_alignment(plane, fb, 0));
+ }
+
+ return min_alignment;
+}
+
int intel_fill_fb_info(struct drm_i915_private *i915, struct intel_framebuffer *fb)
{
struct drm_i915_gem_object *obj = intel_fb_obj(&fb->base);
@@ -1698,6 +1719,8 @@ int intel_fill_fb_info(struct drm_i915_private *i915, struct intel_framebuffer *
return -EINVAL;
}
+ fb->min_alignment = intel_fb_min_alignment(&fb->base);
+
return 0;
}
@@ -230,13 +230,36 @@ void intel_fb_unpin_vma(struct i915_vma *vma, unsigned long flags)
i915_vma_put(vma);
}
+static bool gtt_view_is_per_plane(const struct intel_plane_state *plane_state)
+{
+ const struct intel_framebuffer *fb = to_intel_framebuffer(plane_state->hw.fb);
+
+ if (plane_state->view.gtt.type == I915_GTT_VIEW_REMAPPED &&
+ intel_fb_needs_pot_stride_remap(fb))
+ return false;
+
+ return plane_state->view.gtt.type != I915_GTT_VIEW_NORMAL;
+}
+
static unsigned int
intel_plane_fb_min_alignment(const struct intel_plane_state *plane_state)
{
struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
- const struct drm_framebuffer *fb = plane_state->hw.fb;
+ const struct intel_framebuffer *fb = to_intel_framebuffer(plane_state->hw.fb);
- return plane->min_alignment(plane, fb, 0);
+ /*
+ * Only use plane specific alignment for binding
+ * a per-plane gtt view (remapped or rotated),
+ * otherwise make sure the alignment is suitable
+ * for all planes.
+ */
+ if (!gtt_view_is_per_plane(plane_state))
+ return fb->min_alignment;
+
+ if (intel_plane_needs_physical(plane))
+ return 0;
+
+ return plane->min_alignment(plane, &fb->base, 0);
}
static unsigned int
@@ -46,7 +46,6 @@
#include "gem/i915_gem_mman.h"
#include "i915_drv.h"
-#include "intel_crtc.h"
#include "intel_display_types.h"
#include "intel_fb.h"
#include "intel_fb_pin.h"
@@ -172,21 +171,6 @@ static const struct fb_ops intelfb_ops = {
__diag_pop();
-static unsigned int intel_fbdev_min_alignment(const struct drm_framebuffer *fb)
-{
- struct drm_i915_private *i915 = to_i915(fb->dev);
- struct intel_plane *plane;
- struct intel_crtc *crtc;
-
- crtc = intel_first_crtc(i915);
- if (!crtc)
- return 0;
-
- plane = to_intel_plane(crtc->base.primary);
-
- return plane->min_alignment(plane, fb, 0);
-}
-
static int intelfb_create(struct drm_fb_helper *helper,
struct drm_fb_helper_surface_size *sizes)
{
@@ -244,7 +228,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
* BIOS is suitable for own access.
*/
vma = intel_fb_pin_to_ggtt(&fb->base, &view,
- intel_fbdev_min_alignment(&fb->base), 0,
+ fb->min_alignment, 0,
false, &flags);
if (IS_ERR(vma)) {
ret = PTR_ERR(vma);