drm/i915: Plumb drm_framebuffer into more places

Now that framebuffers can be used even before calling
drm_framebuffer_init() we can start to plumb them into more places,
instead of passing individual pieces for fb metadata.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170307194210.13400-2-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 726ae191076bdf7df4f04954b6f46231a5ca494e..d4dc9c0a8e70eb779ec68cba64fc9b3c4fcdd97e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1990,10 +1990,13 @@ static unsigned int intel_tile_size(const struct drm_i915_private *dev_priv)
        return IS_GEN2(dev_priv) ? 2048 : 4096;
 }
 
-static unsigned int intel_tile_width_bytes(const struct drm_i915_private *dev_priv,
-                                          uint64_t fb_modifier, unsigned int cpp)
+static unsigned int
+intel_tile_width_bytes(const struct drm_framebuffer *fb, int plane)
 {
-       switch (fb_modifier) {
+       struct drm_i915_private *dev_priv = to_i915(fb->dev);
+       unsigned int cpp = fb->format->cpp[plane];
+
+       switch (fb->modifier) {
        case DRM_FORMAT_MOD_NONE:
                return cpp;
        case I915_FORMAT_MOD_X_TILED:
@@ -2022,43 +2025,38 @@ static unsigned int intel_tile_width_bytes(const struct drm_i915_private *dev_pr
                }
                break;
        default:
-               MISSING_CASE(fb_modifier);
+               MISSING_CASE(fb->modifier);
                return cpp;
        }
 }
 
-unsigned int intel_tile_height(const struct drm_i915_private *dev_priv,
-                              uint64_t fb_modifier, unsigned int cpp)
+static unsigned int
+intel_tile_height(const struct drm_framebuffer *fb, int plane)
 {
-       if (fb_modifier == DRM_FORMAT_MOD_NONE)
+       if (fb->modifier == DRM_FORMAT_MOD_NONE)
                return 1;
        else
-               return intel_tile_size(dev_priv) /
-                       intel_tile_width_bytes(dev_priv, fb_modifier, cpp);
+               return intel_tile_size(to_i915(fb->dev)) /
+                       intel_tile_width_bytes(fb, plane);
 }
 
 /* Return the tile dimensions in pixel units */
-static void intel_tile_dims(const struct drm_i915_private *dev_priv,
+static void intel_tile_dims(const struct drm_framebuffer *fb, int plane,
                            unsigned int *tile_width,
-                           unsigned int *tile_height,
-                           uint64_t fb_modifier,
-                           unsigned int cpp)
+                           unsigned int *tile_height)
 {
-       unsigned int tile_width_bytes =
-               intel_tile_width_bytes(dev_priv, fb_modifier, cpp);
+       unsigned int tile_width_bytes = intel_tile_width_bytes(fb, plane);
+       unsigned int cpp = fb->format->cpp[plane];
 
        *tile_width = tile_width_bytes / cpp;
-       *tile_height = intel_tile_size(dev_priv) / tile_width_bytes;
+       *tile_height = intel_tile_size(to_i915(fb->dev)) / tile_width_bytes;
 }
 
 unsigned int
-intel_fb_align_height(struct drm_i915_private *dev_priv,
-                     unsigned int height,
-                     uint32_t pixel_format,
-                     uint64_t fb_modifier)
+intel_fb_align_height(const struct drm_framebuffer *fb,
+                     int plane, unsigned int height)
 {
-       unsigned int cpp = drm_format_plane_cpp(pixel_format, 0);
-       unsigned int tile_height = intel_tile_height(dev_priv, fb_modifier, cpp);
+       unsigned int tile_height = intel_tile_height(fb, plane);
 
        return ALIGN(height, tile_height);
 }
@@ -2099,21 +2097,23 @@ static unsigned int intel_linear_alignment(const struct drm_i915_private *dev_pr
                return 0;
 }
 
-static unsigned int intel_surf_alignment(const struct drm_i915_private *dev_priv,
-                                        uint64_t fb_modifier)
+static unsigned int intel_surf_alignment(const struct drm_framebuffer *fb,
+                                        int plane)
 {
-       switch (fb_modifier) {
+       struct drm_i915_private *dev_priv = to_i915(fb->dev);
+
+       switch (fb->modifier) {
        case DRM_FORMAT_MOD_NONE:
                return intel_linear_alignment(dev_priv);
        case I915_FORMAT_MOD_X_TILED:
-               if (INTEL_INFO(dev_priv)->gen >= 9)
+               if (INTEL_GEN(dev_priv) >= 9)
                        return 256 * 1024;
                return 0;
        case I915_FORMAT_MOD_Y_TILED:
        case I915_FORMAT_MOD_Yf_TILED:
                return 1 * 1024 * 1024;
        default:
-               MISSING_CASE(fb_modifier);
+               MISSING_CASE(fb->modifier);
                return 0;
        }
 }
@@ -2130,7 +2130,7 @@ intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb, unsigned int rotation)
 
        WARN_ON(!mutex_is_locked(&dev->struct_mutex));
 
-       alignment = intel_surf_alignment(dev_priv, fb->modifier);
+       alignment = intel_surf_alignment(fb, 0);
 
        intel_fill_fb_ggtt_view(&view, fb, rotation);
 
@@ -2291,8 +2291,7 @@ static u32 intel_adjust_tile_offset(int *x, int *y,
                unsigned int pitch_tiles;
 
                tile_size = intel_tile_size(dev_priv);
-               intel_tile_dims(dev_priv, &tile_width, &tile_height,
-                               fb->modifier, cpp);
+               intel_tile_dims(fb, plane, &tile_width, &tile_height);
 
                if (drm_rotation_90_or_270(rotation)) {
                        pitch_tiles = pitch / tile_height;
@@ -2347,8 +2346,7 @@ static u32 _intel_compute_tile_offset(const struct drm_i915_private *dev_priv,
                unsigned int tile_rows, tiles, pitch_tiles;
 
                tile_size = intel_tile_size(dev_priv);
-               intel_tile_dims(dev_priv, &tile_width, &tile_height,
-                               fb_modifier, cpp);
+               intel_tile_dims(fb, plane, &tile_width, &tile_height);
 
                if (drm_rotation_90_or_270(rotation)) {
                        pitch_tiles = pitch / tile_height;
@@ -2394,7 +2392,7 @@ u32 intel_compute_tile_offset(int *x, int *y,
        if (fb->format->format == DRM_FORMAT_NV12 && plane == 1)
                alignment = 4096;
        else
-               alignment = intel_surf_alignment(dev_priv, fb->modifier);
+               alignment = intel_surf_alignment(fb, plane);
 
        return _intel_compute_tile_offset(dev_priv, x, y, fb, plane, pitch,
                                          rotation, alignment);
@@ -2480,8 +2478,7 @@ intel_fill_fb_info(struct drm_i915_private *dev_priv,
                        unsigned int pitch_tiles;
                        struct drm_rect r;
 
-                       intel_tile_dims(dev_priv, &tile_width, &tile_height,
-                                       fb->modifier, cpp);
+                       intel_tile_dims(fb, i, &tile_width, &tile_height);
 
                        rot_info->plane[i].offset = offset;
                        rot_info->plane[i].stride = DIV_ROUND_UP(fb->pitches[i], tile_width * cpp);
@@ -2846,7 +2843,6 @@ static int skl_max_plane_width(const struct drm_framebuffer *fb, int plane,
 
 static int skl_check_main_surface(struct intel_plane_state *plane_state)
 {
-       const struct drm_i915_private *dev_priv = to_i915(plane_state->base.plane->dev);
        const struct drm_framebuffer *fb = plane_state->base.fb;
        unsigned int rotation = plane_state->base.rotation;
        int x = plane_state->base.src.x1 >> 16;
@@ -2865,8 +2861,7 @@ static int skl_check_main_surface(struct intel_plane_state *plane_state)
 
        intel_add_fb_offsets(&x, &y, plane_state, 0);
        offset = intel_compute_tile_offset(&x, &y, plane_state, 0);
-
-       alignment = intel_surf_alignment(dev_priv, fb->modifier);
+       alignment = intel_surf_alignment(fb, 0);
 
        /*
         * AUX surface offset is specified as the distance from the
@@ -3186,16 +3181,13 @@ static void ironlake_update_primary_plane(struct drm_plane *primary,
        POSTING_READ(reg);
 }
 
-u32 intel_fb_stride_alignment(const struct drm_i915_private *dev_priv,
-                             uint64_t fb_modifier, uint32_t pixel_format)
+static u32
+intel_fb_stride_alignment(const struct drm_framebuffer *fb, int plane)
 {
-       if (fb_modifier == DRM_FORMAT_MOD_NONE) {
+       if (fb->modifier == DRM_FORMAT_MOD_NONE)
                return 64;
-       } else {
-               int cpp = drm_format_plane_cpp(pixel_format, 0);
-
-               return intel_tile_width_bytes(dev_priv, fb_modifier, cpp);
-       }
+       else
+               return intel_tile_width_bytes(fb, plane);
 }
 
 static void skl_detach_scaler(struct intel_crtc *intel_crtc, int id)
@@ -3228,21 +3220,16 @@ static void skl_detach_scalers(struct intel_crtc *intel_crtc)
 u32 skl_plane_stride(const struct drm_framebuffer *fb, int plane,
                     unsigned int rotation)
 {
-       const struct drm_i915_private *dev_priv = to_i915(fb->dev);
        u32 stride = intel_fb_pitch(fb, plane, rotation);
 
        /*
         * The stride is either expressed as a multiple of 64 bytes chunks for
         * linear buffers or in number of tiles for tiled buffers.
         */
-       if (drm_rotation_90_or_270(rotation)) {
-               int cpp = fb->format->cpp[plane];
-
-               stride /= intel_tile_height(dev_priv, fb->modifier, cpp);
-       } else {
-               stride /= intel_fb_stride_alignment(dev_priv, fb->modifier,
-                                                   fb->format->format);
-       }
+       if (drm_rotation_90_or_270(rotation))
+               stride /= intel_tile_height(fb, plane);
+       else
+               stride /= intel_fb_stride_alignment(fb, plane);
 
        return stride;
 }
@@ -7378,10 +7365,7 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc,
        val = I915_READ(DSPSTRIDE(pipe));
        fb->pitches[0] = val & 0xffffffc0;
 
-       aligned_height = intel_fb_align_height(dev_priv,
-                                              fb->height,
-                                              fb->format->format,
-                                              fb->modifier);
+       aligned_height = intel_fb_align_height(fb, 0, fb->height);
 
        plane_config->size = fb->pitches[0] * aligned_height;
 
@@ -8416,14 +8400,10 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc,
        fb->width = ((val >> 0) & 0x1fff) + 1;
 
        val = I915_READ(PLANE_STRIDE(pipe, 0));
-       stride_mult = intel_fb_stride_alignment(dev_priv, fb->modifier,
-                                               fb->format->format);
+       stride_mult = intel_fb_stride_alignment(fb, 0);
        fb->pitches[0] = (val & 0x3ff) * stride_mult;
 
-       aligned_height = intel_fb_align_height(dev_priv,
-                                              fb->height,
-                                              fb->format->format,
-                                              fb->modifier);
+       aligned_height = intel_fb_align_height(fb, 0, fb->height);
 
        plane_config->size = fb->pitches[0] * aligned_height;
 
@@ -8519,10 +8499,7 @@ ironlake_get_initial_plane_config(struct intel_crtc *crtc,
        val = I915_READ(DSPSTRIDE(pipe));
        fb->pitches[0] = val & 0xffffffc0;
 
-       aligned_height = intel_fb_align_height(dev_priv,
-                                              fb->height,
-                                              fb->format->format,
-                                              fb->modifier);
+       aligned_height = intel_fb_align_height(fb, 0, fb->height);
 
        plane_config->size = fb->pitches[0] * aligned_height;
 
@@ -14358,15 +14335,6 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
                goto err;
        }
 
-       stride_alignment = intel_fb_stride_alignment(dev_priv,
-                                                    mode_cmd->modifier[0],
-                                                    mode_cmd->pixel_format);
-       if (mode_cmd->pitches[0] & (stride_alignment - 1)) {
-               DRM_DEBUG("pitch (%d) must be at least %u byte aligned\n",
-                         mode_cmd->pitches[0], stride_alignment);
-               goto err;
-       }
-
        pitch_limit = intel_fb_pitch_limit(dev_priv, mode_cmd->modifier[0],
                                           mode_cmd->pixel_format);
        if (mode_cmd->pitches[0] > pitch_limit) {
@@ -14447,6 +14415,14 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
 
        drm_helper_mode_fill_fb_struct(&dev_priv->drm,
                                       &intel_fb->base, mode_cmd);
+
+       stride_alignment = intel_fb_stride_alignment(&intel_fb->base, 0);
+       if (mode_cmd->pitches[0] & (stride_alignment - 1)) {
+               DRM_DEBUG("pitch (%d) must be at least %u byte aligned\n",
+                         mode_cmd->pitches[0], stride_alignment);
+               goto err;
+       }
+
        intel_fb->obj = obj;
 
        ret = intel_fill_fb_info(dev_priv, &intel_fb->base);

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 3af20c1f2ba83395968d7127fa67902c840929d4..578f7d20501f96d820a640949f2d7f852ceed6c9 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1250,12 +1250,8 @@ void intel_ddi_set_vc_payload_alloc(const struct intel_crtc_state *crtc_state,
 uint32_t ddi_signal_levels(struct intel_dp *intel_dp);
 u8 intel_ddi_dp_voltage_max(struct intel_encoder *encoder);
 
-unsigned int intel_fb_align_height(struct drm_i915_private *dev_priv,
-                                  unsigned int height,
-                                  uint32_t pixel_format,
-                                  uint64_t fb_format_modifier);
-u32 intel_fb_stride_alignment(const struct drm_i915_private *dev_priv,
-                             uint64_t fb_modifier, uint32_t pixel_format);
+unsigned int intel_fb_align_height(const struct drm_framebuffer *fb,
+                                  int plane, unsigned int height);
 
 /* intel_audio.c */
 void intel_init_audio_hooks(struct drm_i915_private *dev_priv);
@@ -1384,9 +1380,6 @@ int intel_plane_atomic_set_property(struct drm_plane *plane,
 int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,
                                    struct drm_plane_state *plane_state);
 
-unsigned int intel_tile_height(const struct drm_i915_private *dev_priv,
-                              uint64_t fb_modifier, unsigned int cpp);
-
 void assert_pch_transcoder_disabled(struct drm_i915_private *dev_priv,
                                    enum pipe pipe);
 

diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index f7e9a4e6959534f867f4b796218e038e7e759760..332254a8eebe9823d09e09df4009719b8cf5ee3e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -619,9 +619,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
                }
 
                cur_size = intel_crtc->config->base.adjusted_mode.crtc_vdisplay;
-               cur_size = intel_fb_align_height(to_i915(dev), cur_size,
-                                                fb->base.format->format,
-                                                fb->base.modifier);
+               cur_size = intel_fb_align_height(&fb->base, 0, cur_size);
                cur_size *= fb->base.pitches[0];
                DRM_DEBUG_KMS("pipe %c area: %dx%d, bpp: %d, size: %d\n",
                              pipe_name(intel_crtc->pipe),