[PATCH 5/6] xfree86: Remove whitepoint parse from EDID parsing

[Adam Jackson]

No internal consumers.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 hw/xfree86/ddc/edid.h           |    9 ---------
 hw/xfree86/ddc/interpret_edid.c |   15 ---------------
 hw/xfree86/ddc/print_edid.c     |   14 --------------
 3 files changed, 0 insertions(+), 38 deletions(-)

diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h
index 749d864..96de9e3 100644
--- a/hw/xfree86/ddc/edid.h
+++ b/hw/xfree86/ddc/edid.h
@@ -501,13 +501,6 @@ struct monitor_ranges {
   int preferred_refresh; /* in hz */
 };
 
-struct whitePoints{
-  int   index;
-  float white_x;
-  float white_y;
-  float white_gamma;
-};
-
 struct cvt_timings {
     int width;
     int height;
@@ -530,8 +523,6 @@ struct detailed_monitor_section {
     Uchar name[13];
     struct monitor_ranges ranges;	/* 56 */
     struct std_timings std_t[5];	/* 80 */
-    struct whitePoints wp[2];		/* 32 */
-    /* color management data */
     struct cvt_timings cvt[4];		/* 64 */
     Uchar est_iii[6];			/* 6 */
   } section;				/* max: 80 */
diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index 46958f7..cba10e6 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -50,7 +50,6 @@ static void copy_string(Uchar *, Uchar *);
 static void get_dst_timing_section(Uchar *, struct std_timings *,
 				   struct edid_version *);
 static void get_monitor_ranges(Uchar *, struct monitor_ranges *);
-static void get_whitepoint_section(Uchar *, struct whitePoints *);
 static void get_detailed_timing_section(Uchar*, struct 	detailed_timings *);
 static Bool validate_version(int scrnIndex, struct edid_version *);
 
@@ -472,7 +471,6 @@ fetch_detailed_block(Uchar *c, struct edid_version *ver,
             break;
         case ADD_COLOR_POINT:
             det_mon->type = DS_WHITE_P;
-            get_whitepoint_section(c,det_mon->section.wp);
             break;
         case ADD_STD_TIMINGS:
             det_mon->type = DS_STD_TIMINGS;
@@ -577,19 +575,6 @@ get_monitor_ranges(Uchar *c, struct monitor_ranges *r)
 }
 
 static void
-get_whitepoint_section(Uchar *c, struct whitePoints *wp)
-{
-    wp[0].white_x = WHITEX1;
-    wp[0].white_y = WHITEY1;
-    wp[1].white_x = WHITEX2;
-    wp[1].white_y = WHITEY2;
-    wp[0].index  = WHITE_INDEX1;
-    wp[1].index  = WHITE_INDEX2;
-    wp[0].white_gamma  = WHITE_GAMMA1;
-    wp[1].white_gamma  = WHITE_GAMMA2;
-}
-
-static void
 get_detailed_timing_section(Uchar *c, struct detailed_timings *r)
 {
   r->clock = PIXEL_CLOCK;
diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index 1faae1e..adbb3fa 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -440,19 +440,6 @@ handle_detailed_print(struct detailed_monitor_section *det_mon,
 		    det_mon->section.std_t[j].refresh,
 		    det_mon->section.std_t[j].id);
         break;
-    case DS_WHITE_P:
-        for (j = 0; j<2; j++)
-        if (det_mon->section.wp[j].index != 0)
-            xf86DrvMsg(scrnIndex,X_INFO,
-                       "White point %i: whiteX: %f, whiteY: %f; gamma: %f\n",
-                       det_mon->section.wp[j].index,det_mon->section.wp[j].white_x,
-                       det_mon->section.wp[j].white_y,
-                       det_mon->section.wp[j].white_gamma);
-        break;
-    case DS_CMD:
-        xf86DrvMsg(scrnIndex, X_INFO,
-                   "Color management data: (not decoded)\n");
-        break;
     case DS_CVT:
         xf86DrvMsg(scrnIndex, X_INFO,
                    "CVT 3-byte-code modes:\n");
@@ -462,7 +449,6 @@ handle_detailed_print(struct detailed_monitor_section *det_mon,
         xf86DrvMsg(scrnIndex, X_INFO,
                    "Established timings III: (not decoded)\n");
         break;
-    case DS_DUMMY:
     default:
         break;
     }
-- 
1.7.6.4