3 files changed, 7 insertions, 1 deletions

diff --git a/drivers/gpu/drm/pl111/pl111_drm.h b/drivers/gpu/drm/pl111/pl111_drm.h
index 8e252b561e2c..2a93e0134061 100644
--- a/drivers/gpu/drm/pl111/pl111_drm.h
+++ b/drivers/gpu/drm/pl111/pl111_drm.h
@@ -43,6 +43,7 @@ struct drm_minor;
  * @broken_vblank: the vblank IRQ is broken on this variant
  * @formats: array of supported pixel formats on this variant
  * @nformats: the length of the array of supported pixel formats
+ * @fb_bpp: desired bits per pixel on the default framebuffer
  */
 struct pl111_variant_data {
         const char *name;
@@ -52,6 +53,7 @@ struct pl111_variant_data {
         bool broken_vblank;
         const u32 *formats;
         unsigned int nformats;
+        unsigned int fb_bpp;
 };
 
 struct pl111_drm_dev_private {
diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c
index a7a3a49956c5..e92a406c9ea9 100644
--- a/drivers/gpu/drm/pl111/pl111_drv.c
+++ b/drivers/gpu/drm/pl111/pl111_drv.c
@@ -192,7 +192,7 @@ static int pl111_modeset_init(struct drm_device *dev)
 
         drm_mode_config_reset(dev);
 
-        drm_fb_cma_fbdev_init(dev, 32, 0);
+        drm_fb_cma_fbdev_init(dev, priv->variant->fb_bpp, 0);
 
         drm_kms_helper_poll_init(dev);
 
@@ -336,6 +336,7 @@ static const struct pl111_variant_data pl110_variant = {
         .is_pl110 = true,
         .formats = pl110_pixel_formats,
         .nformats = ARRAY_SIZE(pl110_pixel_formats),
+        .fb_bpp = 16,
 };
 
 /* RealView, Versatile Express etc use this modern variant */
@@ -360,6 +361,7 @@ static const struct pl111_variant_data pl111_variant = {
         .name = "PL111",
         .formats = pl111_pixel_formats,
         .nformats = ARRAY_SIZE(pl111_pixel_formats),
+        .fb_bpp = 32,
 };
 
 static const struct amba_id pl111_id_table[] = {
diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c b/drivers/gpu/drm/pl111/pl111_versatile.c
index 05a4b89e0934..2c6fc50b0c12 100644
--- a/drivers/gpu/drm/pl111/pl111_versatile.c
+++ b/drivers/gpu/drm/pl111/pl111_versatile.c
@@ -241,6 +241,7 @@ static const struct pl111_variant_data pl110_integrator = {
         .broken_vblank = true,
         .formats = pl110_integrator_pixel_formats,
         .nformats = ARRAY_SIZE(pl110_integrator_pixel_formats),
+        .fb_bpp = 16,
 };
 
 /*
@@ -253,6 +254,7 @@ static const struct pl111_variant_data pl110_versatile = {
         .external_bgr = true,
         .formats = pl110_versatile_pixel_formats,
         .nformats = ARRAY_SIZE(pl110_versatile_pixel_formats),
+        .fb_bpp = 16,
 };
 
 int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)