drm: Replace pitch with pitches[] in drm_framebuffer

Otherwise each driver would need to keep the information inside
their own framebuffer object structure. Also add offsets[]. BOs
on the other hand are driver specific, so those can be kept in
driver specific structures.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 760d04aee380..0585987f2945 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -605,7 +605,7 @@ static int vmw_kms_new_framebuffer_surface(struct vmw_private *dev_priv,
 
         /* XXX get the first 3 from the surface info */
         vfbs->base.base.bits_per_pixel = mode_cmd->bpp;
-        vfbs->base.base.pitch = mode_cmd->pitch;
+        vfbs->base.base.pitches[0] = mode_cmd->pitch;
         vfbs->base.base.depth = mode_cmd->depth;
         vfbs->base.base.width = mode_cmd->width;
         vfbs->base.base.height = mode_cmd->height;
@@ -719,7 +719,7 @@ static int do_dmabuf_define_gmrfb(struct drm_file *file_priv,
         cmd->body.format.bitsPerPixel = framebuffer->base.bits_per_pixel;
         cmd->body.format.colorDepth = depth;
         cmd->body.format.reserved = 0;
-        cmd->body.bytesPerLine = framebuffer->base.pitch;
+        cmd->body.bytesPerLine = framebuffer->base.pitches[0];
         cmd->body.ptr.gmrId = framebuffer->user_handle;
         cmd->body.ptr.offset = 0;
 
@@ -961,7 +961,7 @@ static int vmw_kms_new_framebuffer_dmabuf(struct vmw_private *dev_priv,
         }
 
         vfbd->base.base.bits_per_pixel = mode_cmd->bpp;
-        vfbd->base.base.pitch = mode_cmd->pitch;
+        vfbd->base.base.pitches[0] = mode_cmd->pitch;
         vfbd->base.base.depth = mode_cmd->depth;
         vfbd->base.base.width = mode_cmd->width;
         vfbd->base.base.height = mode_cmd->height;
@@ -1243,7 +1243,7 @@ int vmw_kms_readback(struct vmw_private *dev_priv,
         cmd->body.format.bitsPerPixel = vfb->base.bits_per_pixel;
         cmd->body.format.colorDepth = vfb->base.depth;
         cmd->body.format.reserved = 0;
-        cmd->body.bytesPerLine = vfb->base.pitch;
+        cmd->body.bytesPerLine = vfb->base.pitches[0];
         cmd->body.ptr.gmrId = vfb->user_handle;
         cmd->body.ptr.offset = 0;
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index 90c5e3928491..15a6805e48b0 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@ -94,7 +94,7 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv)
                         return 0;
                 fb = entry->base.crtc.fb;
 
-                return vmw_kms_write_svga(dev_priv, w, h, fb->pitch,
+                return vmw_kms_write_svga(dev_priv, w, h, fb->pitches[0],
                                           fb->bits_per_pixel, fb->depth);
         }
 
@@ -102,7 +102,7 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv)
                 entry = list_entry(lds->active.next, typeof(*entry), active);
                 fb = entry->base.crtc.fb;
 
-                vmw_kms_write_svga(dev_priv, fb->width, fb->height, fb->pitch,
+                vmw_kms_write_svga(dev_priv, fb->width, fb->height, fb->pitches[0],
                                    fb->bits_per_pixel, fb->depth);
         }