[src/trunk]: src/sys/external/bsd/drm2/dist/drm/radeon revert rev 1.3 + 1.4 (...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a88364331254
branches:  trunk
changeset: 447977:a88364331254
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jan 30 01:11:08 2019 +0000

description:
revert rev 1.3 + 1.4 (2015):  blank console / CLUT attempts.
we disabled the driver for almost all r100/r200 chipsets so
this code has been obsolete for ages and doesn't need to
remain a diff against upstream.

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c |  40 +++--------------
 1 files changed, 8 insertions(+), 32 deletions(-)

diffs (61 lines):

diff -r 9cda62719ca5 -r a88364331254 sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c    Wed Jan 30 00:56:47 2019 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c    Wed Jan 30 01:11:08 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeon_display.c,v 1.9 2018/08/27 15:22:54 riastradh Exp $     */
+/*     $NetBSD: radeon_display.c,v 1.10 2019/01/30 01:11:08 mrg Exp $  */
 
 /*
  * Copyright 2007-8 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
  *          Alex Deucher
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_display.c,v 1.9 2018/08/27 15:22:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_display.c,v 1.10 2019/01/30 01:11:08 mrg Exp $");
 
 #include <drm/drmP.h>
 #include <drm/radeon_drm.h>
@@ -188,36 +188,12 @@
                dac2_cntl |= RADEON_DAC2_PALETTE_ACC_CTL;
        WREG32(RADEON_DAC_CNTL2, dac2_cntl);
 
-       /*
-        * At least the RV100 [vendor 1002 product 515e (rev. 0x02)]
-        * has an old style palette
-        */
-       if (rdev->family < CHIP_RV280) {
-#ifdef notyet
-               /*
-                * Leave CLUT alone for now. The code below gives us a
-                * nice 444 grayscale, but we are not in true color mode
-                * anymore and I don't have any docs how to do this right.
-                */
-               WREG8(RADEON_PALETTE_INDEX, 0);
-               for (i = 0; i < 256; i++) {
-#define R(x) (radeon_crtc->lut_r[i] >> 2)
-#define G(x) (radeon_crtc->lut_g[i] >> 2)
-#define B(x) (radeon_crtc->lut_b[i] >> 2)
-                       WREG32(RADEON_PALETTE_DATA, ((R(i) << 16)
-                               | (G(i) << 8) | B(i)) << 4);
-               }
-#else
-               printf("%s: unknown DAC, can't set lookup table\n", __func__);
-#endif
-       } else {
-               WREG8(RADEON_PALETTE_INDEX, 0);
-               for (i = 0; i < 256; i++) {
-                       WREG32(RADEON_PALETTE_30_DATA,
-                                    (radeon_crtc->lut_r[i] << 20) |
-                                    (radeon_crtc->lut_g[i] << 10) |
-                                    (radeon_crtc->lut_b[i] << 0));
-               }
+       WREG8(RADEON_PALETTE_INDEX, 0);
+       for (i = 0; i < 256; i++) {
+               WREG32(RADEON_PALETTE_30_DATA,
+                            (radeon_crtc->lut_r[i] << 20) |
+                            (radeon_crtc->lut_g[i] << 10) |
+                            (radeon_crtc->lut_b[i] << 0));
        }
 }