drm/nouveau/kms/nv50-: remove overlay alpha formats

The overlay logic can only do colorkey-based selection, not
alpha-blending.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c b/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
index 7354aaf..8ccd961 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
@@ -161,9 +161,7 @@ ovly507e_format[] = {
        DRM_FORMAT_YUYV,
        DRM_FORMAT_UYVY,
        DRM_FORMAT_XRGB8888,
-       DRM_FORMAT_ARGB8888,
        DRM_FORMAT_XRGB1555,
-       DRM_FORMAT_ARGB1555,
        0
 };
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/ovly827e.c b/drivers/gpu/drm/nouveau/dispnv50/ovly827e.c
index aaa9fe5..2e68fc7 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/ovly827e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/ovly827e.c
@@ -90,11 +90,8 @@ ovly827e_format[] = {
        DRM_FORMAT_YUYV,
        DRM_FORMAT_UYVY,
        DRM_FORMAT_XRGB8888,
-       DRM_FORMAT_ARGB8888,
        DRM_FORMAT_XRGB1555,
-       DRM_FORMAT_ARGB1555,
        DRM_FORMAT_XBGR2101010,
-       DRM_FORMAT_ABGR2101010,
        0
 };
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/ovly907e.c b/drivers/gpu/drm/nouveau/dispnv50/ovly907e.c
index f947117..9efe5e9 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/ovly907e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/ovly907e.c
@@ -66,13 +66,9 @@ ovly907e_format[] = {
        DRM_FORMAT_YUYV,
        DRM_FORMAT_UYVY,
        DRM_FORMAT_XRGB8888,
-       DRM_FORMAT_ARGB8888,
        DRM_FORMAT_XRGB1555,
-       DRM_FORMAT_ARGB1555,
        DRM_FORMAT_XBGR2101010,
-       DRM_FORMAT_ABGR2101010,
        DRM_FORMAT_XBGR16161616F,
-       DRM_FORMAT_ABGR16161616F,
        0
 };
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/ovly917e.c b/drivers/gpu/drm/nouveau/dispnv50/ovly917e.c
index fab567e..e24d6fd 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/ovly917e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/ovly917e.c
@@ -26,15 +26,10 @@ ovly917e_format[] = {
        DRM_FORMAT_YUYV,
        DRM_FORMAT_UYVY,
        DRM_FORMAT_XRGB8888,
-       DRM_FORMAT_ARGB8888,
        DRM_FORMAT_XRGB1555,
-       DRM_FORMAT_ARGB1555,
        DRM_FORMAT_XBGR2101010,
-       DRM_FORMAT_ABGR2101010,
        DRM_FORMAT_XRGB2101010,
-       DRM_FORMAT_ARGB2101010,
        DRM_FORMAT_XBGR16161616F,
-       DRM_FORMAT_ABGR16161616F,
        0
 };