Pre-nv50 YUV overlays have stringent requirements for working with the
internal machinery. Instead of rejecting these at update_plane time, we
should instead prevent the framebuffers from being created in the first
place.

Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu>
---
 drivers/gpu/drm/nouveau/nouveau_display.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c 
b/drivers/gpu/drm/nouveau/nouveau_display.c
index 549763f5e17d..99ae77f66177 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -256,9 +256,30 @@ nouveau_framebuffer_new(struct drm_device *dev,
                        struct nouveau_bo *nvbo,
                        struct nouveau_framebuffer **pfb)
 {
+       struct nouveau_drm *drm = nouveau_drm(dev);
        struct nouveau_framebuffer *fb;
        int ret;
 
+        /* YUV overlays have special requirements pre-NV50 */
+       if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA &&
+
+           (mode_cmd->pixel_format == DRM_FORMAT_YUYV ||
+            mode_cmd->pixel_format == DRM_FORMAT_UYVY ||
+            mode_cmd->pixel_format == DRM_FORMAT_NV12 ||
+            mode_cmd->pixel_format == DRM_FORMAT_NV21) &&
+           (mode_cmd->pitches[0] & 0x3f || /* align 64 */
+            mode_cmd->pitches[0] >= 0x10000 || /* at most 64k pitch */
+            (mode_cmd->pitches[1] && /* pitches for planes must match */
+             mode_cmd->pitches[0] != mode_cmd->pitches[1]))) {
+               struct drm_format_name_buf format_name;
+               DRM_DEBUG_KMS("Unsuitable framebuffer: format: %s; pitches: 
0x%x\n 0x%x\n",
+                             drm_get_format_name(mode_cmd->pixel_format,
+                                                 &format_name),
+                             mode_cmd->pitches[0],
+                             mode_cmd->pitches[1]);
+               return -EINVAL;
+       }
+
        if (!(fb = *pfb = kzalloc(sizeof(*fb), GFP_KERNEL)))
                return -ENOMEM;
 
-- 
2.13.0

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau

Reply via email to