drm: add an fb creation ioctl that takes a pixel format v5

To properly support the various plane formats supported by different
hardware, the kernel must know the pixel format of a framebuffer object.
So add a new ioctl taking a format argument corresponding to a fourcc
name from the new drm_fourcc.h header file.  Implement the fb creation
hooks in terms of the new mode_fb_cmd2 using helpers where the old
bpp/depth values are needed.

v2: create DRM specific fourcc header file for sharing with libdrm etc
v3: fix rebase failure and use DRM fourcc codes in intel_display.c and
    update commit message
v4: make fb_cmd2 handle field into an array for multi-object formats
    pull in Ville's fix for the memcpy in drm_plane_init
    apply Ville's cleanup to zero out fb_cmd2 arg in drm_mode_addfb
v5: add 'flags' field for interlaced support (from Ville)

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Reviewed-by: Rob Clark <rob.clark@linaro.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 47 insertions, 4 deletions

diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 2957636161e8..432d5391b93c 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -34,6 +34,7 @@
 
 #include "drmP.h"
 #include "drm_crtc.h"
+#include "drm_fourcc.h"
 #include "drm_crtc_helper.h"
 #include "drm_fb_helper.h"
 
@@ -810,14 +811,56 @@ void drm_helper_connector_dpms(struct drm_connector *connector, int mode)
 }
 EXPORT_SYMBOL(drm_helper_connector_dpms);
 
+/*
+ * Just need to support RGB formats here for compat with code that doesn't
+ * use pixel formats directly yet.
+ */
+void drm_helper_get_fb_bpp_depth(uint32_t format, unsigned int *depth,
+                                 int *bpp)
+{
+        switch (format) {
+        case DRM_FOURCC_RGB332:
+                *depth = 8;
+                *bpp = 8;
+                break;
+        case DRM_FOURCC_RGB555:
+                *depth = 15;
+                *bpp = 16;
+                break;
+        case DRM_FOURCC_RGB565:
+                *depth = 16;
+                *bpp = 16;
+                break;
+        case DRM_FOURCC_RGB24:
+                *depth = 24;
+                *bpp = 32;
+                break;
+        case DRM_INTEL_RGB30:
+                *depth = 30;
+                *bpp = 32;
+                break;
+        case DRM_FOURCC_RGB32:
+                *depth = 32;
+                *bpp = 32;
+                break;
+        default:
+                DRM_DEBUG_KMS("unsupported pixel format\n");
+                *depth = 0;
+                *bpp = 0;
+                break;
+        }
+}
+EXPORT_SYMBOL(drm_helper_get_fb_bpp_depth);
+
 int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb,
-                                   struct drm_mode_fb_cmd *mode_cmd)
+                                   struct drm_mode_fb_cmd2 *mode_cmd)
 {
         fb->width = mode_cmd->width;
         fb->height = mode_cmd->height;
-        fb->pitch = mode_cmd->pitch;
-        fb->bits_per_pixel = mode_cmd->bpp;
-        fb->depth = mode_cmd->depth;
+        fb->pitch = mode_cmd->pitches[0];
+        drm_helper_get_fb_bpp_depth(mode_cmd->pixel_format, &fb->depth,
+                                    &fb->bits_per_pixel);
+        fb->pixel_format = mode_cmd->pixel_format;
 
         return 0;
 }