drm: replace DRIVER_PREFER_XBGR_30BPP driver flag with mode_config quirk

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20180905060445.15008-2-kraxel@redhat.com

diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
index 781af1d42d766bf63db12801ace4703132db84fa..17b7b8944de5674fad399603abf79e91bc7b52e3 100644 (file)
--- a/drivers/gpu/drm/drm_framebuffer.c
+++ b/drivers/gpu/drm/drm_framebuffer.c
@@ -120,8 +120,8 @@ int drm_mode_addfb(struct drm_device *dev, struct drm_mode_fb_cmd *or,
        r.pixel_format = drm_mode_legacy_fb_format(or->bpp, or->depth);
        r.handles[0] = or->handle;
 
-       if (r.pixel_format == DRM_FORMAT_XRGB2101010 &&
-           dev->driver->driver_features & DRIVER_PREFER_XBGR_30BPP)
+       if (dev->mode_config.quirk_addfb_prefer_xbgr_30bpp &&
+           r.pixel_format == DRM_FORMAT_XRGB2101010)
                r.pixel_format = DRM_FORMAT_XBGR2101010;
 
        ret = drm_mode_addfb2(dev, &r, file_priv);

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 8412119bd94058b7197c531c49fc7ad88a9e6fab..a9bb656058e524aec4c183bd005ae6ddd1e02588 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -2174,7 +2174,7 @@ nv50_display_create(struct drm_device *dev)
        nouveau_display(dev)->fini = nv50_display_fini;
        disp->disp = &nouveau_display(dev)->disp;
        dev->mode_config.funcs = &nv50_disp_func;
-       dev->driver->driver_features |= DRIVER_PREFER_XBGR_30BPP;
+       dev->mode_config.quirk_addfb_prefer_xbgr_30bpp = true;
 
        /* small shared memory area we use for notifiers and semaphores */
        ret = nouveau_bo_new(&drm->client, 4096, 0x1000, TTM_PL_FLAG_VRAM,

diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
index 46a8009784df1227f784774bdab50d39e03dceb5..23b9678137a6f1c3cc3738bcf638be3852c8a442 100644 (file)
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
@@ -56,7 +56,6 @@ struct drm_printer;
 #define DRIVER_ATOMIC                  0x10000
 #define DRIVER_KMS_LEGACY_CONTEXT      0x20000
 #define DRIVER_SYNCOBJ                  0x40000
-#define DRIVER_PREFER_XBGR_30BPP        0x80000
 
 /**
  * struct drm_driver - DRM driver structure

diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
index a0b202e1d69a08363c9cf1d39dbc3377f9d07ef1..5d29f4ba6f69f9202d4f1fc7b23b869943a8da2c 100644 (file)
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
@@ -809,6 +809,7 @@ struct drm_mode_config {
 
        /* dumb ioctl parameters */
        uint32_t preferred_depth, prefer_shadow;
+       bool quirk_addfb_prefer_xbgr_30bpp;
 
        /**
         * @async_page_flip: Does this device support async flips on the primary