summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/drm_framebuffer.c11
-rw-r--r--include/drm/drm_mode_config.h14
2 files changed, 25 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
index 888c4d53cf23..f863f8a20f8c 100644
--- a/drivers/gpu/drm/drm_framebuffer.c
+++ b/drivers/gpu/drm/drm_framebuffer.c
@@ -124,6 +124,17 @@ int drm_mode_addfb(struct drm_device *dev, struct drm_mode_fb_cmd *or,
r.pixel_format == DRM_FORMAT_XRGB2101010)
r.pixel_format = DRM_FORMAT_XBGR2101010;
+ if (dev->mode_config.quirk_addfb_prefer_host_byte_order) {
+ if (r.pixel_format == DRM_FORMAT_XRGB8888)
+ r.pixel_format = DRM_FORMAT_HOST_XRGB8888;
+ if (r.pixel_format == DRM_FORMAT_ARGB8888)
+ r.pixel_format = DRM_FORMAT_HOST_ARGB8888;
+ if (r.pixel_format == DRM_FORMAT_RGB565)
+ r.pixel_format = DRM_FORMAT_HOST_RGB565;
+ if (r.pixel_format == DRM_FORMAT_XRGB1555)
+ r.pixel_format = DRM_FORMAT_HOST_XRGB1555;
+ }
+
ret = drm_mode_addfb2(dev, &r, file_priv);
if (ret)
return ret;
diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
index 5d29f4ba6f69..928e4172a0bb 100644
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
@@ -812,6 +812,20 @@ struct drm_mode_config {
bool quirk_addfb_prefer_xbgr_30bpp;
/**
+ * @quirk_addfb_prefer_host_byte_order:
+ *
+ * When set to true drm_mode_addfb() will pick host byte order
+ * pixel_format when calling drm_mode_addfb2(). This is how
+ * drm_mode_addfb() should have worked from day one. It
+ * didn't though, so we ended up with quirks in both kernel
+ * and userspace drivers to deal with the broken behavior.
+ * Simply fixing drm_mode_addfb() unconditionally would break
+ * these drivers, so add a quirk bit here to allow drivers
+ * opt-in.
+ */
+ bool quirk_addfb_prefer_host_byte_order;
+
+ /**
* @async_page_flip: Does this device support async flips on the primary
* plane?
*/