1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
|
From 194e357faf3d7433ad4f1f2cf46f79d314ea5b38 Mon Sep 17 00:00:00 2001
From: Prabhu <prabhu.sundararaj@freescale.com>
Date: Wed, 29 Jul 2015 15:32:01 -0500
Subject: [PATCH] MGS-907: X11 EXA: Warnings causes GCC5.2 build to fail
VIV2DGPUSurfaceReAllocNonCached and imxRefreshModes were not
declared causing compiler warning.
Upstream Status: Pending
Date: July 29, 2015
Signed-off-by: Prabhu <prabhu.sundararaj@freescale.com>
---
EXA/src/vivante_extension/vivante_ext.c | 4 ++--
EXA/src/vivante_fbdev/imx_display.c | 4 +++-
EXA/src/vivante_fbdev/vivante_fbdev_driver.c | 2 ++
EXA/src/vivante_gal/vivante_gal.h | 1 +
EXA/src/vivante_gal/vivante_gal_surface.c | 3 ++-
EXA/src/vivante_gal/vivante_priv.h | 4 ++++
6 files changed, 14 insertions(+), 4 deletions(-)
mode change 100755 => 100644 EXA/src/vivante_extension/vivante_ext.c
mode change 100755 => 100644 EXA/src/vivante_gal/vivante_gal_surface.c
diff --git a/EXA/src/vivante_extension/vivante_ext.c b/EXA/src/vivante_extension/vivante_ext.c
old mode 100755
new mode 100644
index 4bcc5ba..0d1085b
--- a/EXA/src/vivante_extension/vivante_ext.c
+++ b/EXA/src/vivante_extension/vivante_ext.c
@@ -54,6 +54,7 @@
#include "vivante.h"
#include "vivante_priv.h"
#include "vivante_common.h"
+#include "imx_display.h"
static unsigned char VIVEXTReqCode = 0;
static int VIVEXTErrorBase;
@@ -162,8 +163,7 @@ static int ProcVIVEXTDrawableSetFlag(register ClientPtr client)
VivPtr pViv = VIVPTR_FROM_SCREEN(pScreen);
if(pViv)
{
- VIVGPUPtr gpuctx = (VIVGPUPtr) pViv->mGrCtx.mGpu;
- VIV2DGPUSurfaceReAllocNonCached(gpuctx, ppriv);
+ VIV2DGPUSurfaceReAllocNonCached(&pViv->mGrCtx, ppriv);
// set tiled if asked
if(stuff->flag & VIVPIXMAP_FLAG_SHARED_TILED)
{
diff --git a/EXA/src/vivante_fbdev/imx_display.c b/EXA/src/vivante_fbdev/imx_display.c
index 876d37e..8d4eaa0 100644
--- a/EXA/src/vivante_fbdev/imx_display.c
+++ b/EXA/src/vivante_fbdev/imx_display.c
@@ -27,6 +27,8 @@
#include <fcntl.h>
#include <errno.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
#include <linux/fb.h>
#include "xf86DDC.h"
@@ -83,7 +85,7 @@ GCD(int a, int b)
}
static int
-LCM(a, b)
+LCM(int a, int b)
{
return (a * b) / GCD(a, b);
}
diff --git a/EXA/src/vivante_fbdev/vivante_fbdev_driver.c b/EXA/src/vivante_fbdev/vivante_fbdev_driver.c
index ec407df..d35912a 100644
--- a/EXA/src/vivante_fbdev/vivante_fbdev_driver.c
+++ b/EXA/src/vivante_fbdev/vivante_fbdev_driver.c
@@ -29,8 +29,10 @@
#include "vivante.h"
#include "vivante_exa.h"
#include "vivante_ext.h"
+#include "vivante_dri.h"
#include "imx_display.h"
#include <errno.h>
+#include <sys/ioctl.h>
#include <linux/fb.h>
#include <xorg/shmint.h>
diff --git a/EXA/src/vivante_gal/vivante_gal.h b/EXA/src/vivante_gal/vivante_gal.h
index e186eda..332c773 100644
--- a/EXA/src/vivante_gal/vivante_gal.h
+++ b/EXA/src/vivante_gal/vivante_gal.h
@@ -260,6 +260,7 @@ extern "C" {
Bool VIV2DCacheOperation(GALINFOPTR galInfo, Viv2DPixmapPtr ppix, VIVFLUSHTYPE flush_type, int onLinearBuffer);
Bool VIV2DGPUUserMemMap(char* logical, unsigned int physical, unsigned int size, void ** mappingInfo, unsigned int * gpuAddress);
Bool VIV2DGPUUserMemUnMap(char* logical, unsigned int size, void * mappingInfo, unsigned int gpuAddress);
+ Bool VIV2DGPUSurfaceReAllocNonCached(GALINFOPTR galInfo, Viv2DPixmapPtr ppriv);
Bool MapUserMemToGPU(GALINFOPTR galInfo, MemMapInfoPtr mmInfo);
void UnmapUserMem(GALINFOPTR galInfo, MemMapInfoPtr mmInfo);
/************************************************************************
diff --git a/EXA/src/vivante_gal/vivante_gal_surface.c b/EXA/src/vivante_gal/vivante_gal_surface.c
old mode 100755
new mode 100644
index 036b61b..0234814
--- a/EXA/src/vivante_gal/vivante_gal_surface.c
+++ b/EXA/src/vivante_gal/vivante_gal_surface.c
@@ -673,7 +673,8 @@ static gctBOOL VIV2DGPUSurfaceAlloc(VIVGPUPtr gpuctx, gctUINT alignedWidth, gctU
return VIV2DGPUSurfaceAllocEx(gpuctx, alignedWidth, alignedHeight, bytesPerPixel, surface, getPixmapCachePolicy());
}
-gctBOOL VIV2DGPUSurfaceReAllocNonCached(VIVGPUPtr gpuctx, Viv2DPixmapPtr ppriv) {
+Bool VIV2DGPUSurfaceReAllocNonCached(GALINFOPTR galInfo, Viv2DPixmapPtr ppriv) {
+ VIVGPUPtr gpuctx = (VIVGPUPtr)galInfo->mGpu;
GenericSurfacePtr oldSurf = gcvNULL;
GenericSurfacePtr newSurf = gcvNULL;
gctUINT32 alignedWidth;
diff --git a/EXA/src/vivante_gal/vivante_priv.h b/EXA/src/vivante_gal/vivante_priv.h
index e8ee3d2..05f5748 100644
--- a/EXA/src/vivante_gal/vivante_priv.h
+++ b/EXA/src/vivante_gal/vivante_priv.h
@@ -29,6 +29,7 @@ extern "C" {
#include "HAL/gc_hal.h"
#include "HAL/gc_hal_raster.h"
#include "HAL/gc_hal_base.h"
+#include "vivante_debug.h"
/************************************************************************
* PIXMAP_HANDLING_STUFF(START)
@@ -97,6 +98,9 @@ extern "C" {
* DRIVER & DEVICE Structs (END)
*************************************************************************/
+ gctBOOL VIV2DGPUSurfaceAllocEx(VIVGPUPtr gpuctx, gctUINT alignedWidth, gctUINT alignedHeight,
+ gctUINT bytesPerPixel, GenericSurfacePtr * surface, enum PixmapCachePolicy cachePolicy);
+
#ifdef __cplusplus
}
#endif
--
1.8.4.5
|
