Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 31de59d5e1cd6968ea9d1a19cceefb7a037e46bf

Authored by Florian Tobias Schandinat
Committed by Linus Torvalds
1 parent 2d6e8851f6
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

viafb: hardware acceleration initialization cleanup 

The main motivation of this patch was to merge the three initialization
functions in one and clean it up. However as some changes in other code
areas where needed to do it right some small other changes were made.

Changes to viafb_par:

io_virt renamed as engine_mmio and moved to shared
VQ_start renamed as vq_vram_addr and moved to shared
VQ_end removed as it is easily recalculatable

vq_vram_addr is not strictly needed but keep it to track where we
allocated video memory.  The memory allocated for the virtual queue was
shrunk to VQ_SIZE as VQ_SIZE+CURSOR_SIZE looked like a bug to me.  But to
be honest I don't have the faintest idea what virtual queues are for in
the graphic hardware and whether the driver needs them in any way.  I only
know that they aren't directly accessed by the driver and so the only
potential current use would be as hardware internal buffers.  For now keep
them to avoid regressions and only remove the double cursor allocation.

The most changes were caused by renames and the mentioned structure
changes so the chance of regressions is pretty low.  The meaning of
viafb_accel changed slightly as previously it was changed back and forth
in the code and allowed to enable the hardware acceleration by software if
previously disabled.  The new behaviour is that viafb_accel=0 always
prevents hardware acceleration.  With viafb_accel!=0 the acceleration can
be freely choosen by set_var.  This means viafb_accel is a diagnostic tool
and if someone has to use viafb_accel=0 the driver needs to be fixed.

As this is mostly a code cleanup no regressions beside the slightly change
of viafb_accel is expected.

Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Scott Fang <ScottFang@viatech.com.cn>
Cc: Joseph Chan <JosephChan@via.com.tw>
Cc: Harald Welte <laforge@gnumonks.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 6 changed files with 148 additions and 217 deletions Side-by-side Diff

drivers/video/via/accel.c
Diff comments   View file @ 31de59d
... ... @@ -308,9 +308,22 @@
308 308 return 0;
309 309 }
310 310  
311   -void viafb_init_accel(struct viafb_shared *shared)
  311 +int viafb_init_engine(struct fb_info *info)
312 312 {
313   - switch (shared->chip_info.gfx_chip_name) {
  313 + struct viafb_par *viapar = info->par;
  314 + void __iomem *engine;
  315 + u32 vq_start_addr, vq_end_addr, vq_start_low, vq_end_low, vq_high,
  316 + vq_len, chip_name = viapar->shared->chip_info.gfx_chip_name;
  317 +
  318 + engine = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);
  319 + viapar->shared->engine_mmio = engine;
  320 + if (!engine) {
  321 + printk(KERN_WARNING "viafb_init_accel: ioremap failed, "
  322 + "hardware acceleration disabled\n");
  323 + return -ENOMEM;
  324 + }
  325 +
  326 + switch (chip_name) {
314 327 case UNICHROME_CLE266:
315 328 case UNICHROME_K400:
316 329 case UNICHROME_K800:
317 330  
318 331  
319 332  
320 333  
321 334  
322 335  
323 336  
324 337  
325 338  
326 339  
327 340  
328 341  
329 342  
330 343  
331 344  
332 345  
333 346  
334 347  
335 348  
... ... @@ -321,186 +334,115 @@
321 334 case UNICHROME_K8M890:
322 335 case UNICHROME_P4M890:
323 336 case UNICHROME_P4M900:
324   - shared->hw_bitblt = hw_bitblt_1;
  337 + viapar->shared->hw_bitblt = hw_bitblt_1;
325 338 break;
326 339 case UNICHROME_VX800:
327   - shared->hw_bitblt = hw_bitblt_2;
  340 + viapar->shared->hw_bitblt = hw_bitblt_2;
328 341 break;
329 342 default:
330   - shared->hw_bitblt = NULL;
  343 + viapar->shared->hw_bitblt = NULL;
331 344 }
332 345  
333   - viaparinfo->fbmem_free -= CURSOR_SIZE;
334   - shared->cursor_vram_addr = viaparinfo->fbmem_free;
335   - viaparinfo->fbmem_used += CURSOR_SIZE;
  346 + viapar->fbmem_free -= CURSOR_SIZE;
  347 + viapar->shared->cursor_vram_addr = viapar->fbmem_free;
  348 + viapar->fbmem_used += CURSOR_SIZE;
336 349  
337   - /* Reverse 8*1024 memory space for cursor image */
338   - viaparinfo->fbmem_free -= (CURSOR_SIZE + VQ_SIZE);
339   - viaparinfo->VQ_start = viaparinfo->fbmem_free;
340   - viaparinfo->VQ_end = viaparinfo->VQ_start + VQ_SIZE - 1;
341   - viaparinfo->fbmem_used += (CURSOR_SIZE + VQ_SIZE);
342   -}
  350 + viapar->fbmem_free -= VQ_SIZE;
  351 + viapar->shared->vq_vram_addr = viapar->fbmem_free;
  352 + viapar->fbmem_used += VQ_SIZE;
343 353  
344   -void viafb_init_2d_engine(void)
345   -{
346   - u32 dwVQStartAddr, dwVQEndAddr;
347   - u32 dwVQLen, dwVQStartL, dwVQEndL, dwVQStartEndH;
348   -
349 354 /* Init AGP and VQ regs */
350   - switch (viaparinfo->chip_info->gfx_chip_name) {
  355 + switch (chip_name) {
351 356 case UNICHROME_K8M890:
352 357 case UNICHROME_P4M900:
353   - writel(0x00100000, viaparinfo->io_virt + VIA_REG_CR_TRANSET);
354   - writel(0x680A0000, viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
355   - writel(0x02000000, viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
  358 + writel(0x00100000, engine + VIA_REG_CR_TRANSET);
  359 + writel(0x680A0000, engine + VIA_REG_CR_TRANSPACE);
  360 + writel(0x02000000, engine + VIA_REG_CR_TRANSPACE);
356 361 break;
357 362  
358 363 default:
359   - writel(0x00100000, viaparinfo->io_virt + VIA_REG_TRANSET);
360   - writel(0x00000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
361   - writel(0x00333004, viaparinfo->io_virt + VIA_REG_TRANSPACE);
362   - writel(0x60000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
363   - writel(0x61000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
364   - writel(0x62000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
365   - writel(0x63000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
366   - writel(0x64000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
367   - writel(0x7D000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
  364 + writel(0x00100000, engine + VIA_REG_TRANSET);
  365 + writel(0x00000000, engine + VIA_REG_TRANSPACE);
  366 + writel(0x00333004, engine + VIA_REG_TRANSPACE);
  367 + writel(0x60000000, engine + VIA_REG_TRANSPACE);
  368 + writel(0x61000000, engine + VIA_REG_TRANSPACE);
  369 + writel(0x62000000, engine + VIA_REG_TRANSPACE);
  370 + writel(0x63000000, engine + VIA_REG_TRANSPACE);
  371 + writel(0x64000000, engine + VIA_REG_TRANSPACE);
  372 + writel(0x7D000000, engine + VIA_REG_TRANSPACE);
368 373  
369   - writel(0xFE020000, viaparinfo->io_virt + VIA_REG_TRANSET);
370   - writel(0x00000000, viaparinfo->io_virt + VIA_REG_TRANSPACE);
  374 + writel(0xFE020000, engine + VIA_REG_TRANSET);
  375 + writel(0x00000000, engine + VIA_REG_TRANSPACE);
371 376 break;
372 377 }
373   - if (viaparinfo->VQ_start != 0) {
374   - /* Enable VQ */
375   - dwVQStartAddr = viaparinfo->VQ_start;
376   - dwVQEndAddr = viaparinfo->VQ_end;
377 378  
378   - dwVQStartL = 0x50000000 | (dwVQStartAddr & 0xFFFFFF);
379   - dwVQEndL = 0x51000000 | (dwVQEndAddr & 0xFFFFFF);
380   - dwVQStartEndH = 0x52000000 |
381   - ((dwVQStartAddr & 0xFF000000) >> 24) |
382   - ((dwVQEndAddr & 0xFF000000) >> 16);
383   - dwVQLen = 0x53000000 | (VQ_SIZE >> 3);
384   - switch (viaparinfo->chip_info->gfx_chip_name) {
385   - case UNICHROME_K8M890:
386   - case UNICHROME_P4M900:
387   - dwVQStartL |= 0x20000000;
388   - dwVQEndL |= 0x20000000;
389   - dwVQStartEndH |= 0x20000000;
390   - dwVQLen |= 0x20000000;
391   - break;
392   - default:
393   - break;
394   - }
  379 + /* Enable VQ */
  380 + vq_start_addr = viapar->shared->vq_vram_addr;
  381 + vq_end_addr = viapar->shared->vq_vram_addr + VQ_SIZE - 1;
395 382  
396   - switch (viaparinfo->chip_info->gfx_chip_name) {
397   - case UNICHROME_K8M890:
398   - case UNICHROME_P4M900:
399   - writel(0x00100000,
400   - viaparinfo->io_virt + VIA_REG_CR_TRANSET);
401   - writel(dwVQStartEndH,
402   - viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
403   - writel(dwVQStartL,
404   - viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
405   - writel(dwVQEndL,
406   - viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
407   - writel(dwVQLen,
408   - viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
409   - writel(0x74301001,
410   - viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
411   - writel(0x00000000,
412   - viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
413   - break;
414   - default:
415   - writel(0x00FE0000,
416   - viaparinfo->io_virt + VIA_REG_TRANSET);
417   - writel(0x080003FE,
418   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
419   - writel(0x0A00027C,
420   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
421   - writel(0x0B000260,
422   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
423   - writel(0x0C000274,
424   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
425   - writel(0x0D000264,
426   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
427   - writel(0x0E000000,
428   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
429   - writel(0x0F000020,
430   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
431   - writel(0x1000027E,
432   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
433   - writel(0x110002FE,
434   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
435   - writel(0x200F0060,
436   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
  383 + vq_start_low = 0x50000000 | (vq_start_addr & 0xFFFFFF);
  384 + vq_end_low = 0x51000000 | (vq_end_addr & 0xFFFFFF);
  385 + vq_high = 0x52000000 | ((vq_start_addr & 0xFF000000) >> 24) |
  386 + ((vq_end_addr & 0xFF000000) >> 16);
  387 + vq_len = 0x53000000 | (VQ_SIZE >> 3);
437 388  
438   - writel(0x00000006,
439   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
440   - writel(0x40008C0F,
441   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
442   - writel(0x44000000,
443   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
444   - writel(0x45080C04,
445   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
446   - writel(0x46800408,
447   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
  389 + switch (chip_name) {
  390 + case UNICHROME_K8M890:
  391 + case UNICHROME_P4M900:
  392 + vq_start_low |= 0x20000000;
  393 + vq_end_low |= 0x20000000;
  394 + vq_high |= 0x20000000;
  395 + vq_len |= 0x20000000;
448 396  
449   - writel(dwVQStartEndH,
450   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
451   - writel(dwVQStartL,
452   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
453   - writel(dwVQEndL,
454   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
455   - writel(dwVQLen,
456   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
457   - break;
458   - }
459   - } else {
460   - /* Disable VQ */
461   - switch (viaparinfo->chip_info->gfx_chip_name) {
462   - case UNICHROME_K8M890:
463   - case UNICHROME_P4M900:
464   - writel(0x00100000,
465   - viaparinfo->io_virt + VIA_REG_CR_TRANSET);
466   - writel(0x74301000,
467   - viaparinfo->io_virt + VIA_REG_CR_TRANSPACE);
468   - break;
469   - default:
470   - writel(0x00FE0000,
471   - viaparinfo->io_virt + VIA_REG_TRANSET);
472   - writel(0x00000004,
473   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
474   - writel(0x40008C0F,
475   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
476   - writel(0x44000000,
477   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
478   - writel(0x45080C04,
479   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
480   - writel(0x46800408,
481   - viaparinfo->io_virt + VIA_REG_TRANSPACE);
482   - break;
483   - }
  397 + writel(0x00100000, engine + VIA_REG_CR_TRANSET);
  398 + writel(vq_high, engine + VIA_REG_CR_TRANSPACE);
  399 + writel(vq_start_low, engine + VIA_REG_CR_TRANSPACE);
  400 + writel(vq_end_low, engine + VIA_REG_CR_TRANSPACE);
  401 + writel(vq_len, engine + VIA_REG_CR_TRANSPACE);
  402 + writel(0x74301001, engine + VIA_REG_CR_TRANSPACE);
  403 + writel(0x00000000, engine + VIA_REG_CR_TRANSPACE);
  404 + break;
  405 + default:
  406 + writel(0x00FE0000, engine + VIA_REG_TRANSET);
  407 + writel(0x080003FE, engine + VIA_REG_TRANSPACE);
  408 + writel(0x0A00027C, engine + VIA_REG_TRANSPACE);
  409 + writel(0x0B000260, engine + VIA_REG_TRANSPACE);
  410 + writel(0x0C000274, engine + VIA_REG_TRANSPACE);
  411 + writel(0x0D000264, engine + VIA_REG_TRANSPACE);
  412 + writel(0x0E000000, engine + VIA_REG_TRANSPACE);
  413 + writel(0x0F000020, engine + VIA_REG_TRANSPACE);
  414 + writel(0x1000027E, engine + VIA_REG_TRANSPACE);
  415 + writel(0x110002FE, engine + VIA_REG_TRANSPACE);
  416 + writel(0x200F0060, engine + VIA_REG_TRANSPACE);
  417 +
  418 + writel(0x00000006, engine + VIA_REG_TRANSPACE);
  419 + writel(0x40008C0F, engine + VIA_REG_TRANSPACE);
  420 + writel(0x44000000, engine + VIA_REG_TRANSPACE);
  421 + writel(0x45080C04, engine + VIA_REG_TRANSPACE);
  422 + writel(0x46800408, engine + VIA_REG_TRANSPACE);
  423 +
  424 + writel(vq_high, engine + VIA_REG_TRANSPACE);
  425 + writel(vq_start_low, engine + VIA_REG_TRANSPACE);
  426 + writel(vq_end_low, engine + VIA_REG_TRANSPACE);
  427 + writel(vq_len, engine + VIA_REG_TRANSPACE);
  428 + break;
484 429 }
485   -}
486 430  
487   -void viafb_hw_cursor_init(void)
488   -{
489 431 /* Set Cursor Image Base Address */
490   - writel(viaparinfo->shared->cursor_vram_addr,
491   - viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
492   - writel(0x0, viaparinfo->io_virt + VIA_REG_CURSOR_POS);
493   - writel(0x0, viaparinfo->io_virt + VIA_REG_CURSOR_ORG);
494   - writel(0x0, viaparinfo->io_virt + VIA_REG_CURSOR_BG);
495   - writel(0x0, viaparinfo->io_virt + VIA_REG_CURSOR_FG);
  432 + writel(viapar->shared->cursor_vram_addr, engine + VIA_REG_CURSOR_MODE);
  433 + writel(0x0, engine + VIA_REG_CURSOR_POS);
  434 + writel(0x0, engine + VIA_REG_CURSOR_ORG);
  435 + writel(0x0, engine + VIA_REG_CURSOR_BG);
  436 + writel(0x0, engine + VIA_REG_CURSOR_FG);
  437 + return 0;
496 438 }
497 439  
498 440 void viafb_show_hw_cursor(struct fb_info *info, int Status)
499 441 {
500   - u32 temp;
501   - u32 iga_path = ((struct viafb_par *)(info->par))->iga_path;
  442 + struct viafb_par *viapar = info->par;
  443 + u32 temp, iga_path = viapar->iga_path;
502 444  
503   - temp = readl(viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
  445 + temp = readl(viapar->shared->engine_mmio + VIA_REG_CURSOR_MODE);
504 446 switch (Status) {
505 447 case HW_Cursor_ON:
506 448 temp |= 0x1;
507 449  
508 450  
509 451  
510 452  
511 453  
... ... @@ -517,26 +459,28 @@
517 459 default:
518 460 temp &= 0x7FFFFFFF;
519 461 }
520   - writel(temp, viaparinfo->io_virt + VIA_REG_CURSOR_MODE);
  462 + writel(temp, viapar->shared->engine_mmio + VIA_REG_CURSOR_MODE);
521 463 }
522 464  
523   -int viafb_wait_engine_idle(void)
  465 +void viafb_wait_engine_idle(struct fb_info *info)
524 466 {
  467 + struct viafb_par *viapar = info->par;
525 468 int loop = 0;
526 469  
527   - while (!(readl(viaparinfo->io_virt + VIA_REG_STATUS) &
  470 + while (!(readl(viapar->shared->engine_mmio + VIA_REG_STATUS) &
528 471 VIA_VR_QUEUE_BUSY) && (loop < MAXLOOP)) {
529 472 loop++;
530 473 cpu_relax();
531 474 }
532 475  
533   - while ((readl(viaparinfo->io_virt + VIA_REG_STATUS) &
  476 + while ((readl(viapar->shared->engine_mmio + VIA_REG_STATUS) &
534 477 (VIA_CMD_RGTR_BUSY | VIA_2D_ENG_BUSY | VIA_3D_ENG_BUSY)) &&
535 478 (loop < MAXLOOP)) {
536 479 loop++;
537 480 cpu_relax();
538 481 }
539 482  
540   - return loop >= MAXLOOP;
  483 + if (loop >= MAXLOOP)
  484 + printk(KERN_ERR "viafb_wait_engine_idle: not syncing\n");
541 485 }
drivers/video/via/accel.h
Diff comments   View file @ 31de59d
... ... @@ -163,11 +163,9 @@
163 163 #define VIA_BITBLT_MONO 2
164 164 #define VIA_BITBLT_FILL 3
165 165  
166   -void viafb_init_accel(struct viafb_shared *shared);
167   -void viafb_init_2d_engine(void);
168   -void viafb_hw_cursor_init(void);
169   -void viafb_show_hw_cursor(struct fb_info *info, int Status); int
170   -viafb_wait_engine_idle(void); void viafb_set_2d_color_depth(int bpp);
  166 +int viafb_init_engine(struct fb_info *info);
  167 +void viafb_show_hw_cursor(struct fb_info *info, int Status);
  168 +void viafb_wait_engine_idle(struct fb_info *info);
171 169  
172 170 #endif /* __ACCEL_H__ */
drivers/video/via/global.c
Diff comments   View file @ 31de59d
... ... @@ -32,7 +32,6 @@
32 32 int viafb_lcd_mode = LCD_OPENLDI;
33 33 int viafb_bpp = 32;
34 34 int viafb_bpp1 = 32;
35   -int viafb_accel = 1;
36 35 int viafb_CRT_ON = 1;
37 36 int viafb_DVI_ON;
38 37 int viafb_LCD_ON ;
drivers/video/via/hw.h
Diff comments   View file @ 31de59d
... ... @@ -855,7 +855,6 @@
855 855 extern int viafb_LCD2_ON;
856 856 extern int viafb_LCD_ON;
857 857 extern int viafb_DVI_ON;
858   -extern int viafb_accel;
859 858 extern int viafb_hotplug;
860 859  
861 860 void viafb_write_reg_mask(u8 index, int io_port, u8 data, u8 mask);
drivers/video/via/viafbdev.c
Diff comments   View file @ 31de59d
... ... @@ -33,6 +33,8 @@
33 33 static char *viafb_mode = "640x480";
34 34 static char *viafb_mode1 = "640x480";
35 35  
  36 +static int viafb_accel = 1;
  37 +
36 38 /* Added for specifying active devices.*/
37 39 char *viafb_active_dev = "";
38 40  
... ... @@ -140,6 +142,9 @@
140 142  
141 143 /* Adjust var according to our driver's own table */
142 144 viafb_fill_var_timing_info(var, viafb_refresh, vmode_index);
  145 + if (info->var.accel_flags & FB_ACCELF_TEXT &&
  146 + !ppar->shared->engine_mmio)
  147 + info->var.accel_flags = 0;
143 148  
144 149 return 0;
145 150 }
... ... @@ -177,8 +182,10 @@
177 182  
178 183 viafb_update_fix(info);
179 184 viafb_bpp = info->var.bits_per_pixel;
180   - /* Update viafb_accel, it is necessary to our 2D accelerate */
181   - viafb_accel = info->var.accel_flags;
  185 + if (info->var.accel_flags & FB_ACCELF_TEXT)
  186 + info->flags &= ~FBINFO_HWACCEL_DISABLED;
  187 + else
  188 + info->flags |= FBINFO_HWACCEL_DISABLED;
182 189 }
183 190  
184 191 return 0;
185 192  
... ... @@ -764,10 +771,11 @@
764 771 const struct fb_fillrect *rect)
765 772 {
766 773 struct viafb_par *viapar = info->par;
  774 + struct viafb_shared *shared = viapar->shared;
767 775 u32 fg_color;
768 776 u8 rop;
769 777  
770   - if (!viapar->shared->hw_bitblt) {
  778 + if (info->flags & FBINFO_HWACCEL_DISABLED || !shared->hw_bitblt) {
771 779 cfb_fillrect(info, rect);
772 780 return;
773 781 }
... ... @@ -786,7 +794,7 @@
786 794 rop = 0xF0;
787 795  
788 796 DEBUG_MSG(KERN_DEBUG "viafb 2D engine: fillrect\n");
789   - if (viapar->shared->hw_bitblt(viapar->io_virt, VIA_BITBLT_FILL,
  797 + if (shared->hw_bitblt(shared->engine_mmio, VIA_BITBLT_FILL,
790 798 rect->width, rect->height, info->var.bits_per_pixel,
791 799 viapar->vram_addr, info->fix.line_length, rect->dx, rect->dy,
792 800 NULL, 0, 0, 0, 0, fg_color, 0, rop))
793 801  
... ... @@ -797,8 +805,9 @@
797 805 const struct fb_copyarea *area)
798 806 {
799 807 struct viafb_par *viapar = info->par;
  808 + struct viafb_shared *shared = viapar->shared;
800 809  
801   - if (!viapar->shared->hw_bitblt) {
  810 + if (info->flags & FBINFO_HWACCEL_DISABLED || !shared->hw_bitblt) {
802 811 cfb_copyarea(info, area);
803 812 return;
804 813 }
... ... @@ -807,7 +816,7 @@
807 816 return;
808 817  
809 818 DEBUG_MSG(KERN_DEBUG "viafb 2D engine: copyarea\n");
810   - if (viapar->shared->hw_bitblt(viapar->io_virt, VIA_BITBLT_COLOR,
  819 + if (shared->hw_bitblt(shared->engine_mmio, VIA_BITBLT_COLOR,
811 820 area->width, area->height, info->var.bits_per_pixel,
812 821 viapar->vram_addr, info->fix.line_length, area->dx, area->dy,
813 822 NULL, viapar->vram_addr, info->fix.line_length,
814 823  
... ... @@ -819,10 +828,11 @@
819 828 const struct fb_image *image)
820 829 {
821 830 struct viafb_par *viapar = info->par;
  831 + struct viafb_shared *shared = viapar->shared;
822 832 u32 fg_color = 0, bg_color = 0;
823 833 u8 op;
824 834  
825   - if (!viapar->shared->hw_bitblt ||
  835 + if (info->flags & FBINFO_HWACCEL_DISABLED || !shared->hw_bitblt ||
826 836 (image->depth != 1 && image->depth != viapar->depth)) {
827 837 cfb_imageblit(info, image);
828 838 return;
... ... @@ -843,7 +853,7 @@
843 853 op = VIA_BITBLT_COLOR;
844 854  
845 855 DEBUG_MSG(KERN_DEBUG "viafb 2D engine: imageblit\n");
846   - if (viapar->shared->hw_bitblt(viapar->io_virt, op,
  856 + if (shared->hw_bitblt(shared->engine_mmio, op,
847 857 image->width, image->height, info->var.bits_per_pixel,
848 858 viapar->vram_addr, info->fix.line_length, image->dx, image->dy,
849 859 (u32 *)image->data, 0, 0, 0, 0, fg_color, bg_color, 0))
... ... @@ -853,6 +863,7 @@
853 863 static int viafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
854 864 {
855 865 struct viafb_par *viapar = info->par;
  866 + void __iomem *engine = viapar->shared->engine_mmio;
856 867 u32 temp, xx, yy, bg_color = 0, fg_color = 0,
857 868 chip_name = viapar->shared->chip_info.gfx_chip_name;
858 869 int i, j = 0, cur_size = 64;
... ... @@ -867,7 +878,7 @@
867 878  
868 879 if (cursor->set & FB_CUR_SETHOT) {
869 880 temp = (cursor->hot.x << 16) + cursor->hot.y;
870   - writel(temp, viapar->io_virt + VIA_REG_CURSOR_ORG);
  881 + writel(temp, engine + VIA_REG_CURSOR_ORG);
871 882 }
872 883  
873 884 if (cursor->set & FB_CUR_SETPOS) {
... ... @@ -875,7 +886,7 @@
875 886 xx = cursor->image.dx - info->var.xoffset;
876 887 temp = yy & 0xFFFF;
877 888 temp |= (xx << 16);
878   - writel(temp, viapar->io_virt + VIA_REG_CURSOR_POS);
  889 + writel(temp, engine + VIA_REG_CURSOR_POS);
879 890 }
880 891  
881 892 if (cursor->image.width <= 32 && cursor->image.height <= 32)
882 893  
... ... @@ -889,13 +900,13 @@
889 900 }
890 901  
891 902 if (cursor->set & FB_CUR_SETSIZE) {
892   - temp = readl(viapar->io_virt + VIA_REG_CURSOR_MODE);
  903 + temp = readl(engine + VIA_REG_CURSOR_MODE);
893 904 if (cur_size == 32)
894 905 temp |= 0x2;
895 906 else
896 907 temp &= ~0x2;
897 908  
898   - writel(temp, viapar->io_virt + VIA_REG_CURSOR_MODE);
  909 + writel(temp, engine + VIA_REG_CURSOR_MODE);
899 910 }
900 911  
901 912 if (cursor->set & FB_CUR_SETCMAP) {
... ... @@ -922,8 +933,8 @@
922 933 ((info->cmap.blue[bg_color] & 0xFF00) >> 8);
923 934 }
924 935  
925   - writel(bg_color, viapar->io_virt + VIA_REG_CURSOR_BG);
926   - writel(fg_color, viapar->io_virt + VIA_REG_CURSOR_FG);
  936 + writel(bg_color, engine + VIA_REG_CURSOR_BG);
  937 + writel(fg_color, engine + VIA_REG_CURSOR_FG);
927 938 }
928 939  
929 940 if (cursor->set & FB_CUR_SETSHAPE) {
... ... @@ -996,8 +1007,8 @@
996 1007  
997 1008 static int viafb_sync(struct fb_info *info)
998 1009 {
999   - if (viafb_accel)
1000   - viafb_wait_engine_idle();
  1010 + if (!(info->flags & FBINFO_HWACCEL_DISABLED))
  1011 + viafb_wait_engine_idle(info);
1001 1012 return 0;
1002 1013 }
1003 1014  
1004 1015  
... ... @@ -1867,22 +1878,18 @@
1867 1878  
1868 1879 viafb_get_mmio_info(&viafbinfo->fix.mmio_start,
1869 1880 &viafbinfo->fix.mmio_len);
1870   - viaparinfo->io_virt = ioremap_nocache(viafbinfo->fix.mmio_start,
1871   - viafbinfo->fix.mmio_len);
1872   - if (!viaparinfo->io_virt) {
1873   - printk(KERN_WARNING "ioremap failed: hardware acceleration disabled\n");
1874   - viafb_accel = 0;
1875   - }
1876   -
1877 1881 viafbinfo->node = 0;
1878 1882 viafbinfo->fbops = &viafb_ops;
1879 1883 viafbinfo->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
1880 1884  
1881 1885 viafbinfo->pseudo_palette = pseudo_pal;
1882   - if (viafb_accel) {
1883   - viafb_init_accel(viaparinfo->shared);
1884   - viafb_init_2d_engine();
1885   - viafb_hw_cursor_init();
  1886 + if (viafb_accel && !viafb_init_engine(viafbinfo)) {
  1887 + viafbinfo->flags |= FBINFO_HWACCEL_COPYAREA |
  1888 + FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_IMAGEBLIT;
  1889 + default_var.accel_flags = FB_ACCELF_TEXT;
  1890 + } else {
  1891 + viafbinfo->flags |= FBINFO_HWACCEL_DISABLED;
  1892 + default_var.accel_flags = 0;
1886 1893 }
1887 1894  
1888 1895 if (viafb_second_size && (viafb_second_size < 8)) {
1889 1896  
... ... @@ -1963,16 +1970,7 @@
1963 1970 default_var.lower_margin = 4;
1964 1971 default_var.hsync_len = default_var.left_margin;
1965 1972 default_var.vsync_len = 4;
1966   - default_var.accel_flags = 0;
1967 1973  
1968   - if (viafb_accel) {
1969   - viafbinfo->flags |=
1970   - (FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT |
1971   - FBINFO_HWACCEL_IMAGEBLIT);
1972   - default_var.accel_flags |= FB_ACCELF_TEXT;
1973   - } else
1974   - viafbinfo->flags |= FBINFO_HWACCEL_DISABLED;
1975   -
1976 1974 if (viafb_dual_fb) {
1977 1975 viafbinfo1 = framebuffer_alloc(viafb_par_length, NULL);
1978 1976 if (!viafbinfo1) {
... ... @@ -1994,12 +1992,6 @@
1994 1992 viaparinfo1->fbmem_used;
1995 1993 viaparinfo->fbmem_free = viaparinfo->memsize;
1996 1994 viaparinfo->fbmem_used = 0;
1997   - if (viafb_accel) {
1998   - viaparinfo1->VQ_start = viaparinfo->VQ_start -
1999   - viafb_second_offset;
2000   - viaparinfo1->VQ_end = viaparinfo->VQ_end -
2001   - viafb_second_offset;
2002   - }
2003 1995  
2004 1996 viaparinfo->iga_path = IGA1;
2005 1997 viaparinfo1->iga_path = IGA2;
... ... @@ -2073,7 +2065,7 @@
2073 2065 if (viafb_dual_fb)
2074 2066 unregister_framebuffer(viafbinfo1);
2075 2067 iounmap((void *)viafbinfo->screen_base);
2076   - iounmap(viaparinfo->io_virt);
  2068 + iounmap(viaparinfo->shared->engine_mmio);
2077 2069  
2078 2070 viafb_delete_i2c_buss(viaparinfo);
2079 2071  
... ... @@ -2235,7 +2227,7 @@
2235 2227  
2236 2228 module_param(viafb_accel, int, 0);
2237 2229 MODULE_PARM_DESC(viafb_accel,
2238   - "Set 2D Hardware Acceleration.(Default = OFF)");
  2230 + "Set 2D Hardware Acceleration: 0 = OFF, 1 = ON (default)");
2239 2231  
2240 2232 module_param(viafb_active_dev, charp, 0);
2241 2233 MODULE_PARM_DESC(viafb_active_dev, "Specify active devices.");
drivers/video/via/viafbdev.h
Diff comments   View file @ 31de59d
... ... @@ -51,7 +51,9 @@
51 51 struct chip_information chip_info;
52 52  
53 53 /* hardware acceleration stuff */
  54 + void __iomem *engine_mmio;
54 55 u32 cursor_vram_addr;
  56 + u32 vq_vram_addr; /* virtual queue address in video ram */
55 57 int (*hw_bitblt)(void __iomem *engine, u8 op, u32 width, u32 height,
56 58 u8 dst_bpp, u32 dst_addr, u32 dst_pitch, u32 dst_x, u32 dst_y,
57 59 u32 *src_mem, u32 src_addr, u32 src_pitch, u32 src_x, u32 src_y,
58 60  
... ... @@ -61,13 +63,11 @@
61 63 struct viafb_par {
62 64 u8 depth;
63 65 u32 vram_addr;
64   - void __iomem *io_virt; /*iospace virtual memory address */
  66 +
65 67 unsigned int fbmem; /*framebuffer physical memory address */
66 68 unsigned int memsize; /*size of fbmem */
67 69 u32 fbmem_free; /* Free FB memory */
68 70 u32 fbmem_used; /* Use FB memory size */
69   - u32 VQ_start; /* Virtual Queue Start Address */
70   - u32 VQ_end; /* Virtual Queue End Address */
71 71 u32 iga_path;
72 72  
73 73 struct viafb_shared *shared;
... ... @@ -90,7 +90,6 @@
90 90 extern int viafb_LCD2_ON;
91 91 extern int viafb_LCD_ON;
92 92 extern int viafb_DVI_ON;
93   -extern int viafb_accel;
94 93 extern int viafb_hotplug;
95 94 extern int viafb_memsize;
96 95