Which is now required for DRM_CLIENT_CAP_PLANE_COLOR_PIPELINE. Only
enable it if the enable_plane_pipeline option is enabled so otherwise
the legacy flags COLOR_ENCODING and COLOR_RANGE continue to be
supported.

Signed-off-by: Robert Mader <[email protected]>
---
 drivers/gpu/drm/vkms/vkms_drv.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c
index 5a640b531d88..00bbde950521 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.c
+++ b/drivers/gpu/drm/vkms/vkms_drv.c
@@ -91,7 +91,8 @@ static void vkms_atomic_commit_tail(struct drm_atomic_commit 
*old_state)
 }
 
 static const struct drm_driver vkms_driver = {
-       .driver_features        = DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_GEM,
+       .driver_features        = DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_GEM |
+                                 DRIVER_PLANE_COLOR_PIPELINE,
        .fops                   = &vkms_driver_fops,
        DRM_GEM_SHMEM_DRIVER_OPS,
        DRM_FBDEV_SHMEM_DRIVER_OPS,
@@ -184,6 +185,9 @@ int vkms_create(struct vkms_config *config)
        vkms_device->config = config;
        config->dev = vkms_device;
 
+       if (!enable_plane_pipeline)
+               vkms_device->drm.driver_features &= 
~DRIVER_PLANE_COLOR_PIPELINE;
+
        ret = dma_coerce_mask_and_coherent(vkms_device->drm.dev,
                                           DMA_BIT_MASK(64));
 
-- 
2.54.0

Reply via email to