22115519 Transient changes required for implementing 15772728
authorhenryzh <henry.zhao@oracle.com>
Fri, 13 Nov 2015 19:55:58 -0800
changeset 1580 a9fa89e74bb6
parent 1579 6787ea263a3d
child 1581 82b6d15f27ff
22115519 Transient changes required for implementing 15772728
open-src/driver/xf86-video-ast/22115519.patch
open-src/driver/xf86-video-ast/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-ast/22115519.patch	Fri Nov 13 19:55:58 2015 -0800
@@ -0,0 +1,46 @@
+diff --git a/src/ast.h b/src/ast.h
+index 4cae16b..ea1eb5b 100644
+--- a/src/ast.h
++++ b/src/ast.h
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (c) 2005 ASPEED Technology Inc.
++ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved
+  *
+  * Permission to use, copy, modify, distribute, and sell this software and its
+  * documentation for any purpose is hereby granted without fee, provided that
+@@ -361,12 +362,6 @@ typedef struct  vis_pci_cfg {
+ #define VIS_SETIOREG                    (VIOC | 17)
+ #define VIS_GETIOREG                    (VIOC | 18)
+ 
+-#ifdef __sparc
+-#define ASTIOC                  ('Y' << 8)
+-#define AST_GET_INDEX          (ASTIOC | 14)
+-#define AST_SET_INDEX          (ASTIOC | 15)
+-#endif
+-
+ typedef struct vis_io_reg {
+         uchar_t         offset;
+         uchar_t         value;
+diff --git a/src/ast_vgatool.h b/src/ast_vgatool.h
+index ded26e3..71445f2 100644
+--- a/src/ast_vgatool.h
++++ b/src/ast_vgatool.h
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (c) 2005 ASPEED Technology Inc.
++ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved
+  *
+  * Permission to use, copy, modify, distribute, and sell this software and its
+  * documentation for any purpose is hereby granted without fee, provided that
+@@ -73,6 +74,10 @@ _GetRegFromFd(uchar_t off, int fd)
+        return io_reg.value;
+ }
+ 
++#define ASTIOC                  ('Y' << 8)
++#define AST_GET_INDEX          (ASTIOC | 14)
++#define AST_SET_INDEX          (ASTIOC | 15)
++
+ #define GetReg(off)            _GetRegFromFd(off, pAST->fd)
+ 
+ #define SetReg(off, val)       do {                                    \
--- a/open-src/driver/xf86-video-ast/Makefile	Wed Nov 04 13:41:17 2015 -0800
+++ b/open-src/driver/xf86-video-ast/Makefile	Fri Nov 13 19:55:58 2015 -0800
@@ -42,7 +42,8 @@
 		16448336.patch,-p1 \
 		16027951.patch,-p1 \
 		17907916.patch,-p1 \
-		20816358-disable-DP501.patch,-p1
+		20816358-disable-DP501.patch,-p1 \
+		22115519.patch,-p1
 
 # Link in additional source files from sun-src directory
 ADDITIONAL_SOURCE_DIR=sun-src