drm/nouveau/kms/gk104-: add support for [XA]2R10G10B10 formats

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/dispnv50/Kbuild b/drivers/gpu/drm/nouveau/dispnv50/Kbuild
index d074bb8ecd1be5973f31daf983ed328153bb70db..7c337fd8015879e7270b83a489d95b7fa2b31027 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/Kbuild
+++ b/drivers/gpu/drm/nouveau/dispnv50/Kbuild
@@ -27,6 +27,7 @@ nouveau-y += dispnv50/base.o
 nouveau-y += dispnv50/base507c.o
 nouveau-y += dispnv50/base827c.o
 nouveau-y += dispnv50/base907c.o
+nouveau-y += dispnv50/base917c.o
 
 nouveau-y += dispnv50/curs.o
 nouveau-y += dispnv50/curs507a.o

diff --git a/drivers/gpu/drm/nouveau/dispnv50/base.c b/drivers/gpu/drm/nouveau/dispnv50/base.c
index 5f184ab833e80669cb686cf23a05e46ba3975e73..7c752acf2b48d044846b8902678577a40a5b012f 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/base.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/base.c
@@ -31,8 +31,8 @@ nv50_base_new(struct nouveau_drm *drm, int head, struct nv50_wndw **pwndw)
                int version;
                int (*new)(struct nouveau_drm *, int, s32, struct nv50_wndw **);
        } bases[] = {
-               { GK110_DISP_BASE_CHANNEL_DMA, 0, base907c_new },
-               { GK104_DISP_BASE_CHANNEL_DMA, 0, base907c_new },
+               { GK110_DISP_BASE_CHANNEL_DMA, 0, base917c_new },
+               { GK104_DISP_BASE_CHANNEL_DMA, 0, base917c_new },
                { GF110_DISP_BASE_CHANNEL_DMA, 0, base907c_new },
                { GT214_DISP_BASE_CHANNEL_DMA, 0, base827c_new },
                { GT200_DISP_BASE_CHANNEL_DMA, 0, base827c_new },

diff --git a/drivers/gpu/drm/nouveau/dispnv50/base.h b/drivers/gpu/drm/nouveau/dispnv50/base.h
index 87ec8394b7f3c69c2b767ed209ce7387e0e07927..7afd9e26f9f96d3aa7d360bb1479086586d84c4a 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/base.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/base.h
@@ -25,6 +25,9 @@ void base507c_update(struct nv50_wndw *, u32 *);
 int base827c_new(struct nouveau_drm *, int, s32, struct nv50_wndw **);
 
 int base907c_new(struct nouveau_drm *, int, s32, struct nv50_wndw **);
+extern const struct nv50_wndw_func base907c;
+
+int base917c_new(struct nouveau_drm *, int, s32, struct nv50_wndw **);
 
 int nv50_base_new(struct nouveau_drm *, int head, struct nv50_wndw **);
 #endif

diff --git a/drivers/gpu/drm/nouveau/dispnv50/base907c.c b/drivers/gpu/drm/nouveau/dispnv50/base907c.c
index 8edc0598bda83debd7a453d8a3c6f2b35bbef09b..a562fc94ce5990700b1664af2c295586b7dca1b8 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/base907c.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/base907c.c
@@ -82,7 +82,7 @@ base907c_ilut(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
        asyw->xlut.i.enable = 2;
 }
 
-static const struct nv50_wndw_func
+const struct nv50_wndw_func
 base907c = {
        .acquire = base507c_acquire,
        .release = base507c_release,

diff --git a/drivers/gpu/drm/nouveau/dispnv50/base917c.c b/drivers/gpu/drm/nouveau/dispnv50/base917c.c
new file mode 100644 (file)
index 0000000..54d705b
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/dispnv50/base917c.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include "base.h"
+#include "atom.h"
+
+const u32
+base917c_format[] = {
+       DRM_FORMAT_C8,
+       DRM_FORMAT_XRGB8888,
+       DRM_FORMAT_ARGB8888,
+       DRM_FORMAT_RGB565,
+       DRM_FORMAT_XRGB1555,
+       DRM_FORMAT_ARGB1555,
+       DRM_FORMAT_XBGR2101010,
+       DRM_FORMAT_ABGR2101010,
+       DRM_FORMAT_XBGR8888,
+       DRM_FORMAT_ABGR8888,
+       DRM_FORMAT_XRGB2101010,
+       DRM_FORMAT_ARGB2101010,
+       0
+};
+
+int
+base917c_new(struct nouveau_drm *drm, int head, s32 oclass,
+            struct nv50_wndw **pwndw)
+{
+       return base507c_new_(&base907c, base917c_format, drm, head, oclass,
+                            0x00000002 << (head * 4), pwndw);
+}

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
index b96dc3d4dab5932454bc1494eea06d1289fd71c5..861fb0ec6b615fe018263cdc569f6554051eb846 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
@@ -194,6 +194,8 @@ nv50_wndw_atomic_check_acquire_rgb(struct nv50_wndw_atom *asyw)
        case DRM_FORMAT_ABGR2101010: asyw->image.format = 0xd1; break;
        case DRM_FORMAT_XBGR8888   :
        case DRM_FORMAT_ABGR8888   : asyw->image.format = 0xd5; break;
+       case DRM_FORMAT_XRGB2101010:
+       case DRM_FORMAT_ARGB2101010: asyw->image.format = 0xdf; break;
        default:
                WARN_ON(1);
                return -EINVAL;