summaryrefslogtreecommitdiff
path: root/pcr/xf86-video-omapfb/0005-Attempt-to-fix-VRFB.patch
blob: d3c618a3bd28febbe010557256ab27e8794edbbc (plain)
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
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
From 85e4bdb8f375b343011d07e685a9cac9108f3734 Mon Sep 17 00:00:00 2001
From: Eino-Ville Talvala <talvala@stanford.edu>
Date: Tue, 23 Aug 2011 18:37:01 +0200
Subject: [PATCH 5/7] Attempt to fix VRFB

Upstream-Status: Pending

http://dominion.thruhere.net/git/cgit.cgi/xf86-video-omapfb/commit/?h=koen/fixups&id=6833fc9f795265e4943d248103fbaf3463b515d6

Signed-off-by: Sebastian Krzyszkowiak <dos@dosowisko.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 src/image-format-conversions.c |  4 +--
 src/image-format-conversions.h |  2 +-
 src/omapfb-driver.c            | 28 +++++++++++++---
 src/omapfb-xv-blizzard.c       |  1 +
 src/omapfb-xv-generic.c        | 72 +++++++++++++++++++++++++++++++++---------
 src/omapfb-xv.c                |  3 ++
 6 files changed, 88 insertions(+), 22 deletions(-)

diff --git a/src/image-format-conversions.c b/src/image-format-conversions.c
index dcefa9b..d43427d 100644
--- a/src/image-format-conversions.c
+++ b/src/image-format-conversions.c
@@ -38,13 +38,13 @@
 #include "image-format-conversions.h"
 
 /* Basic line-based copy for packed formats */
-void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest)
+void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest)
 {
 	int i;
 	int len = w * 2;
 	for (i = 0; i < h; i++)
 	{
-		memcpy(dest + i * len, src + i * stride, len);
+		memcpy(dest + i * dst_stride, src + i * src_stride, len);
 	}
 }
 
diff --git a/src/image-format-conversions.h b/src/image-format-conversions.h
index 584896a..ba7caf2 100644
--- a/src/image-format-conversions.h
+++ b/src/image-format-conversions.h
@@ -27,7 +27,7 @@
 #include <stdint.h>
 
 /* Basic line-based copy for packed formats */
-void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest);
+void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest);
 
 /* Basic C implementation of YV12/I420 to UYVY conversion */
 void uv12_to_uyvy(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest);
diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c
index 48aa09c..07989f5 100644
--- a/src/omapfb-driver.c
+++ b/src/omapfb-driver.c
@@ -66,6 +66,7 @@
 #define OMAPFB_VERSION 1000
 #define OMAPFB_DRIVER_NAME "OMAPFB"
 #define OMAPFB_NAME "omapfb"
+#define ENFORCE_MODES
 
 static Bool OMAPFBProbe(DriverPtr drv, int flags);
 static Bool OMAPFBPreInit(ScrnInfoPtr pScrn, int flags);
@@ -105,11 +106,13 @@ static SymTabRec OMAPFBChipsets[] = {
 typedef enum {
 	OPTION_ACCELMETHOD,
 	OPTION_FB,
+	OPTION_ROTATE,
 } FBDevOpts;
 
 static const OptionInfoRec OMAPFBOptions[] = {
 	{ OPTION_ACCELMETHOD,	"AccelMethod",	OPTV_STRING,	{0},	FALSE },
 	{ OPTION_FB,		"fb",		OPTV_STRING,	{0},	FALSE },
+	{ OPTION_ROTATE,	"rotation",	OPTV_STRING,	{0},	FALSE },
 	{ -1,			NULL,		OPTV_NONE,	{0},	FALSE }
 };
 
@@ -286,6 +289,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags)
 {
 	OMAPFBPtr ofb;
 	EntityInfoPtr pEnt;
+	char *rotate;
 	rgb zeros = { 0, 0, 0 };
 	struct stat st;
 
@@ -379,6 +383,8 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags)
 	pScrn->progClock = TRUE;
 	pScrn->chipset   = "omapfb";
 	
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Rotate test version 0.02\n");
+	
 	/* Start with configured virtual size */
 	pScrn->virtualX = pScrn->display->virtualX;
 	pScrn->virtualY = pScrn->display->virtualY;
@@ -496,12 +502,21 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	ofb->CloseScreen = pScreen->CloseScreen;
 	pScreen->CloseScreen = OMAPFBCloseScreen;
 
+	/* Enforce the default mode (this is silly I guess) */
+#ifdef ENFORCE_MODES
+	//xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Enforcing modes\n");
+	//set_mode(ofb, &ofb->default_mode);
+	//pScrn->displayWidth = ofb->fixed_info.line_length /
+	//  (ofb->state_info.bits_per_pixel>>3); //ofb->state_info.xres;
+#endif
+
 	/* Map our framebuffer memory */
+	ofb->mem_info.size = ofb->fixed_info.line_length * ofb->state_info.yres;
 	ofb->fb = mmap (NULL, ofb->mem_info.size,
 	                PROT_READ | PROT_WRITE, MAP_SHARED,
 	                ofb->fd, 0);
-	if (ofb->fb == NULL) {
-		xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed\n");
+	if (ofb->fb == MAP_FAILED) {
+		xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size);
 		return FALSE;
 	}
 
@@ -578,8 +593,13 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	} else if (!ofb->dss) {
 
 		ofb->plane_info.enabled = 1;
-		ofb->plane_info.out_width = ofb->state_info.xres;
-		ofb->plane_info.out_height = ofb->state_info.yres;
+		if (ofb->state_info.rotate == 0 || ofb->state_info.rotate == 2) {
+			ofb->plane_info.out_width = ofb->state_info.xres;
+			ofb->plane_info.out_height = ofb->state_info.yres;
+		} else {
+			ofb->plane_info.out_width = ofb->state_info.yres;
+			ofb->plane_info.out_height = ofb->state_info.xres;
+		}
 
 		if (ioctl (ofb->fd, OMAPFB_SETUP_PLANE, &ofb->plane_info)) {
 			xf86DrvMsg(scrnIndex, X_ERROR,
diff --git a/src/omapfb-xv-blizzard.c b/src/omapfb-xv-blizzard.c
index 406ffc6..b71d2aa 100644
--- a/src/omapfb-xv-blizzard.c
+++ b/src/omapfb-xv-blizzard.c
@@ -220,6 +220,7 @@ int OMAPFBXVPutImageBlizzard (ScrnInfoPtr pScrn,
 			packed_line_copy(src_w & ~3,
 			                 src_h & ~3,
 			                 ((src_w + 1) & ~1) * 2,
+					 ofb->port->fixed_info.line_length,
 			                 (uint8_t*)buf,
 			                 (uint8_t*)ofb->port->fb);
 			break;
diff --git a/src/omapfb-xv-generic.c b/src/omapfb-xv-generic.c
index e6f89fe..b33f344 100644
--- a/src/omapfb-xv-generic.c
+++ b/src/omapfb-xv-generic.c
@@ -62,7 +62,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn)
 {
 	OMAPFBPtr ofb = OMAPFB(pScrn);
 
-	/* The memory size is already set in OMAPFBXVQueryImageAttributes */
+	/* The memory size is already set before we get here */
 	if (ioctl(ofb->port->fd, OMAPFB_SETUP_MEM, &ofb->port->mem_info) != 0) {
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		           "Failed to allocate video plane memory\n");
@@ -73,19 +73,20 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn)
 	ofb->port->fb = mmap (NULL, ofb->port->mem_info.size,
 	                PROT_READ | PROT_WRITE, MAP_SHARED,
 	                ofb->port->fd, 0);
-	if (ofb->port->fb == NULL) {
+	if (ofb->port->fb == MAP_FAILED) {
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		           "Mapping video memory failed\n");
 		return XvBadAlloc;
 	}
 
 	/* Update the state info */
+	/* Let's not - it's bad
 	if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info))
 	{
 		xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
 		return XvBadAlloc;
 	}
-
+	*/
 	return Success;
 }
 
@@ -93,6 +94,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn)
 int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn)
 {
 	OMAPFBPtr ofb = OMAPFB(pScrn);
+	int ret;
 
 	if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info))
 	{
@@ -104,6 +106,31 @@ int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn)
 		xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
 		return XvBadAlloc;
 	}
+	/* Changing rotation/nonstd flags can change the fixed info! */
+	if (ioctl (ofb->port->fd, FBIOGET_FSCREENINFO, &ofb->port->fixed_info))
+	{
+		xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
+		return XvBadAlloc;
+	}
+	/* Correct fixed info requires recalculation of needed memory */
+	ofb->port->mem_info.size = ofb->port->fixed_info.line_length * ofb->port->state_info.yres;
+
+	/* Allocate buffer memory */
+	ret = OMAPXVAllocPlane(pScrn);
+	if (ret != Success)
+		return ret;
+
+	/* Workaround for reset of mode after memory allo */
+	if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info))
+	{
+		xf86Msg(X_ERROR, "%s: setting state info failed\n", __FUNCTION__);
+		return XvBadAlloc;
+	}
+	if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info))
+	{
+		xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
+		return XvBadAlloc;
+	}
 
 	if(ioctl(ofb->port->fd, OMAPFB_SETUP_PLANE,
 	   &ofb->port->plane_info) != 0) {
@@ -124,6 +151,8 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
                              DrawablePtr pDraw)
 {
 	OMAPFBPtr ofb = OMAPFB(pScrn);
+	short drw_temp;
+	short rot_xres, rot_yres;
 
 	if (!ofb->port->plane_info.enabled
 	 || ofb->port->update_window.x != src_x
@@ -163,13 +192,6 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
 			return Success;
 		}
 
-		/* If we don't have the plane running, enable it */
-		if (!ofb->port->plane_info.enabled) {
-			ret = OMAPXVAllocPlane(pScrn);
-			if (ret != Success)
-				return ret;
-		}
-
 		/* Set up the state info, xres and yres will be used for
 		 * scaling to the values in the plane info struct
 		 */
@@ -179,12 +201,31 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
 		ofb->port->state_info.yres_virtual = 0;
 		ofb->port->state_info.xoffset = 0;
 		ofb->port->state_info.yoffset = 0;
-		ofb->port->state_info.rotate = 0;
+		//ofb->port->state_info.rotate = 0;
 		ofb->port->state_info.grayscale = 0;
 		ofb->port->state_info.activate = FB_ACTIVATE_NOW;
 		ofb->port->state_info.bits_per_pixel = 0;
 		ofb->port->state_info.nonstd = xv_to_omapfb_format(image);
 
+		/* Plane info does not rotate with state_info */
+		if (ofb->port->state_info.rotate == 1 ||
+		  ofb->port->state_info.rotate == 3) {
+			drw_temp = drw_x;
+			drw_x = drw_y;
+			drw_y = drw_temp;
+
+			drw_temp = drw_w;
+			drw_w = drw_h;
+			drw_h = drw_temp;
+
+			rot_xres = ofb->port->state_info.yres;
+			rot_yres = ofb->port->state_info.xres;
+		} else {
+			rot_xres = ofb->port->state_info.xres;
+			rot_yres = ofb->port->state_info.yres;
+		}
+
+
 		/* Set up the video plane info */
 		ofb->port->plane_info.enabled = 1;
 		ofb->port->plane_info.pos_x = drw_x;
@@ -193,13 +234,13 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
 		ofb->port->plane_info.out_height = drw_h & ~15;
 
 		/* Cap output to screen size */
-		if (ofb->port->plane_info.out_width > ofb->state_info.xres) {
+		if (ofb->port->plane_info.out_width > rot_xres) {
 			ofb->port->plane_info.pos_x = 0;
-			ofb->port->plane_info.out_width = ofb->state_info.xres;
+			ofb->port->plane_info.out_width = rot_xres;
 		}
-		if (ofb->port->plane_info.out_height > ofb->state_info.yres) {
+		if (ofb->port->plane_info.out_height > rot_yres) {
 			ofb->port->plane_info.pos_y = 0;
-			ofb->port->plane_info.out_height = ofb->state_info.yres;
+			ofb->port->plane_info.out_height = rot_yres;
 		}
 
 		ret = OMAPXVSetupVideoPlane(pScrn);
@@ -223,6 +264,7 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
 			packed_line_copy(src_w & ~15,
 			                 src_h & ~15,
 			                 ((src_w + 1) & ~1) * 2,
+			                 ofb->port->fixed_info.line_length,
 			                 (uint8_t*)buf,
 			                 (uint8_t*)ofb->port->fb);
 			break;
diff --git a/src/omapfb-xv.c b/src/omapfb-xv.c
index 1df651e..0fee2c6 100644
--- a/src/omapfb-xv.c
+++ b/src/omapfb-xv.c
@@ -169,8 +169,11 @@ static int OMAPFBXVQueryImageAttributes (ScrnInfoPtr pScrn,
 	h = *height;
 
 	w = (w + 1) & ~1;
+
+	/* Can't calculate these here - don't know line length
 	ofb->port->mem_info.size = w << 1;
 	ofb->port->mem_info.size *= h;
+	*/
 
 	return size;
 }
-- 
2.3.0