Merge branch 'master' into vaapi-ext

Conflicts:
	src/i965_drv_video.c

diff --cc src/gen6_mfd.c
Simple merge

diff --cc src/gen7_mfd.c
Simple merge

diff --cc src/gen7_mfd.h
Simple merge

diff --cc src/i965_drv_video.c
index 505b529,851d7f5..0376e53
--- 1/src/i965_drv_video.c
--- 2/src/i965_drv_video.c
+++ b/src/i965_drv_video.c
@@@ -2138,8 -1861,7 +2138,7 @@@ VAStatus i965_DeriveImage(VADriverConte
      struct object_surface *obj_surface; 
      VAImageID image_id;
      unsigned int w_pitch, h_pitch;
-     unsigned int data_size;
 -    VAStatus va_status;
 +    VAStatus va_status = VA_STATUS_ERROR_OPERATION_FAILED;
  
      out_image->image_id = VA_INVALID_ID;
      obj_surface = SURFACE(surface);
@@@ -2147,12 -1869,8 +2146,10 @@@
      if (!obj_surface)
          return VA_STATUS_ERROR_INVALID_SURFACE;
  
 +    i965_check_alloc_surface_bo(ctx, obj_surface, HAS_TILED_SURFACE(i965), VA_FOURCC('N', 'V', '1', '2'));
 +
      w_pitch = obj_surface->width;
      h_pitch = obj_surface->height;
-     data_size = obj_surface->orig_width * obj_surface->orig_height +
-         2 * (((obj_surface->orig_width + 1) / 2) * ((obj_surface->orig_height + 1) / 2));
  
      image_id = NEW_IMAGE_ID();
  
@@@ -2177,45 -1895,44 +2174,45 @@@
      image->entry_bytes = 0;
      image->width = obj_surface->orig_width;
      image->height = obj_surface->orig_height;
-     image->data_size = data_size;
+     image->data_size = obj_surface->size;
  
 -    if (!render_state->inited) {
 -            image->format.fourcc = VA_FOURCC('Y','V','1','2');
 -            image->format.byte_order = VA_LSB_FIRST;
 -            image->format.bits_per_pixel = 12;
 -            image->num_planes = 3;
 -            image->pitches[0] = w_pitch;
 -            image->offsets[0] = 0;
 -            image->pitches[1] = w_pitch / 2;
 -            image->offsets[1] = w_pitch * h_pitch;
 -            image->pitches[2] = w_pitch / 2;
 -            image->offsets[2] = w_pitch * h_pitch + (w_pitch / 2) * (h_pitch / 2);
 -    } else {
 -        if (render_state->interleaved_uv) {
 -            image->format.fourcc = VA_FOURCC('N','V','1','2');
 -            image->format.byte_order = VA_LSB_FIRST;
 -            image->format.bits_per_pixel = 12;
 -            image->num_planes = 2;
 -            image->pitches[0] = w_pitch;
 -            image->offsets[0] = 0;
 -            image->pitches[1] = w_pitch;
 -            image->offsets[1] = w_pitch * h_pitch;
 -        } else {
 -            image->format.fourcc = VA_FOURCC('I','4','2','0');
 -            image->format.byte_order = VA_LSB_FIRST;
 -            image->format.bits_per_pixel = 12;
 -            image->num_planes = 3;
 -            image->pitches[0] = w_pitch;
 -            image->offsets[0] = 0;
 -            image->pitches[1] = w_pitch / 2;
 -            image->offsets[1] = w_pitch * h_pitch;
 -            image->pitches[2] = w_pitch / 2;
 -            image->offsets[2] = w_pitch * h_pitch + (w_pitch / 2) * (h_pitch / 2);
 -        }
 +    image->format.fourcc = obj_surface->fourcc;
 +    image->format.byte_order = VA_LSB_FIRST;
 +    image->format.bits_per_pixel = 12;
 +
 +    switch (image->format.fourcc) {
 +    case VA_FOURCC('Y', 'V', '1', '2'):
 +        image->num_planes = 3;
 +        image->pitches[0] = w_pitch; /* Y */
 +        image->offsets[0] = 0;
 +        image->pitches[1] = w_pitch / 2; /* V */
 +        image->offsets[1] = w_pitch * h_pitch;
 +        image->pitches[2] = w_pitch / 2; /* U */
 +        image->offsets[2] = w_pitch * h_pitch + (w_pitch / 2) * (h_pitch / 2);
 +        break;
 +
 +    case VA_FOURCC('N', 'V', '1', '2'):
 +        image->num_planes = 2;
 +        image->pitches[0] = w_pitch; /* Y */
 +        image->offsets[0] = 0;
 +        image->pitches[1] = w_pitch; /* UV */
 +        image->offsets[1] = w_pitch * h_pitch;
 +        break;
 +
 +    case VA_FOURCC('I', '4', '2', '0'):
 +        image->num_planes = 3;
 +        image->pitches[0] = w_pitch; /* Y */
 +        image->offsets[0] = 0;
 +        image->pitches[1] = w_pitch / 2; /* U */
 +        image->offsets[1] = w_pitch * h_pitch;
 +        image->pitches[2] = w_pitch / 2; /* V */
 +        image->offsets[2] = w_pitch * h_pitch + (w_pitch / 2) * (h_pitch / 2);
 +        break;
 +
 +    default:
 +        goto error;
      }
  
 -    i965_check_alloc_surface_bo(ctx, obj_surface, HAS_TILED_SURFACE(i965), image->format.fourcc);
      va_status = i965_create_buffer_internal(ctx, 0, VAImageBufferType,
                                              obj_surface->size, 1, NULL, obj_surface->bo, &image->buf);
      if (va_status != VA_STATUS_SUCCESS)