Skip to contentSkip to conversation

R300 QEMU device V2

RFC In review [email protected] 6 participants 18 messages Nov 26, 2019 – Nov 29, 2019

lore
Share & tools
lore
#0 lore raw

cover R300 QEMU device V2

From: Aaron Dominick <[email protected]>

I have removed the botched patches and have got the code working upto the GART initialization.
I am not sure how to implement the GART. I am guessing it should be an IOMMU device but I think that is a bit much for an emulated card. The earlier problem of display probing seems to be resolved by using an R300 bios I got from TechPowerUP's GPU database:

	https://www.techpowerup.com/vgabios/14509/14509

I am NOT sure if we can distribute it in the QEMU source tree. If it does cause problems I can send a patch to remove it.

Aaron Dominick (10):
Add Radeon kernel headers. Will clean up later
Fix MC STATUS resgister
R300 fixes
Got GPU init working. Stops at probing display
Clean up Radeon Header files
Add a new R300 VBIOS courtesy of TechPowerUP

Signature · 1 line
2.24.0
#1 lore raw

RFC 5/10 Add Radeon kernel headers. Will clean up later

From: Aaron Dominick <[email protected]>

---
 hw/display/Kconfig                  |    9 +
 hw/display/Makefile.objs            |    1 +
 hw/display/ObjectID.h               |  736 +++
 hw/display/atom-bits.h              |   48 +
 hw/display/atom-names.h             |  100 +
 hw/display/atom-types.h             |   42 +
 hw/display/atom.h                   |  160 +
 hw/display/atombios.h               | 7981 +++++++++++++++++++++++++++
 hw/display/avivod.h                 |   62 +
 hw/display/btc_dpm.h                |   62 +
 hw/display/btcd.h                   |  185 +
 hw/display/cayman_blit_shaders.h    |   35 +
 hw/display/ci_dpm.h                 |  341 ++
 hw/display/cik_blit_shaders.h       |   32 +
 hw/display/cik_reg.h                |  241 +
 hw/display/cikd.h                   | 2172 ++++++++
 hw/display/clearstate_cayman.h      | 1083 ++++
 hw/display/clearstate_ci.h          |  946 ++++
 hw/display/clearstate_defs.h        |   44 +
 hw/display/clearstate_evergreen.h   | 1080 ++++
 hw/display/clearstate_si.h          |  943 ++++
 hw/display/cypress_dpm.h            |  160 +
 hw/display/evergreen_blit_shaders.h |   35 +
 hw/display/evergreen_reg.h          |  315 ++
 hw/display/evergreen_smc.h          |   67 +
 hw/display/evergreend.h             | 2628 +++++++++
 hw/display/kv_dpm.h                 |  200 +
 hw/display/ni_dpm.h                 |  250 +
 hw/display/ni_reg.h                 |  132 +
 hw/display/nid.h                    | 1369 +++++
 hw/display/nislands_smc.h           |  329 ++
 hw/display/ppsmc.h                  |  191 +
 hw/display/pptable.h                |  690 +++
 hw/display/r100_track.h             |  100 +
 hw/display/r100d.h                  |  869 +++
 hw/display/r300.c                   | 1009 ++++
 hw/display/r300.h                   |  173 +
 hw/display/r300_2d.c                |  190 +
 hw/display/r300_debug.c             |  272 +
 hw/display/r300_drm.c               | 1599 ++++++
 hw/display/r300_reg.h               | 1789 ++++++
 hw/display/r300d.h                  |  343 ++
 hw/display/r420d.h                  |  249 +
 hw/display/r500_reg.h               |  801 +++
 hw/display/r520d.h                  |  187 +
 hw/display/r600_blit_shaders.h      |   38 +
 hw/display/r600_dpm.h               |  238 +
 hw/display/r600_reg.h               |  201 +
 hw/display/r600d.h                  | 2370 ++++++++
 hw/display/radeon.h                 | 2967 ++++++++++
 hw/display/radeon_acpi.h            |  456 ++
 hw/display/radeon_asic.h            |  986 ++++
 hw/display/radeon_audio.h           |   84 +
 hw/display/radeon_drv.h             |  121 +
 hw/display/radeon_family.h          |  122 +
 hw/display/radeon_mode.h            | 1002 ++++
 hw/display/radeon_object.h          |  197 +
 hw/display/radeon_reg.h             | 3725 +++++++++++++
 hw/display/radeon_trace.h           |  209 +
 hw/display/radeon_ucode.h           |  227 +
 hw/display/rs100d.h                 |   40 +
 hw/display/rs400d.h                 |  160 +
 hw/display/rs600d.h                 |  685 +++
 hw/display/rs690d.h                 |  313 ++
 hw/display/rs780_dpm.h              |  109 +
 hw/display/rs780d.h                 |  171 +
 hw/display/rv200d.h                 |   36 +
 hw/display/rv250d.h                 |  123 +
 hw/display/rv350d.h                 |   52 +
 hw/display/rv515d.h                 |  638 +++
 hw/display/rv6xx_dpm.h              |   95 +
 hw/display/rv6xxd.h                 |  246 +
 hw/display/rv730d.h                 |  165 +
 hw/display/rv740d.h                 |  117 +
 hw/display/rv770_dpm.h              |  285 +
 hw/display/rv770_smc.h              |  207 +
 hw/display/rv770d.h                 | 1015 ++++
 hw/display/si_blit_shaders.h        |   32 +
 hw/display/si_dpm.h                 |  238 +
 hw/display/si_reg.h                 |  105 +
 hw/display/sid.h                    | 1956 +++++++
 hw/display/sislands_smc.h           |  424 ++
 hw/display/smu7.h                   |  170 +
 hw/display/smu7_discrete.h          |  514 ++
 hw/display/smu7_fusion.h            |  300 +
 hw/display/sumo_dpm.h               |  221 +
 hw/display/sumod.h                  |  372 ++
 hw/display/trinity_dpm.h            |  134 +
 hw/display/trinityd.h               |  228 +
 89 files changed, 52344 insertions(+)
 create mode 100644 hw/display/ObjectID.h
 create mode 100644 hw/display/atom-bits.h
 create mode 100644 hw/display/atom-names.h
 create mode 100644 hw/display/atom-types.h
 create mode 100644 hw/display/atom.h
 create mode 100644 hw/display/atombios.h
 create mode 100644 hw/display/avivod.h
 create mode 100644 hw/display/btc_dpm.h
 create mode 100644 hw/display/btcd.h
 create mode 100644 hw/display/cayman_blit_shaders.h
 create mode 100644 hw/display/ci_dpm.h
 create mode 100644 hw/display/cik_blit_shaders.h
 create mode 100644 hw/display/cik_reg.h
 create mode 100644 hw/display/cikd.h
 create mode 100644 hw/display/clearstate_cayman.h
 create mode 100644 hw/display/clearstate_ci.h
 create mode 100644 hw/display/clearstate_defs.h
 create mode 100644 hw/display/clearstate_evergreen.h
 create mode 100644 hw/display/clearstate_si.h
 create mode 100644 hw/display/cypress_dpm.h
 create mode 100644 hw/display/evergreen_blit_shaders.h
 create mode 100644 hw/display/evergreen_reg.h
 create mode 100644 hw/display/evergreen_smc.h
 create mode 100644 hw/display/evergreend.h
 create mode 100644 hw/display/kv_dpm.h
 create mode 100644 hw/display/ni_dpm.h
 create mode 100644 hw/display/ni_reg.h
 create mode 100644 hw/display/nid.h
 create mode 100644 hw/display/nislands_smc.h
 create mode 100644 hw/display/ppsmc.h
 create mode 100644 hw/display/pptable.h
 create mode 100644 hw/display/r100_track.h
 create mode 100644 hw/display/r100d.h
 create mode 100644 hw/display/r300.c
 create mode 100644 hw/display/r300.h
 create mode 100644 hw/display/r300_2d.c
 create mode 100644 hw/display/r300_debug.c
 create mode 100644 hw/display/r300_drm.c
 create mode 100644 hw/display/r300_reg.h
 create mode 100644 hw/display/r300d.h
 create mode 100644 hw/display/r420d.h
 create mode 100644 hw/display/r500_reg.h
 create mode 100644 hw/display/r520d.h
 create mode 100644 hw/display/r600_blit_shaders.h
 create mode 100644 hw/display/r600_dpm.h
 create mode 100644 hw/display/r600_reg.h
 create mode 100644 hw/display/r600d.h
 create mode 100644 hw/display/radeon.h
 create mode 100644 hw/display/radeon_acpi.h
 create mode 100644 hw/display/radeon_asic.h
 create mode 100644 hw/display/radeon_audio.h
 create mode 100644 hw/display/radeon_drv.h
 create mode 100644 hw/display/radeon_family.h
 create mode 100644 hw/display/radeon_mode.h
 create mode 100644 hw/display/radeon_object.h
 create mode 100644 hw/display/radeon_reg.h
 create mode 100644 hw/display/radeon_trace.h
 create mode 100644 hw/display/radeon_ucode.h
 create mode 100644 hw/display/rs100d.h
 create mode 100644 hw/display/rs400d.h
 create mode 100644 hw/display/rs600d.h
 create mode 100644 hw/display/rs690d.h
 create mode 100644 hw/display/rs780_dpm.h
 create mode 100644 hw/display/rs780d.h
 create mode 100644 hw/display/rv200d.h
 create mode 100644 hw/display/rv250d.h
 create mode 100644 hw/display/rv350d.h
 create mode 100644 hw/display/rv515d.h
 create mode 100644 hw/display/rv6xx_dpm.h
 create mode 100644 hw/display/rv6xxd.h
 create mode 100644 hw/display/rv730d.h
 create mode 100644 hw/display/rv740d.h
 create mode 100644 hw/display/rv770_dpm.h
 create mode 100644 hw/display/rv770_smc.h
 create mode 100644 hw/display/rv770d.h
 create mode 100644 hw/display/si_blit_shaders.h
 create mode 100644 hw/display/si_dpm.h
 create mode 100644 hw/display/si_reg.h
 create mode 100644 hw/display/sid.h
 create mode 100644 hw/display/sislands_smc.h
 create mode 100644 hw/display/smu7.h
 create mode 100644 hw/display/smu7_discrete.h
 create mode 100644 hw/display/smu7_fusion.h
 create mode 100644 hw/display/sumo_dpm.h
 create mode 100644 hw/display/sumod.h
 create mode 100644 hw/display/trinity_dpm.h
 create mode 100644 hw/display/trinityd.h
hw/display/Kconfig +9 -0
index c500d1fc6d..3d7346f902 100644
@@ -133,6 +133,15 @@ config ATI_VGA
     select BITBANG_I2C
     select DDC
 
+config RAD_VGA
+    bool
+    default y if PCI_DEVICES
+    depends on PCI
+    select VGA
+    select BITBANG_I2C
+    select DDC
+
+
 config MACFB
     bool
     select FRAMEBUFFER
hw/display/Makefile.objs +1 -0
index f2182e3bef..e9f6f0194b 100644
@@ -59,3 +59,4 @@ common-obj-$(CONFIG_DPCD) += dpcd.o
 common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dp.o
 
 common-obj-$(CONFIG_ATI_VGA) += ati.o ati_2d.o ati_dbg.o
+common-obj-$(CONFIG_RAD_VGA) += r300.o r300_2d.o r300_debug.o
hw/display/ObjectID.h new file +736 -0

736 lines not on this page · raw message

hw/display/atom-bits.h new file +48 -0

48 lines not on this page · raw message

hw/display/atom-names.h new file +100 -0

100 lines not on this page · raw message

hw/display/atom-types.h new file +42 -0

42 lines not on this page · raw message

hw/display/atom.h new file +160 -0

160 lines not on this page · raw message

hw/display/atombios.h new file +7981 -0

1,895 lines not on this page · raw message

hw/display/avivod.h new file +62 -0

62 lines not on this page · raw message

hw/display/btc_dpm.h new file +62 -0

62 lines not on this page · raw message

hw/display/btcd.h new file +185 -0

185 lines not on this page · raw message

hw/display/cayman_blit_shaders.h new file +35 -0
new file mode 100644
index 0000000000..f5d0e9a602

Lines of this file are not shown. View the raw message.

hw/display/ci_dpm.h new file +341 -0

341 lines not on this page · raw message

hw/display/cik_blit_shaders.h new file +32 -0
new file mode 100644
index 0000000000..dfe7314f9f

Lines of this file are not shown. View the raw message.

hw/display/cik_reg.h new file +241 -0

241 lines not on this page · raw message

hw/display/cikd.h new file +2172 -0

2,172 lines not on this page · raw message

hw/display/clearstate_cayman.h new file +1083 -0

1,083 lines not on this page · raw message

hw/display/clearstate_ci.h new file +946 -0

946 lines not on this page · raw message

hw/display/clearstate_defs.h new file +44 -0

44 lines not on this page · raw message

hw/display/clearstate_evergreen.h new file +1080 -0

1,080 lines not on this page · raw message

hw/display/clearstate_si.h new file +943 -0

943 lines not on this page · raw message

hw/display/cypress_dpm.h new file +160 -0

160 lines not on this page · raw message

hw/display/evergreen_blit_shaders.h new file +35 -0
new file mode 100644
index 0000000000..bb8d6c7515

Lines of this file are not shown. View the raw message.

hw/display/evergreen_reg.h new file +315 -0

315 lines not on this page · raw message

hw/display/evergreen_smc.h new file +67 -0

67 lines not on this page · raw message

hw/display/evergreend.h new file +2628 -0

2,628 lines not on this page · raw message

hw/display/kv_dpm.h new file +200 -0

200 lines not on this page · raw message

hw/display/ni_dpm.h new file +250 -0

250 lines not on this page · raw message

hw/display/ni_reg.h new file +132 -0

132 lines not on this page · raw message

hw/display/nid.h new file +1369 -0

1,369 lines not on this page · raw message

hw/display/nislands_smc.h new file +329 -0

329 lines not on this page · raw message

hw/display/ppsmc.h new file +191 -0

191 lines not on this page · raw message

hw/display/pptable.h new file +690 -0

690 lines not on this page · raw message

hw/display/r100_track.h new file +100 -0

100 lines not on this page · raw message

hw/display/r100d.h new file +869 -0

869 lines not on this page · raw message

hw/display/r300.c new file +1009 -0

1,009 lines not on this page · raw message

hw/display/r300.h new file +173 -0

173 lines not on this page · raw message

hw/display/r300_2d.c new file +190 -0

190 lines not on this page · raw message

hw/display/r300_debug.c new file +272 -0

272 lines not on this page · raw message

hw/display/r300_drm.c new file +1599 -0

1,599 lines not on this page · raw message

hw/display/r300_reg.h new file +1789 -0

1,789 lines not on this page · raw message

hw/display/r300d.h new file +343 -0

343 lines not on this page · raw message

hw/display/r420d.h new file +249 -0

249 lines not on this page · raw message

hw/display/r500_reg.h new file +801 -0

801 lines not on this page · raw message

hw/display/r520d.h new file +187 -0

187 lines not on this page · raw message

hw/display/r600_blit_shaders.h new file +38 -0
new file mode 100644
index 0000000000..f437d36dd9

Lines of this file are not shown. View the raw message.

hw/display/r600_dpm.h new file +238 -0

238 lines not on this page · raw message

hw/display/r600_reg.h new file +201 -0

201 lines not on this page · raw message

hw/display/r600d.h new file +2370 -0

2,370 lines not on this page · raw message

hw/display/radeon.h new file +2967 -0

2,967 lines not on this page · raw message

hw/display/radeon_acpi.h new file +456 -0

456 lines not on this page · raw message

hw/display/radeon_asic.h new file +986 -0

986 lines not on this page · raw message

hw/display/radeon_audio.h new file +84 -0

84 lines not on this page · raw message

hw/display/radeon_drv.h new file +121 -0

121 lines not on this page · raw message

hw/display/radeon_family.h new file +122 -0

122 lines not on this page · raw message

hw/display/radeon_mode.h new file +1002 -0

1,002 lines not on this page · raw message

hw/display/radeon_object.h new file +197 -0

197 lines not on this page · raw message

hw/display/radeon_reg.h new file +3725 -0

3,725 lines not on this page · raw message

hw/display/radeon_trace.h new file +209 -0

209 lines not on this page · raw message

hw/display/radeon_ucode.h new file +227 -0

227 lines not on this page · raw message

hw/display/rs100d.h new file +40 -0
new file mode 100644
index 0000000000..48a913a06c

Lines of this file are not shown. View the raw message.

hw/display/rs400d.h new file +160 -0

160 lines not on this page · raw message

hw/display/rs600d.h new file +685 -0

685 lines not on this page · raw message

hw/display/rs690d.h new file +313 -0

313 lines not on this page · raw message

hw/display/rs780_dpm.h new file +109 -0

109 lines not on this page · raw message

hw/display/rs780d.h new file +171 -0

171 lines not on this page · raw message

hw/display/rv200d.h new file +36 -0
new file mode 100644
index 0000000000..c5b398330c

Lines of this file are not shown. View the raw message.

hw/display/rv250d.h new file +123 -0

123 lines not on this page · raw message

hw/display/rv350d.h new file +52 -0

52 lines not on this page · raw message

hw/display/rv515d.h new file +638 -0

638 lines not on this page · raw message

hw/display/rv6xx_dpm.h new file +95 -0

95 lines not on this page · raw message

hw/display/rv6xxd.h new file +246 -0

246 lines not on this page · raw message

hw/display/rv730d.h new file +165 -0

165 lines not on this page · raw message

hw/display/rv740d.h new file +117 -0

117 lines not on this page · raw message

hw/display/rv770_dpm.h new file +285 -0

285 lines not on this page · raw message

hw/display/rv770_smc.h new file +207 -0

207 lines not on this page · raw message

hw/display/rv770d.h new file +1015 -0

1,015 lines not on this page · raw message

hw/display/si_blit_shaders.h new file +32 -0
new file mode 100644
index 0000000000..c739e51e39

Lines of this file are not shown. View the raw message.

hw/display/si_dpm.h new file +238 -0

238 lines not on this page · raw message

hw/display/si_reg.h new file +105 -0

105 lines not on this page · raw message

hw/display/sid.h new file +1956 -0

1,956 lines not on this page · raw message

hw/display/sislands_smc.h new file +424 -0

424 lines not on this page · raw message

hw/display/smu7.h new file +170 -0

170 lines not on this page · raw message

hw/display/smu7_discrete.h new file +514 -0

514 lines not on this page · raw message

hw/display/smu7_fusion.h new file +300 -0

300 lines not on this page · raw message

hw/display/sumo_dpm.h new file +221 -0

221 lines not on this page · raw message

hw/display/sumod.h new file +372 -0

372 lines not on this page · raw message

hw/display/trinity_dpm.h new file +134 -0

134 lines not on this page · raw message

hw/display/trinityd.h new file +228 -0

228 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.24.0

Part of the diff is not shown here. View the raw message.

#2 lore raw

RFC 6/10 Fix MC STATUS resgister

In reply to [email protected]

From: Aaron Dominick <[email protected]>

---
 hw/display/r300.c | 15 ++++++++++++---
 hw/display/r300.h |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)
hw/display/r300.c +12 -3
index 94e90b7a95..653474c3aa 100644
@@ -278,6 +278,10 @@ static uint64_t r300_mm_read(void *opaque, hwaddr addr, unsigned int size)
     uint64_t val = 0;
 
     switch (addr) {
+    case RADEON_MC_STATUS:
+        val = s->regs.mc_status;
+        break;
+
     case RADEON_MM_INDEX:
         val = s->regs.mm_index;
         break;
@@ -358,9 +362,9 @@ static uint64_t r300_mm_read(void *opaque, hwaddr addr, unsigned int size)
     case RADEON_CONFIG_REG_APER_SIZE:
         val = memory_region_size(&s->mm);
         break;
-    case RADEON_MC_STATUS:
-        val = 5;
-        break;
+    // case RADEON_MC_STATUS:
+    //     val = 5;
+    //     break;
     case RADEON_RBBM_STATUS:
         val = 64; /* free CMDFIFO entries */
         break;
@@ -512,6 +516,10 @@ static void r300_mm_write(void *opaque, hwaddr addr,
         trace_ati_mm_write(size, addr, r300_reg_name(addr & ~3ULL), data);
     }
     switch (addr) {
+      case RADEON_MC_STATUS:
+        s->regs.mc_status = R300_MC_IDLE;
+        s->regs.mc_status = data;
+        break;
       case RADEON_RBBM_STATUS:
         s->regs.rbbm_status = data|= RADEON_RBBM_FIFOCNT_MASK;
         break;
@@ -946,6 +954,7 @@ static void r300_vga_realize(PCIDevice *dev, Error **errp)
 static void r300_vga_reset(DeviceState *dev)
 {
     RADVGAState *s = RAD_VGA(dev);
+    s->regs.mc_status = R300_MC_IDLE;
 
     timer_del(&s->vblank_timer);
     r300_vga_update_irq(s);
hw/display/r300.h +1 -0
index 60f572647f..a9e1db32be 100644
@@ -81,6 +81,7 @@ typedef struct RADVGARegs{
   uint32_t default_pitch;
   uint32_t default_tile;
   uint32_t default_sc_bottom_right;
+  uint32_t mc_status;
 
 //Color Buffer RB3D
   uint32_t r300_rb3d_aaresolve_ctl;
Signature · 1 line
2.24.0
#3 lore raw

RFC 7/10 R300 fixes

In reply to [email protected]

From: Aaron Dominick <[email protected]>

---
 hw/display/r300.c | 9 +++++++++
 hw/display/r300.h | 6 ++++++
 2 files changed, 15 insertions(+)
hw/display/r300.c +9 -0
index 653474c3aa..074dbf5b2d 100644
@@ -878,6 +878,15 @@ static void r300_mm_write(void *opaque, hwaddr addr,
     case RADEON_DEFAULT_SC_BOTTOM_RIGHT:
         s->regs.default_sc_bottom_right = data & 0x3fff3fff;
         break;
+    case R300_GB_ENABLE:
+        s->regs.r300_gb_enable = data;
+        break;
+    case R300_GB_TILE_CONFIG:
+            s->regs.r300_gb_tile_config = data;
+            break;
+    case R300_GB_FIFO_SIZE:
+            s->regs.r300_gb_fifo_size = data;
+            break;
     default:
         break;
     }
hw/display/r300.h +6 -0
index a9e1db32be..19e3d97f8a 100644
@@ -83,6 +83,12 @@ typedef struct RADVGARegs{
   uint32_t default_sc_bottom_right;
   uint32_t mc_status;
 
+  //R300 GB Registers
+  uint32_t r300_gb_enable;
+  uint32_t r300_gb_tile_config;
+  uint32_t r300_gb_fifo_size;
+
+
 //Color Buffer RB3D
   uint32_t r300_rb3d_aaresolve_ctl;
   uint32_t r300_rb3d_aaresolve_offset;
Signature · 1 line
2.24.0
#4 lore raw

RFC 8/10 Got GPU init working. Stops at probing display

In reply to [email protected]

From: Aaron Dominick <[email protected]>

---
 hw/display/ati.c  |   9 +-
 hw/display/r300.c | 571 +++++++++++++++++++++++++++++++++++++---------
 hw/display/r300.h |  77 ++++++-
 3 files changed, 544 insertions(+), 113 deletions(-)
hw/display/ati.c +5 -4
index db3b254316..1d36233163 100644
@@ -44,7 +44,7 @@ enum { VGA_MODE, EXT_MODE };
 
 static void ati_vga_switch_mode(ATIVGAState *s)
 {
-    DPRINTF("%d -> %d\n",
+    qemu_log("%d -> %d\n",
             s->mode, !!(s->regs.crtc_gen_cntl & CRTC2_EXT_DISP_EN));
     if (s->regs.crtc_gen_cntl & CRTC2_EXT_DISP_EN) {
         /* Extended mode enabled */
@@ -88,7 +88,7 @@ static void ati_vga_switch_mode(ATIVGAState *s)
                 qemu_log_mask(LOG_UNIMP, "Unsupported bpp value\n");
             }
             assert(bpp != 0);
-            DPRINTF("Switching to %dx%d %d %d @ %x\n", h, v, stride, bpp, offs);
+            qemu_log("Switching to %dx%d %d %d @ %x\n", h, v, stride, bpp, offs);
             vbe_ioport_write_index(&s->vga, 0, VBE_DISPI_INDEX_ENABLE);
             vbe_ioport_write_data(&s->vga, 0, VBE_DISPI_DISABLED);
             s->vga.big_endian_fb = (s->regs.config_cntl & APER_0_ENDIAN ||
@@ -111,14 +111,14 @@ static void ati_vga_switch_mode(ATIVGAState *s)
                 vbe_ioport_write_data(&s->vga, 0, stride);
                 stride *= bypp;
                 if (offs % stride) {
-                    DPRINTF("CRTC offset is not multiple of pitch\n");
+                    qemu_log("CRTC offset is not multiple of pitch\n");
                     vbe_ioport_write_index(&s->vga, 0,
                                            VBE_DISPI_INDEX_X_OFFSET);
                     vbe_ioport_write_data(&s->vga, 0, offs % stride / bypp);
                 }
                 vbe_ioport_write_index(&s->vga, 0, VBE_DISPI_INDEX_Y_OFFSET);
                 vbe_ioport_write_data(&s->vga, 0, offs / stride);
-                DPRINTF("VBE offset (%d,%d), vbe_start_addr=%x\n",
+                qemu_log("VBE offset (%d,%d), vbe_start_addr=%x\n",
                         s->vga.vbe_regs[VBE_DISPI_INDEX_X_OFFSET],
                         s->vga.vbe_regs[VBE_DISPI_INDEX_Y_OFFSET],
                         s->vga.vbe_start_addr);
@@ -129,6 +129,7 @@ static void ati_vga_switch_mode(ATIVGAState *s)
         s->mode = VGA_MODE;
         vbe_ioport_write_index(&s->vga, 0, VBE_DISPI_INDEX_ENABLE);
         vbe_ioport_write_data(&s->vga, 0, VBE_DISPI_DISABLED);
+        qemu_log("VGA MODE %d \n",s->mode);
     }
 }
 
hw/display/r300.c +463 -108

840 lines not on this page · raw message

hw/display/r300.h +76 -1

107 lines not on this page · raw message

Signature · 1 line
2.24.0
#5 lore raw

RFC 9/10 Clean up Radeon Header files

In reply to [email protected]

From: Aaron Dominick <[email protected]>

---
 hw/display/atom-bits.h           |   48 -
 hw/display/atom-names.h          |  100 -
 hw/display/atom-types.h          |   42 -
 hw/display/atom.h                |  160 -
 hw/display/atombios.h            | 7981 ------------------------------
 hw/display/avivod.h              |   62 -
 hw/display/cayman_blit_shaders.h |   35 -
 hw/display/ci_dpm.h              |  341 --
 hw/display/cik_blit_shaders.h    |   32 -
 hw/display/cikd.h                | 2172 --------
 hw/display/r300d.h               |  343 --
 hw/display/r420d.h               |  249 -
 hw/display/r520d.h               |  187 -
 hw/display/r600_blit_shaders.h   |   38 -
 hw/display/r600_dpm.h            |  238 -
 hw/display/r600d.h               | 2370 ---------
 hw/display/radeon.h              | 2967 -----------
 hw/display/radeon_acpi.h         |  456 --
 hw/display/radeon_asic.h         |  986 ----
 hw/display/radeon_drv.h          |  121 -
 hw/display/radeon_family.h       |  122 -
 hw/display/radeon_mode.h         | 1002 ----
 hw/display/radeon_object.h       |  197 -
 hw/display/radeon_trace.h        |  209 -
 hw/display/radeon_ucode.h        |  227 -
 hw/display/rs100d.h              |   40 -
 hw/display/rs400d.h              |  160 -
 hw/display/rs600d.h              |  685 ---
 hw/display/rs690d.h              |  313 --
 hw/display/rs780_dpm.h           |  109 -
 hw/display/rs780d.h              |  171 -
 hw/display/rv200d.h              |   36 -
 hw/display/rv250d.h              |  123 -
 hw/display/rv350d.h              |   52 -
 hw/display/rv515d.h              |  638 ---
 hw/display/rv6xx_dpm.h           |   95 -
 hw/display/rv6xxd.h              |  246 -
 hw/display/rv730d.h              |  165 -
 hw/display/rv740d.h              |  117 -
 hw/display/rv770_dpm.h           |  285 --
 hw/display/rv770_smc.h           |  207 -
 hw/display/rv770d.h              | 1015 ----
 hw/display/si_blit_shaders.h     |   32 -
 hw/display/si_dpm.h              |  238 -
 hw/display/sid.h                 | 1956 --------
 hw/display/sislands_smc.h        |  424 --
 hw/display/smu7.h                |  170 -
 hw/display/smu7_discrete.h       |  514 --
 hw/display/smu7_fusion.h         |  300 --
 hw/display/sumo_dpm.h            |  221 -
 hw/display/sumod.h               |  372 --
 hw/display/trinity_dpm.h         |  134 -
 hw/display/trinityd.h            |  228 -
 53 files changed, 29731 deletions(-)
 delete mode 100644 hw/display/atom-bits.h
 delete mode 100644 hw/display/atom-names.h
 delete mode 100644 hw/display/atom-types.h
 delete mode 100644 hw/display/atom.h
 delete mode 100644 hw/display/atombios.h
 delete mode 100644 hw/display/avivod.h
 delete mode 100644 hw/display/cayman_blit_shaders.h
 delete mode 100644 hw/display/ci_dpm.h
 delete mode 100644 hw/display/cik_blit_shaders.h
 delete mode 100644 hw/display/cikd.h
 delete mode 100644 hw/display/r300d.h
 delete mode 100644 hw/display/r420d.h
 delete mode 100644 hw/display/r520d.h
 delete mode 100644 hw/display/r600_blit_shaders.h
 delete mode 100644 hw/display/r600_dpm.h
 delete mode 100644 hw/display/r600d.h
 delete mode 100644 hw/display/radeon.h
 delete mode 100644 hw/display/radeon_acpi.h
 delete mode 100644 hw/display/radeon_asic.h
 delete mode 100644 hw/display/radeon_drv.h
 delete mode 100644 hw/display/radeon_family.h
 delete mode 100644 hw/display/radeon_mode.h
 delete mode 100644 hw/display/radeon_object.h
 delete mode 100644 hw/display/radeon_trace.h
 delete mode 100644 hw/display/radeon_ucode.h
 delete mode 100644 hw/display/rs100d.h
 delete mode 100644 hw/display/rs400d.h
 delete mode 100644 hw/display/rs600d.h
 delete mode 100644 hw/display/rs690d.h
 delete mode 100644 hw/display/rs780_dpm.h
 delete mode 100644 hw/display/rs780d.h
 delete mode 100644 hw/display/rv200d.h
 delete mode 100644 hw/display/rv250d.h
 delete mode 100644 hw/display/rv350d.h
 delete mode 100644 hw/display/rv515d.h
 delete mode 100644 hw/display/rv6xx_dpm.h
 delete mode 100644 hw/display/rv6xxd.h
 delete mode 100644 hw/display/rv730d.h
 delete mode 100644 hw/display/rv740d.h
 delete mode 100644 hw/display/rv770_dpm.h
 delete mode 100644 hw/display/rv770_smc.h
 delete mode 100644 hw/display/rv770d.h
 delete mode 100644 hw/display/si_blit_shaders.h
 delete mode 100644 hw/display/si_dpm.h
 delete mode 100644 hw/display/sid.h
 delete mode 100644 hw/display/sislands_smc.h
 delete mode 100644 hw/display/smu7.h
 delete mode 100644 hw/display/smu7_discrete.h
 delete mode 100644 hw/display/smu7_fusion.h
 delete mode 100644 hw/display/sumo_dpm.h
 delete mode 100644 hw/display/sumod.h
 delete mode 100644 hw/display/trinity_dpm.h
 delete mode 100644 hw/display/trinityd.h
hw/display/atom-bits.h deleted +0 -48
deleted file mode 100644
index e8fae5c775..0000000000
@@ -1,48 +0,0 @@
-/*
- * Copyright 2008 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Author: Stanislaw Skowronek
- */
-
-#ifndef ATOM_BITS_H
-#define ATOM_BITS_H
-
-static inline uint8_t get_u8(void *bios, int ptr)
-{
-    return ((unsigned char *)bios)[ptr];
-}
-#define U8(ptr) get_u8(ctx->ctx->bios, (ptr))
-#define CU8(ptr) get_u8(ctx->bios, (ptr))
-static inline uint16_t get_u16(void *bios, int ptr)
-{
-    return get_u8(bios ,ptr)|(((uint16_t)get_u8(bios, ptr+1))<<8);
-}
-#define U16(ptr) get_u16(ctx->ctx->bios, (ptr))
-#define CU16(ptr) get_u16(ctx->bios, (ptr))
-static inline uint32_t get_u32(void *bios, int ptr)
-{
-    return get_u16(bios, ptr)|(((uint32_t)get_u16(bios, ptr+2))<<16);
-}
-#define U32(ptr) get_u32(ctx->ctx->bios, (ptr))
-#define CU32(ptr) get_u32(ctx->bios, (ptr))
-#define CSTR(ptr) (((char *)(ctx->bios))+(ptr))
-
-#endif
hw/display/atom-names.h deleted +0 -100

100 lines not on this page · raw message

hw/display/atom-types.h deleted +0 -42

42 lines not on this page · raw message

hw/display/atom.h deleted +0 -160

160 lines not on this page · raw message

hw/display/atombios.h deleted +0 -7981

2,650 lines not on this page · raw message

hw/display/avivod.h deleted +0 -62

62 lines not on this page · raw message

hw/display/cayman_blit_shaders.h deleted +0 -35
deleted file mode 100644
index f5d0e9a602..0000000000

Lines of this file are not shown. View the raw message.

hw/display/ci_dpm.h deleted +0 -341

341 lines not on this page · raw message

hw/display/cik_blit_shaders.h deleted +0 -32
deleted file mode 100644
index dfe7314f9f..0000000000

Lines of this file are not shown. View the raw message.

hw/display/cikd.h deleted +0 -2172

2,172 lines not on this page · raw message

hw/display/r300d.h deleted +0 -343

343 lines not on this page · raw message

hw/display/r420d.h deleted +0 -249

249 lines not on this page · raw message

hw/display/r520d.h deleted +0 -187

187 lines not on this page · raw message

hw/display/r600_blit_shaders.h deleted +0 -38
deleted file mode 100644
index f437d36dd9..0000000000

Lines of this file are not shown. View the raw message.

hw/display/r600_dpm.h deleted +0 -238

238 lines not on this page · raw message

hw/display/r600d.h deleted +0 -2370

2,370 lines not on this page · raw message

hw/display/radeon.h deleted +0 -2967

2,967 lines not on this page · raw message

hw/display/radeon_acpi.h deleted +0 -456

456 lines not on this page · raw message

hw/display/radeon_asic.h deleted +0 -986

986 lines not on this page · raw message

hw/display/radeon_drv.h deleted +0 -121

121 lines not on this page · raw message

hw/display/radeon_family.h deleted +0 -122

122 lines not on this page · raw message

hw/display/radeon_mode.h deleted +0 -1002

1,002 lines not on this page · raw message

hw/display/radeon_object.h deleted +0 -197

197 lines not on this page · raw message

hw/display/radeon_trace.h deleted +0 -209

209 lines not on this page · raw message

hw/display/radeon_ucode.h deleted +0 -227

227 lines not on this page · raw message

hw/display/rs100d.h deleted +0 -40
deleted file mode 100644
index 48a913a06c..0000000000

Lines of this file are not shown. View the raw message.

hw/display/rs400d.h deleted +0 -160

160 lines not on this page · raw message

hw/display/rs600d.h deleted +0 -685

685 lines not on this page · raw message

hw/display/rs690d.h deleted +0 -313

313 lines not on this page · raw message

hw/display/rs780_dpm.h deleted +0 -109

109 lines not on this page · raw message

hw/display/rs780d.h deleted +0 -171

171 lines not on this page · raw message

hw/display/rv200d.h deleted +0 -36
deleted file mode 100644
index c5b398330c..0000000000

Lines of this file are not shown. View the raw message.

hw/display/rv250d.h deleted +0 -123

123 lines not on this page · raw message

hw/display/rv350d.h deleted +0 -52

52 lines not on this page · raw message

hw/display/rv515d.h deleted +0 -638

638 lines not on this page · raw message

hw/display/rv6xx_dpm.h deleted +0 -95

95 lines not on this page · raw message

hw/display/rv6xxd.h deleted +0 -246

246 lines not on this page · raw message

hw/display/rv730d.h deleted +0 -165

165 lines not on this page · raw message

hw/display/rv740d.h deleted +0 -117

117 lines not on this page · raw message

hw/display/rv770_dpm.h deleted +0 -285

285 lines not on this page · raw message

hw/display/rv770_smc.h deleted +0 -207

207 lines not on this page · raw message

hw/display/rv770d.h deleted +0 -1015

1,015 lines not on this page · raw message

hw/display/si_blit_shaders.h deleted +0 -32
deleted file mode 100644
index c739e51e39..0000000000

Lines of this file are not shown. View the raw message.

hw/display/si_dpm.h deleted +0 -238

238 lines not on this page · raw message

hw/display/sid.h deleted +0 -1956

1,956 lines not on this page · raw message

hw/display/sislands_smc.h deleted +0 -424

424 lines not on this page · raw message

hw/display/smu7.h deleted +0 -170

170 lines not on this page · raw message

hw/display/smu7_discrete.h deleted +0 -514

514 lines not on this page · raw message

hw/display/smu7_fusion.h deleted +0 -300

300 lines not on this page · raw message

hw/display/sumo_dpm.h deleted +0 -221

221 lines not on this page · raw message

hw/display/sumod.h deleted +0 -372

372 lines not on this page · raw message

hw/display/trinity_dpm.h deleted +0 -134

134 lines not on this page · raw message

hw/display/trinityd.h deleted +0 -228

228 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.24.0

Part of the diff is not shown here. View the raw message.

#6 lore raw

RFC 9/10 Clean up Radeon Header files

Quoted 3 lines · On Tuesday, November 26, 2019, <[email protected]> wrote:

From: Aaron Dominick <[email protected]>

---

Your commit message is poor. You should have clearly explained what do you do in this cleanup, and why.

Aleksandar

Quoted 1,295 lines
 hw/display/atom-bits.h           |   48 -
 hw/display/atom-names.h          |  100 -
 hw/display/atom-types.h          |   42 -
 hw/display/atom.h                |  160 -
 hw/display/atombios.h            | 7981 ------------------------------
 hw/display/avivod.h              |   62 -
 hw/display/cayman_blit_shaders.h |   35 -
 hw/display/ci_dpm.h              |  341 --
 hw/display/cik_blit_shaders.h    |   32 -
 hw/display/cikd.h                | 2172 --------
 hw/display/r300d.h               |  343 --
 hw/display/r420d.h               |  249 -
 hw/display/r520d.h               |  187 -
 hw/display/r600_blit_shaders.h   |   38 -
 hw/display/r600_dpm.h            |  238 -
 hw/display/r600d.h               | 2370 ---------
 hw/display/radeon.h              | 2967 -----------
 hw/display/radeon_acpi.h         |  456 --
 hw/display/radeon_asic.h         |  986 ----
 hw/display/radeon_drv.h          |  121 -
 hw/display/radeon_family.h       |  122 -
 hw/display/radeon_mode.h         | 1002 ----
 hw/display/radeon_object.h       |  197 -
 hw/display/radeon_trace.h        |  209 -
 hw/display/radeon_ucode.h        |  227 -
 hw/display/rs100d.h              |   40 -
 hw/display/rs400d.h              |  160 -
 hw/display/rs600d.h              |  685 ---
 hw/display/rs690d.h              |  313 --
 hw/display/rs780_dpm.h           |  109 -
 hw/display/rs780d.h              |  171 -
 hw/display/rv200d.h              |   36 -
 hw/display/rv250d.h              |  123 -
 hw/display/rv350d.h              |   52 -
 hw/display/rv515d.h              |  638 ---
 hw/display/rv6xx_dpm.h           |   95 -
 hw/display/rv6xxd.h              |  246 -
 hw/display/rv730d.h              |  165 -
 hw/display/rv740d.h              |  117 -
 hw/display/rv770_dpm.h           |  285 --
 hw/display/rv770_smc.h           |  207 -
 hw/display/rv770d.h              | 1015 ----
 hw/display/si_blit_shaders.h     |   32 -
 hw/display/si_dpm.h              |  238 -
 hw/display/sid.h                 | 1956 --------
 hw/display/sislands_smc.h        |  424 --
 hw/display/smu7.h                |  170 -
 hw/display/smu7_discrete.h       |  514 --
 hw/display/smu7_fusion.h         |  300 --
 hw/display/sumo_dpm.h            |  221 -
 hw/display/sumod.h               |  372 --
 hw/display/trinity_dpm.h         |  134 -
 hw/display/trinityd.h            |  228 -
 53 files changed, 29731 deletions(-)
 delete mode 100644 hw/display/atom-bits.h
 delete mode 100644 hw/display/atom-names.h
 delete mode 100644 hw/display/atom-types.h
 delete mode 100644 hw/display/atom.h
 delete mode 100644 hw/display/atombios.h
 delete mode 100644 hw/display/avivod.h
 delete mode 100644 hw/display/cayman_blit_shaders.h
 delete mode 100644 hw/display/ci_dpm.h
 delete mode 100644 hw/display/cik_blit_shaders.h
 delete mode 100644 hw/display/cikd.h
 delete mode 100644 hw/display/r300d.h
 delete mode 100644 hw/display/r420d.h
 delete mode 100644 hw/display/r520d.h
 delete mode 100644 hw/display/r600_blit_shaders.h
 delete mode 100644 hw/display/r600_dpm.h
 delete mode 100644 hw/display/r600d.h
 delete mode 100644 hw/display/radeon.h
 delete mode 100644 hw/display/radeon_acpi.h
 delete mode 100644 hw/display/radeon_asic.h
 delete mode 100644 hw/display/radeon_drv.h
 delete mode 100644 hw/display/radeon_family.h
 delete mode 100644 hw/display/radeon_mode.h
 delete mode 100644 hw/display/radeon_object.h
 delete mode 100644 hw/display/radeon_trace.h
 delete mode 100644 hw/display/radeon_ucode.h
 delete mode 100644 hw/display/rs100d.h
 delete mode 100644 hw/display/rs400d.h
 delete mode 100644 hw/display/rs600d.h
 delete mode 100644 hw/display/rs690d.h
 delete mode 100644 hw/display/rs780_dpm.h
 delete mode 100644 hw/display/rs780d.h
 delete mode 100644 hw/display/rv200d.h
 delete mode 100644 hw/display/rv250d.h
 delete mode 100644 hw/display/rv350d.h
 delete mode 100644 hw/display/rv515d.h
 delete mode 100644 hw/display/rv6xx_dpm.h
 delete mode 100644 hw/display/rv6xxd.h
 delete mode 100644 hw/display/rv730d.h
 delete mode 100644 hw/display/rv740d.h
 delete mode 100644 hw/display/rv770_dpm.h
 delete mode 100644 hw/display/rv770_smc.h
 delete mode 100644 hw/display/rv770d.h
 delete mode 100644 hw/display/si_blit_shaders.h
 delete mode 100644 hw/display/si_dpm.h
 delete mode 100644 hw/display/sid.h
 delete mode 100644 hw/display/sislands_smc.h
 delete mode 100644 hw/display/smu7.h
 delete mode 100644 hw/display/smu7_discrete.h
 delete mode 100644 hw/display/smu7_fusion.h
 delete mode 100644 hw/display/sumo_dpm.h
 delete mode 100644 hw/display/sumod.h
 delete mode 100644 hw/display/trinity_dpm.h
 delete mode 100644 hw/display/trinityd.h
hw/display/atom-bits.h deleted +0 -5
deleted file mode 100644
index e8fae5c775..0000000000
@@ -1,48 +0,0 @@
-/*
- * Copyright 2008 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the

"Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Author: Stanislaw Skowronek
- */

hw/display/atom-bits.h deleted +0 -25
-
-#ifndef ATOM_BITS_H
-#define ATOM_BITS_H
-
-static inline uint8_t get_u8(void *bios, int ptr)
-{
-    return ((unsigned char *)bios)[ptr];
-}
-#define U8(ptr) get_u8(ctx->ctx->bios, (ptr))
-#define CU8(ptr) get_u8(ctx->bios, (ptr))
-static inline uint16_t get_u16(void *bios, int ptr)
-{
-    return get_u8(bios ,ptr)|(((uint16_t)get_u8(bios, ptr+1))<<8);
-}
-#define U16(ptr) get_u16(ctx->ctx->bios, (ptr))
-#define CU16(ptr) get_u16(ctx->bios, (ptr))
-static inline uint32_t get_u32(void *bios, int ptr)
-{
-    return get_u16(bios, ptr)|(((uint32_t)get_u16(bios, ptr+2))<<16);
-}
-#define U32(ptr) get_u32(ctx->ctx->bios, (ptr))
-#define CU32(ptr) get_u32(ctx->bios, (ptr))
-#define CSTR(ptr) (((char *)(ctx->bios))+(ptr))
-
-#endif
hw/display/atom-names.h deleted +0 -5
deleted file mode 100644
index 6f907a5ffa..0000000000
@@ -1,100 +0,0 @@
-/*
- * Copyright 2008 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the

"Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Author: Stanislaw Skowronek
- */

hw/display/atom-names.h deleted +0 -77
-
-#ifndef ATOM_NAMES_H
-#define ATOM_NAMES_H
-
-#include "atom.h"
-
-#ifdef ATOM_DEBUG
-
-#define ATOM_OP_NAMES_CNT 123
-static char *atom_op_names[ATOM_OP_NAMES_CNT] = {
-"RESERVED", "MOVE_REG", "MOVE_PS", "MOVE_WS", "MOVE_FB", "MOVE_PLL",
-"MOVE_MC", "AND_REG", "AND_PS", "AND_WS", "AND_FB", "AND_PLL", "AND_MC",
-"OR_REG", "OR_PS", "OR_WS", "OR_FB", "OR_PLL", "OR_MC", "SHIFT_LEFT_REG",
-"SHIFT_LEFT_PS", "SHIFT_LEFT_WS", "SHIFT_LEFT_FB", "SHIFT_LEFT_PLL",
-"SHIFT_LEFT_MC", "SHIFT_RIGHT_REG", "SHIFT_RIGHT_PS", "SHIFT_RIGHT_WS",
-"SHIFT_RIGHT_FB", "SHIFT_RIGHT_PLL", "SHIFT_RIGHT_MC", "MUL_REG",
-"MUL_PS", "MUL_WS", "MUL_FB", "MUL_PLL", "MUL_MC", "DIV_REG", "DIV_PS",
-"DIV_WS", "DIV_FB", "DIV_PLL", "DIV_MC", "ADD_REG", "ADD_PS", "ADD_WS",
-"ADD_FB", "ADD_PLL", "ADD_MC", "SUB_REG", "SUB_PS", "SUB_WS", "SUB_FB",
-"SUB_PLL", "SUB_MC", "SET_ATI_PORT", "SET_PCI_PORT", "SET_SYS_IO_PORT",
-"SET_REG_BLOCK", "SET_FB_BASE", "COMPARE_REG", "COMPARE_PS",
-"COMPARE_WS", "COMPARE_FB", "COMPARE_PLL", "COMPARE_MC", "SWITCH",
-"JUMP", "JUMP_EQUAL", "JUMP_BELOW", "JUMP_ABOVE", "JUMP_BELOW_OR_EQUAL",
-"JUMP_ABOVE_OR_EQUAL", "JUMP_NOT_EQUAL", "TEST_REG", "TEST_PS", "TEST_WS",
-"TEST_FB", "TEST_PLL", "TEST_MC", "DELAY_MILLISEC", "DELAY_MICROSEC",
-"CALL_TABLE", "REPEAT", "CLEAR_REG", "CLEAR_PS", "CLEAR_WS", "CLEAR_FB",
-"CLEAR_PLL", "CLEAR_MC", "NOP", "EOT", "MASK_REG", "MASK_PS", "MASK_WS",
-"MASK_FB", "MASK_PLL", "MASK_MC", "POST_CARD", "BEEP", "SAVE_REG",
-"RESTORE_REG", "SET_DATA_BLOCK", "XOR_REG", "XOR_PS", "XOR_WS", "XOR_FB",
-"XOR_PLL", "XOR_MC", "SHL_REG", "SHL_PS", "SHL_WS", "SHL_FB", "SHL_PLL",
-"SHL_MC", "SHR_REG", "SHR_PS", "SHR_WS", "SHR_FB", "SHR_PLL", "SHR_MC",
-"DEBUG", "CTB_DS",
-};
-
-#define ATOM_TABLE_NAMES_CNT 74
-static char *atom_table_names[ATOM_TABLE_NAMES_CNT] = {
-"ASIC_Init", "GetDisplaySurfaceSize", "ASIC_RegistersInit",
-"VRAM_BlockVenderDetection", "SetClocksRatio", "MemoryControllerInit",
-"GPIO_PinInit", "MemoryParamAdjust", "DVOEncoderControl",
-"GPIOPinControl", "SetEngineClock", "SetMemoryClock", "SetPixelClock",
-"DynamicClockGating", "ResetMemoryDLL", "ResetMemoryDevice",
-"MemoryPLLInit", "EnableMemorySelfRefresh", "AdjustMemoryController",
-"EnableASIC_StaticPwrMgt", "ASIC_StaticPwrMgtStatusChange",
-"DAC_LoadDetection", "TMDS2EncoderControl", "LCD1OutputControl",
-"DAC1EncoderControl", "DAC2EncoderControl", "DVOOutputControl",
-"CV1OutputControl", "SetCRTC_DPM_State", "TVEncoderControl",
-"TMDS1EncoderControl", "LVDSEncoderControl", "TV1OutputControl",
-"EnableScaler", "BlankCRTC", "EnableCRTC", "GetPixelClock",
-"EnableVGA_Render", "EnableVGA_Access", "SetCRTC_Timing",
-"SetCRTC_OverScan", "SetCRTC_Replication", "SelectCRTC_Source",
-"EnableGraphSurfaces", "UpdateCRTC_DoubleBufferRegisters",
-"LUT_AutoFill", "EnableHW_IconCursor", "GetMemoryClock",
-"GetEngineClock", "SetCRTC_UsingDTDTiming", "TVBootUpStdPinDetection",
-"DFP2OutputControl", "VRAM_BlockDetectionByStrap", "MemoryCleanUp",
-"ReadEDIDFromHWAssistedI2C", "WriteOneByteToHWAssistedI2C",
-"ReadHWAssistedI2CStatus", "SpeedFanControl", "PowerConnectorDetection",
-"MC_Synchronization", "ComputeMemoryEnginePLL", "MemoryRefreshConversion",
-"VRAM_GetCurrentInfoBlock", "DynamicMemorySettings", "MemoryTraining",
-"EnableLVDS_SS", "DFP1OutputControl", "SetVoltage", "CRT1OutputControl",
-"CRT2OutputControl", "SetupHWAssistedI2CStatus", "ClockSource",
-"MemoryDeviceInit", "EnableYUV",
-};
-
-#define ATOM_IO_NAMES_CNT 5
-static char *atom_io_names[ATOM_IO_NAMES_CNT] = {
-"MM", "PLL", "MC", "PCIE", "PCIE PORT",
-};
-
-#else
-
-#define ATOM_OP_NAMES_CNT 0
-#define ATOM_TABLE_NAMES_CNT 0
-#define ATOM_IO_NAMES_CNT 0
-
-#endif
-
-#endif
hw/display/atom-types.h deleted +0 -5
deleted file mode 100644
index 1125b866cd..0000000000
@@ -1,42 +0,0 @@
-/*
- * Copyright 2008 Red Hat Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the

"Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Author: Dave Airlie
- */

hw/display/atom-types.h deleted +0 -19
-
-#ifndef ATOM_TYPES_H
-#define ATOM_TYPES_H
-
-/* sync atom types to kernel types */
-
-typedef uint16_t USHORT;
-typedef uint32_t ULONG;
-typedef uint8_t UCHAR;
-
-
-#ifndef ATOM_BIG_ENDIAN
-#if defined(__BIG_ENDIAN)
-#define ATOM_BIG_ENDIAN 1
-#else
-#define ATOM_BIG_ENDIAN 0
-#endif
-#endif
-#endif
hw/display/atom.h deleted +0 -5
deleted file mode 100644
index 364b895e7e..0000000000
@@ -1,160 +0,0 @@
-/*
- * Copyright 2008 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the

"Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Author: Stanislaw Skowronek
- */

hw/display/atom.h deleted +0 -91
-
-#ifndef ATOM_H
-#define ATOM_H
-
-#include <linux/types.h>
-
-#define ATOM_BIOS_MAGIC                0xAA55
-#define ATOM_ATI_MAGIC_PTR     0x30
-#define ATOM_ATI_MAGIC         " 761295520"
-#define ATOM_ROM_TABLE_PTR     0x48
-
-#define ATOM_ROM_MAGIC         "ATOM"
-#define ATOM_ROM_MAGIC_PTR     4
-
-#define ATOM_ROM_MSG_PTR       0x10
-#define ATOM_ROM_CMD_PTR       0x1E
-#define ATOM_ROM_DATA_PTR      0x20
-
-#define ATOM_CMD_INIT          0
-#define ATOM_CMD_SETSCLK       0x0A
-#define ATOM_CMD_SETMCLK       0x0B
-#define ATOM_CMD_SETPCLK       0x0C
-#define ATOM_CMD_SPDFANCNTL    0x39
-
-#define ATOM_DATA_FWI_PTR      0xC
-#define ATOM_DATA_IIO_PTR      0x32
-
-#define ATOM_FWI_DEFSCLK_PTR   8
-#define ATOM_FWI_DEFMCLK_PTR   0xC
-#define ATOM_FWI_MAXSCLK_PTR   0x24
-#define ATOM_FWI_MAXMCLK_PTR   0x28
-
-#define ATOM_CT_SIZE_PTR       0
-#define ATOM_CT_WS_PTR         4
-#define ATOM_CT_PS_PTR         5
-#define ATOM_CT_PS_MASK                0x7F
-#define ATOM_CT_CODE_PTR       6
-
-#define ATOM_OP_CNT            123
-#define ATOM_OP_EOT            91
-
-#define ATOM_CASE_MAGIC                0x63
-#define ATOM_CASE_END          0x5A5A
-
-#define ATOM_ARG_REG           0
-#define ATOM_ARG_PS            1
-#define ATOM_ARG_WS            2
-#define ATOM_ARG_FB            3
-#define ATOM_ARG_ID            4
-#define ATOM_ARG_IMM           5
-#define ATOM_ARG_PLL           6
-#define ATOM_ARG_MC            7
-
-#define ATOM_SRC_DWORD         0
-#define ATOM_SRC_WORD0         1
-#define ATOM_SRC_WORD8         2
-#define ATOM_SRC_WORD16                3
-#define ATOM_SRC_BYTE0         4
-#define ATOM_SRC_BYTE8         5
-#define ATOM_SRC_BYTE16                6
-#define ATOM_SRC_BYTE24                7
-
-#define ATOM_WS_QUOTIENT       0x40
-#define ATOM_WS_REMAINDER      0x41
-#define ATOM_WS_DATAPTR                0x42
-#define ATOM_WS_SHIFT          0x43
-#define ATOM_WS_OR_MASK                0x44
-#define ATOM_WS_AND_MASK       0x45
-#define ATOM_WS_FB_WINDOW      0x46
-#define ATOM_WS_ATTRIBUTES     0x47
-#define ATOM_WS_REGPTR         0x48
-
-#define ATOM_IIO_NOP           0
-#define ATOM_IIO_START         1
-#define ATOM_IIO_READ          2
-#define ATOM_IIO_WRITE         3
-#define ATOM_IIO_CLEAR         4
-#define ATOM_IIO_SET           5
-#define ATOM_IIO_MOVE_INDEX    6
-#define ATOM_IIO_MOVE_ATTR     7
-#define ATOM_IIO_MOVE_DATA     8
-#define ATOM_IIO_END           9
-
-#define ATOM_IO_MM             0
-#define ATOM_IO_PCI            1
-#define ATOM_IO_SYSIO          2
-#define ATOM_IO_IIO            0x80
-
-struct card_info {
-       struct drm_device *dev;
-       void (* reg_write)(struct card_info *, uint32_t, uint32_t);   /*

filled by driver */
- uint32_t (* reg_read)(struct card_info *, uint32_t); /*
filled by driver */

hw/display/atom.h deleted +0 -2
-       void (* ioreg_write)(struct card_info *, uint32_t, uint32_t);
 /*  filled by driver */
-        uint32_t (* ioreg_read)(struct card_info *, uint32_t);

/* filled by driver */
- void (* mc_write)(struct card_info *, uint32_t, uint32_t); /*
filled by driver */
- uint32_t (* mc_read)(struct card_info *, uint32_t); /*
filled by driver */
- void (* pll_write)(struct card_info *, uint32_t, uint32_t); /*
filled by driver */
- uint32_t (* pll_read)(struct card_info *, uint32_t); /*
filled by driver */

hw/display/atom.h deleted +0 -27
-};
-
-struct atom_context {
-       struct card_info *card;
-       struct mutex mutex;
-       struct mutex scratch_mutex;
-       void *bios;
-       uint32_t cmd_table, data_table;
-       uint16_t *iio;
-
-       uint16_t data_block;
-       uint32_t fb_base;
-       uint32_t divmul[2];
-       uint16_t io_attr;
-       uint16_t reg_block;
-       uint8_t shift;
-       int cs_equal, cs_above;
-       int io_mode;
-       uint32_t *scratch;
-       int scratch_size_bytes;
-};
-
-extern int atom_debug;
-
-struct atom_context *atom_parse(struct card_info *, void *);
-int atom_execute_table(struct atom_context *, int, uint32_t *);
-int atom_execute_table_scratch_unlocked(struct atom_context *, int,

uint32_t *);

hw/display/atom.h deleted +0 -3
-int atom_asic_init(struct atom_context *);
-void atom_destroy(struct atom_context *);
-bool atom_parse_data_header(struct atom_context *ctx, int index, uint16_t

*size,
- uint8_t *frev, uint8_t *crev, uint16_t
*data_start);

hw/display/atom.h deleted +0 -8
-bool atom_parse_cmd_header(struct atom_context *ctx, int index,
-                          uint8_t *frev, uint8_t *crev);
-int atom_allocate_fb_scratch(struct atom_context *ctx);
-#include "atom-types.h"
-#include "atombios.h"
-#include "ObjectID.h"
-
-#endif
hw/display/atombios.h deleted +0 -5
deleted file mode 100644
index 4b86e8b450..0000000000
@@ -1,7981 +0,0 @@
-/*
- * Copyright 2006-2007 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the

"Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */

hw/display/atombios.h deleted +0 -5
-
-
-/****************************************************************************/
 
-/*Portion I: Definitions  shared between VBIOS and Driver
   */
-/**********************************************************

******************/

hw/display/atombios.h deleted +0 -79
-
-
-#ifndef _ATOMBIOS_H
-#define _ATOMBIOS_H
-
-#define ATOM_VERSION_MAJOR                   0x00020000
-#define ATOM_VERSION_MINOR                   0x00000002
-
-#define ATOM_HEADER_VERSION (ATOM_VERSION_MAJOR | ATOM_VERSION_MINOR)
-
-/* Endianness should be specified before inclusion,
- * default to little endian
- */
-#ifndef ATOM_BIG_ENDIAN
-#error Endian not specified
-#endif
-
-#ifdef _H2INC
-  #ifndef ULONG
-    typedef unsigned long ULONG;
-  #endif
-
-  #ifndef UCHAR
-    typedef unsigned char UCHAR;
-  #endif
-
-  #ifndef USHORT
-    typedef unsigned short USHORT;
-  #endif
-#endif
-
-#define ATOM_DAC_A            0
-#define ATOM_DAC_B            1
-#define ATOM_EXT_DAC          2
-
-#define ATOM_CRTC1            0
-#define ATOM_CRTC2            1
-#define ATOM_CRTC3            2
-#define ATOM_CRTC4            3
-#define ATOM_CRTC5            4
-#define ATOM_CRTC6            5
-#define ATOM_CRTC_INVALID     0xFF
-
-#define ATOM_DIGA             0
-#define ATOM_DIGB             1
-
-#define ATOM_PPLL1            0
-#define ATOM_PPLL2            1
-#define ATOM_DCPLL            2
-#define ATOM_PPLL0            2
-#define ATOM_PPLL3            3
-
-#define ATOM_EXT_PLL1         8
-#define ATOM_EXT_PLL2         9
-#define ATOM_EXT_CLOCK        10
-#define ATOM_PPLL_INVALID     0xFF
-
-#define ENCODER_REFCLK_SRC_P1PLL       0
-#define ENCODER_REFCLK_SRC_P2PLL       1
-#define ENCODER_REFCLK_SRC_DCPLL       2
-#define ENCODER_REFCLK_SRC_EXTCLK      3
-#define ENCODER_REFCLK_SRC_INVALID     0xFF
-
-#define ATOM_SCALER1          0
-#define ATOM_SCALER2          1
-
-#define ATOM_SCALER_DISABLE   0
-#define ATOM_SCALER_CENTER    1
-#define ATOM_SCALER_EXPANSION 2
-#define ATOM_SCALER_MULTI_EX  3
-
-#define ATOM_DISABLE          0
-#define ATOM_ENABLE           1
-#define ATOM_LCD_BLOFF                          (ATOM_DISABLE+2)
-#define ATOM_LCD_BLON                           (ATOM_ENABLE+2)
-#define ATOM_LCD_BL_BRIGHTNESS_CONTROL          (ATOM_ENABLE+3)
-#define ATOM_LCD_SELFTEST_START
                              (ATOM_DISABLE+5)
-#define ATOM_LCD_SELFTEST_STOP
                     (ATOM_ENABLE+5)
-#define ATOM_ENCODER_INIT

(ATOM_DISABLE+7)
-#define ATOM_INIT
(ATOM_DISABLE+7)

hw/display/atombios.h deleted +0 -66
-#define ATOM_GET_STATUS                         (ATOM_DISABLE+8)
-
-#define ATOM_BLANKING         1
-#define ATOM_BLANKING_OFF     0
-
-#define ATOM_CURSOR1          0
-#define ATOM_CURSOR2          1
-
-#define ATOM_ICON1            0
-#define ATOM_ICON2            1
-
-#define ATOM_CRT1             0
-#define ATOM_CRT2             1
-
-#define ATOM_TV_NTSC          1
-#define ATOM_TV_NTSCJ         2
-#define ATOM_TV_PAL           3
-#define ATOM_TV_PALM          4
-#define ATOM_TV_PALCN         5
-#define ATOM_TV_PALN          6
-#define ATOM_TV_PAL60         7
-#define ATOM_TV_SECAM         8
-#define ATOM_TV_CV            16
-
-#define ATOM_DAC1_PS2         1
-#define ATOM_DAC1_CV          2
-#define ATOM_DAC1_NTSC        3
-#define ATOM_DAC1_PAL         4
-
-#define ATOM_DAC2_PS2         ATOM_DAC1_PS2
-#define ATOM_DAC2_CV          ATOM_DAC1_CV
-#define ATOM_DAC2_NTSC        ATOM_DAC1_NTSC
-#define ATOM_DAC2_PAL         ATOM_DAC1_PAL
-
-#define ATOM_PM_ON            0
-#define ATOM_PM_STANDBY       1
-#define ATOM_PM_SUSPEND       2
-#define ATOM_PM_OFF           3
-
-/* Bit0:{=0:single, =1:dual},
-   Bit1 {=0:666RGB, =1:888RGB},
-   Bit2:3:{Grey level}
-   Bit4:{=0:LDI format for RGB888, =1 FPDI format for RGB888}*/
-
-#define ATOM_PANEL_MISC_DUAL               0x00000001
-#define ATOM_PANEL_MISC_888RGB             0x00000002
-#define ATOM_PANEL_MISC_GREY_LEVEL         0x0000000C
-#define ATOM_PANEL_MISC_FPDI               0x00000010
-#define ATOM_PANEL_MISC_GREY_LEVEL_SHIFT   2
-#define ATOM_PANEL_MISC_SPATIAL            0x00000020
-#define ATOM_PANEL_MISC_TEMPORAL           0x00000040
-#define ATOM_PANEL_MISC_API_ENABLED        0x00000080
-
-
-#define MEMTYPE_DDR1              "DDR1"
-#define MEMTYPE_DDR2              "DDR2"
-#define MEMTYPE_DDR3              "DDR3"
-#define MEMTYPE_DDR4              "DDR4"
-
-#define ASIC_BUS_TYPE_PCI         "PCI"
-#define ASIC_BUS_TYPE_AGP         "AGP"
-#define ASIC_BUS_TYPE_PCIE        "PCI_EXPRESS"
-
-/* Maximum size of that FireGL flag string */
-
-#define ATOM_FIREGL_FLAG_STRING     "FGL"             //Flag used to

enable FireGL Support
-#define ATOM_MAX_SIZE_OF_FIREGL_FLAG_STRING 3 //sizeof(
ATOM_FIREGL_FLAG_STRING )

hw/display/atombios.h deleted +0 -2
-
-#define ATOM_FAKE_DESKTOP_STRING    "DSK"             //Flag used to

enable mobile ASIC on Desktop
-#define ATOM_MAX_SIZE_OF_FAKE_DESKTOP_STRING
ATOM_MAX_SIZE_OF_FIREGL_FLAG_STRING

hw/display/atombios.h deleted +0 -2
-
-#define ATOM_M54T_FLAG_STRING       "M54T"            //Flag used to

enable M54T Support
-#define ATOM_MAX_SIZE_OF_M54T_FLAG_STRING 4 //sizeof(
ATOM_M54T_FLAG_STRING )

hw/display/atombios.h deleted +0 -5
-
-#define HW_ASSISTED_I2C_STATUS_FAILURE          2
-#define HW_ASSISTED_I2C_STATUS_SUCCESS          1
-
-#pragma pack(1)                                       /* BIOS data must

use byte alignment */

hw/display/atombios.h deleted +0 -5
-
-/*  Define offset to location of ROM header. */
-
-#define OFFSET_TO_POINTER_TO_ATOM_ROM_HEADER           0x00000048L
-#define OFFSET_TO_ATOM_ROM_IMAGE_SIZE

0x00000002L

hw/display/atombios.h deleted +0 -3
-
-#define OFFSET_TO_ATOMBIOS_ASIC_BUS_MEM_TYPE    0x94
-#define MAXSIZE_OF_ATOMBIOS_ASIC_BUS_MEM_TYPE   20    /* including the

terminator 0x0! */

hw/display/atombios.h deleted +0 -11
-#define        OFFSET_TO_GET_ATOMBIOS_STRINGS_NUMBER           0x002f
-#define        OFFSET_TO_GET_ATOMBIOS_STRINGS_START            0x006e
-
-/* Common header for all ROM Data tables.
-  Every table pointed  _ATOM_MASTER_DATA_TABLE has this common header.
-  And the pointer actually points to this header. */
-
-typedef struct _ATOM_COMMON_TABLE_HEADER
-{
-  USHORT usStructureSize;
-  UCHAR  ucTableFormatRevision;   /*Change it when the Parser is not

backward compatible */
- UCHAR ucTableContentRevision; /*Change it only when the table needs to change but the firmware */
- /*Image can't be updated, while Driver
needs to carry the new table! */

hw/display/atombios.h deleted +0 -9
-}ATOM_COMMON_TABLE_HEADER;
-
-/****************************************************************************/
 
-// Structure stores the ROM header.
-/****************************************************************************/
 
-typedef struct _ATOM_ROM_HEADER
-{
-  ATOM_COMMON_TABLE_HEADER             sHeader;
-  UCHAR         uaFirmWareSignature[4];    /*Signature to distinguish

between Atombios and non-atombios,
- atombios should init it as "ATOM",
don't change the position */

hw/display/atombios.h deleted +0 -12
-  USHORT usBiosRuntimeSegmentAddress;
-  USHORT usProtectedModeInfoOffset;
-  USHORT usConfigFilenameOffset;
-  USHORT usCRC_BlockOffset;
-  USHORT usBIOS_BootupMessageOffset;
-  USHORT usInt10Offset;
-  USHORT usPciBusDevInitCode;
-  USHORT usIoBaseAddress;
-  USHORT usSubsystemVendorID;
-  USHORT usSubsystemID;
-  USHORT usPCI_InfoOffset;
-  USHORT usMasterCommandTableOffset; /*Offset for SW to get all command

table offsets, Don't change the position */
- USHORT usMasterDataTableOffset; /*Offset for SW to get all data table
offsets, Don't change the position */

hw/display/atombios.h deleted +0 -5
-  UCHAR  ucExtendedFunctionCode;
-  UCHAR  ucReserved;
-}ATOM_ROM_HEADER;
-
-/*==============================Command Table

Portion==================================== */

hw/display/atombios.h deleted +0 -11
-
-#ifdef UEFI_BUILD
-       #define UTEMP   USHORT
-       #define USHORT  void*
-#endif
-
-/****************************************************************************/
 
-// Structures used in Command.mtb
-/****************************************************************************/
 
-typedef struct _ATOM_MASTER_LIST_OF_COMMAND_TABLES{
-  USHORT ASIC_Init;                              //Function Table, used

by various SW components,latest version 1.1
- USHORT GetDisplaySurfaceSize; //Atomic Table, Used by
Bios when enabling HW ICON
- USHORT ASIC_RegistersInit; //Atomic Table,
indirectly used by various SW components,called from ASIC_Init
- USHORT VRAM_BlockVenderDetection; //Atomic Table, used
only by Bios

hw/display/atombios.h deleted +0 -2
-  USHORT DIGxEncoderControl;
                              //Only used by Bios
-  USHORT MemoryControllerInit;                   //Atomic Table,

indirectly used by various SW components,called from ASIC_Init
- USHORT EnableCRTCMemReq; //Function
Table,directly used by various SW components,latest version 2.1

-  USHORT MemoryParamAdjust;
                               //Atomic Table,  indirectly used by various
SW components,called from SetMemoryClock if needed
-  USHORT DVOEncoderControl;                      //Function
Table,directly used by various SW components,latest version 1.2
-  USHORT GPIOPinControl;
                                              //Atomic Table,  only used by

Bios
- USHORT SetEngineClock; //Function
Table,directly used by various SW components,latest version 1.1
- USHORT SetMemoryClock; //Function
Table,directly used by various SW components,latest version 1.1
- USHORT SetPixelClock; //Function
Table,directly used by various SW components,latest version 1.2
- USHORT EnableDispPowerGating; //Atomic Table,
indirectly used by various SW components,called from ASIC_Init
- USHORT ResetMemoryDLL; //Atomic Table,
indirectly used by various SW components,called from SetMemoryClock
- USHORT ResetMemoryDevice; //Atomic Table,
indirectly used by various SW components,called from SetMemoryClock
- USHORT MemoryPLLInit; //Atomic Table, used
only by Bios

-  USHORT AdjustDisplayPll;
                                      //Atomic Table,  used by various SW

componentes.
- USHORT AdjustMemoryController; //Atomic Table,
indirectly used by various SW components,called from SetMemoryClock

- USHORT EnableASIC_StaticPwrMgt; //Atomic Table, only
used by Bios
- USHORT SetUniphyInstance; //Atomic Table, only
used by Bios
- USHORT DAC_LoadDetection; //Atomic Table,
directly used by various SW components,latest version 1.2
- USHORT LVTMAEncoderControl; //Atomic Table,directly
used by various SW components,latest version 1.3
- USHORT HW_Misc_Operation; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT DAC1EncoderControl; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT DAC2EncoderControl; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT DVOOutputControl; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT CV1OutputControl; //Atomic Table, Atomic
Table, Obsolete from Ry6xx, use DAC2 Output instead

hw/display/atombios.h deleted +0 -2
-  USHORT GetConditionalGoldenSetting;            //Only used by Bios
-  USHORT TVEncoderControl;                       //Function

Table,directly used by various SW components,latest version 1.1

hw/display/atombios.h deleted +0 -3
-  USHORT PatchMCSetting;                         //only used by BIOS
-  USHORT MC_SEQ_Control;                         //only used by BIOS
-  USHORT Gfx_Harvesting;                         //Atomic Table,

Obsolete from Ry6xx, Now only used by BIOS for GFX harvesting
- USHORT EnableScaler; //Atomic Table, used
only by Bios
- USHORT BlankCRTC; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT EnableCRTC; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT GetPixelClock; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT EnableVGA_Render; //Function
Table,directly used by various SW components,latest version 1.1
- USHORT GetSCLKOverMCLKRatio; //Atomic Table, only
used by Bios
- USHORT SetCRTC_Timing; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT SetCRTC_OverScan; //Atomic Table, used by
various SW components,latest version 1.1
- USHORT SetCRTC_Replication; //Atomic Table, used
only by Bios
- USHORT SelectCRTC_Source; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT EnableGraphSurfaces; //Atomic Table, used
only by Bios
- USHORT UpdateCRTC_DoubleBufferRegisters; //Atomic
Table, used only by Bios
- USHORT LUT_AutoFill; //Atomic Table, only
used by Bios
- USHORT EnableHW_IconCursor; //Atomic Table, only
used by Bios
- USHORT GetMemoryClock; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT GetEngineClock; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT SetCRTC_UsingDTDTiming; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT ExternalEncoderControl; //Atomic Table,
directly used by various SW components,latest version 2.1
- USHORT LVTMAOutputControl; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT VRAM_BlockDetectionByStrap; //Atomic Table, used
only by Bios
- USHORT MemoryCleanUp; //Atomic Table, only
used by Bios
- USHORT ProcessI2cChannelTransaction; //Function Table,only
used by Bios
- USHORT WriteOneByteToHWAssistedI2C; //Function
Table,indirectly used by various SW components
- USHORT ReadHWAssistedI2CStatus; //Atomic Table,
indirectly used by various SW components
- USHORT SpeedFanControl; //Function
Table,indirectly used by various SW components,called from ASIC_Init
- USHORT PowerConnectorDetection; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT MC_Synchronization; //Atomic Table,
indirectly used by various SW components,called from SetMemoryClock
- USHORT ComputeMemoryEnginePLL; //Atomic Table,
indirectly used by various SW components,called from SetMemory/EngineClock
- USHORT MemoryRefreshConversion; //Atomic Table,
indirectly used by various SW components,called from SetMemory or SetEngineClock
- USHORT VRAM_GetCurrentInfoBlock; //Atomic Table, used
only by Bios
- USHORT DynamicMemorySettings; //Atomic Table,
indirectly used by various SW components,called from SetMemoryClock
- USHORT MemoryTraining; //Atomic Table, used
only by Bios
- USHORT EnableSpreadSpectrumOnPPLL; //Atomic Table,
directly used by various SW components,latest version 1.2
- USHORT TMDSAOutputControl; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT SetVoltage; //Function
Table,directly and/or indirectly used by various SW components,latest version 1.1
- USHORT DAC1OutputControl; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT DAC2OutputControl; //Atomic Table,
directly used by various SW components,latest version 1.1
- USHORT ComputeMemoryClockParam; //Function Table,only
used by Bios, obsolete soon.Switch to use "ReadEDIDFromHWAssistedI2C"
- USHORT ClockSource; //Atomic Table,
indirectly used by various SW components,called from ASIC_Init
- USHORT MemoryDeviceInit; //Atomic Table,
indirectly used by various SW components,called from SetMemoryClock
- USHORT GetDispObjectInfo; //Atomic Table,
indirectly used by various SW components,called from EnableVGARender
- USHORT DIG1EncoderControl; //Atomic Table,directly
used by various SW components,latest version 1.1
- USHORT DIG2EncoderControl; //Atomic Table,directly
used by various SW components,latest version 1.1
- USHORT DIG1TransmitterControl; //Atomic Table,directly
used by various SW components,latest version 1.1
- USHORT DIG2TransmitterControl; //Atomic
Table,directly used by various SW components,latest version 1.1
- USHORT ProcessAuxChannelTransaction;
//Function Table,only used by Bios

hw/display/atombios.h deleted +0 -2
-  USHORT DPEncoderService;
                                      //Function Table,only used by Bios
-  USHORT GetVoltageInfo;                         //Function Table,only

used by Bios since SI

hw/display/atombios.h deleted +0 -4
-}ATOM_MASTER_LIST_OF_COMMAND_TABLES;
-
-// For backward compatible
-#define ReadEDIDFromHWAssistedI2C

ProcessI2cChannelTransaction

hw/display/atombios.h deleted +0 -2
-#define DPTranslatorControl                      DIG2EncoderControl
-#define UNIPHYTransmitterControl

DIG1TransmitterControl

hw/display/atombios.h deleted +0 -2
-#define LVTMATransmitterControl
 DIG2TransmitterControl
-#define SetCRTC_DPM_State

GetConditionalGoldenSetting

hw/display/atombios.h deleted +0 -26
-#define ASIC_StaticPwrMgtStatusChange            SetUniphyInstance
-#define HPDInterruptService                      ReadHWAssistedI2CStatus
-#define EnableVGA_Access                         GetSCLKOverMCLKRatio
-#define EnableYUV                                GetDispObjectInfo
 
-#define DynamicClockGating                       EnableDispPowerGating
-#define SetupHWAssistedI2CStatus                 ComputeMemoryClockParam
-
-#define TMDSAEncoderControl                      PatchMCSetting
-#define LVDSEncoderControl                       MC_SEQ_Control
-#define LCD1OutputControl                        HW_Misc_Operation
-#define TV1OutputControl                         Gfx_Harvesting
-
-typedef struct _ATOM_MASTER_COMMAND_TABLE
-{
-  ATOM_COMMON_TABLE_HEADER           sHeader;
-  ATOM_MASTER_LIST_OF_COMMAND_TABLES ListOfCommandTables;
-}ATOM_MASTER_COMMAND_TABLE;
-
-/****************************************************************************/
 
-// Structures used in every command table
-/****************************************************************************/
 
-typedef struct _ATOM_TABLE_ATTRIBUTE
-{
-#if ATOM_BIG_ENDIAN
-  USHORT  UpdatedByUtility:1;         //[15]=Table updated by utility flag
-  USHORT  PS_SizeInBytes:7;           //[14:8]=Size of parameter space in

Bytes (multiple of a dword),
- USHORT WS_SizeInBytes:8; //[7:0]=Size of workspace in Bytes
(in multiple of a dword),

hw/display/atombios.h deleted +0 -2
-#else
-  USHORT  WS_SizeInBytes:8;           //[7:0]=Size of workspace in Bytes

(in multiple of a dword),
- USHORT PS_SizeInBytes:7; //[14:8]=Size of parameter space in
Bytes (multiple of a dword),

hw/display/atombios.h deleted +0 -13
-  USHORT  UpdatedByUtility:1;         //[15]=Table updated by utility flag
-#endif
-}ATOM_TABLE_ATTRIBUTE;
-
-typedef union _ATOM_TABLE_ATTRIBUTE_ACCESS
-{
-  ATOM_TABLE_ATTRIBUTE sbfAccess;
-  USHORT               susAccess;
-}ATOM_TABLE_ATTRIBUTE_ACCESS;
-
-/****************************************************************************/
 
-// Common header for all command tables.
-// Every table pointed by _ATOM_MASTER_COMMAND_TABLE has this common

header.

hw/display/atombios.h deleted +0 -22
-// And the pointer actually points to this header.
-/****************************************************************************/
 
-typedef struct _ATOM_COMMON_ROM_COMMAND_TABLE_HEADER
-{
-  ATOM_COMMON_TABLE_HEADER CommonHeader;
-  ATOM_TABLE_ATTRIBUTE     TableAttribute;
-}ATOM_COMMON_ROM_COMMAND_TABLE_HEADER;
-
-/****************************************************************************/
 
-// Structures used by ComputeMemoryEnginePLLTable
-/****************************************************************************/
 
-#define COMPUTE_MEMORY_PLL_PARAM        1
-#define COMPUTE_ENGINE_PLL_PARAM        2
-#define ADJUST_MC_SETTING_PARAM         3
-
-/****************************************************************************/
 
-// Structures used by AdjustMemoryControllerTable
-/****************************************************************************/
 
-typedef struct _ATOM_ADJUST_MEMORY_CLOCK_FREQ
-{
-#if ATOM_BIG_ENDIAN
-  ULONG ulPointerReturnFlag:1;      // BYTE_3[7]=1 - Return the pointer

to the right Data Block; BYTE_3[7]=0 - Program the right Data Block

hw/display/atombios.h deleted +0 -6
-  ULONG ulMemoryModuleNumber:7;     // BYTE_3[6:0]
-  ULONG ulClockFreq:24;
-#else
-  ULONG ulClockFreq:24;
-  ULONG ulMemoryModuleNumber:7;     // BYTE_3[6:0]
-  ULONG ulPointerReturnFlag:1;      // BYTE_3[7]=1 - Return the pointer

to the right Data Block; BYTE_3[7]=0 - Program the right Data Block

hw/display/atombios.h deleted +0 -7
-#endif
-}ATOM_ADJUST_MEMORY_CLOCK_FREQ;
-#define POINTER_RETURN_FLAG             0x80
-
-typedef struct _COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS
-{
-  ULONG   ulClock;        //When returen, it's the re-calculated clock

based on given Fb_div Post_Div and ref_div

hw/display/atombios.h deleted +0 -10
-  UCHAR   ucAction;       //0:reserved //1:Memory //2:Engine
-  UCHAR   ucReserved;     //may expand to return larger Fbdiv later
-  UCHAR   ucFbDiv;        //return value
-  UCHAR   ucPostDiv;      //return value
-}COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS;
-
-typedef struct _COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V2
-{
-  ULONG   ulClock;        //When return, [23:0] return real clock
-  UCHAR   ucAction;       //0:reserved;COMPUTE_MEMORY_P

LL_PARAM:Memory;COMPUTE_ENGINE_PLL_PARAM:Engine. it return ref_div to be written to register
- USHORT usFbDiv; //return Feedback value to be written
to register

hw/display/atombios.h deleted +0 -6
-  UCHAR   ucPostDiv;      //return post div to be written to register
-}COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V2;
-#define COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_PS_ALLOCATION
 COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS
-
-
-#define SET_CLOCK_FREQ_MASK                     0x00FFFFFF  //Clock

change tables only take bit [23:0] as the requested clock value
-#define USE_NON_BUS_CLOCK_MASK 0x01000000 //Applicable
to both memory and engine clock change, when set, it uses another clock as the temporary clock (engine uses memory and vice versa)
-#define USE_MEMORY_SELF_REFRESH_MASK 0x02000000 //Only
applicable to memory clock change, when set, using memory self refresh during clock transition
-#define SKIP_INTERNAL_MEMORY_PARAMETER_CHANGE 0x04000000 //Only
applicable to memory clock change, when set, the table will skip predefined internal memory parameter change
-#define FIRST_TIME_CHANGE_CLOCK

                              0x08000000      //Applicable to both memory
and engine clock change,when set, it means this is 1st time to change clock
after ASIC bootup
-#define SKIP_SW_PROGRAM_PLL
                                      0x10000000      //Applicable to both

memory and engine clock change, when set, it means the table will not program SPLL/MPLL

hw/display/atombios.h deleted +0 -3
-#define USE_SS_ENABLED_PIXEL_CLOCK  USE_NON_BUS_CLOCK_MASK
-
-#define b3USE_NON_BUS_CLOCK_MASK                  0x01       //Applicable

to both memory and engine clock change, when set, it uses another clock as the temporary clock (engine uses memory and vice versa)
-#define b3USE_MEMORY_SELF_REFRESH 0x02 //Only
applicable to memory clock change, when set, using memory self refresh during clock transition
-#define b3SKIP_INTERNAL_MEMORY_PARAMETER_CHANGE 0x04 //Only
applicable to memory clock change, when set, the table will skip predefined internal memory parameter change
-#define b3FIRST_TIME_CHANGE_CLOCK

                              0x08       //Applicable to both memory and
engine clock change,when set, it means this is 1st time to change clock
after ASIC bootup
-#define b3SKIP_SW_PROGRAM_PLL
                                      0x10                     //Applicable

to both memory and engine clock change, when set, it means the table will not program SPLL/MPLL

hw/display/atombios.h deleted +0 -5
-
-typedef struct _ATOM_COMPUTE_CLOCK_FREQ
-{
-#if ATOM_BIG_ENDIAN
-  ULONG ulComputeClockFlag:8;                 // =1:

COMPUTE_MEMORY_PLL_PARAM, =2: COMPUTE_ENGINE_PLL_PARAM

hw/display/atombios.h deleted +0 -4
-  ULONG ulClockFreq:24;                       // in unit of 10kHz
-#else
-  ULONG ulClockFreq:24;                       // in unit of 10kHz
-  ULONG ulComputeClockFlag:8;                 // =1:

COMPUTE_MEMORY_PLL_PARAM, =2: COMPUTE_ENGINE_PLL_PARAM

hw/display/atombios.h deleted +0 -35
-#endif
-}ATOM_COMPUTE_CLOCK_FREQ;
-
-typedef struct _ATOM_S_MPLL_FB_DIVIDER
-{
-  USHORT usFbDivFrac;
-  USHORT usFbDiv;
-}ATOM_S_MPLL_FB_DIVIDER;
-
-typedef struct _COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V3
-{
-  union
-  {
-    ATOM_COMPUTE_CLOCK_FREQ  ulClock;         //Input Parameter
-    ULONG ulClockParams;                      //ULONG access for BE
-    ATOM_S_MPLL_FB_DIVIDER   ulFbDiv;         //Output Parameter
-  };
-  UCHAR   ucRefDiv;                           //Output Parameter
-  UCHAR   ucPostDiv;                          //Output Parameter
-  UCHAR   ucCntlFlag;                         //Output Parameter
-  UCHAR   ucReserved;
-}COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V3;
-
-// ucCntlFlag
-#define ATOM_PLL_CNTL_FLAG_PLL_POST_DIV_EN          1
-#define ATOM_PLL_CNTL_FLAG_MPLL_VCO_MODE            2
-#define ATOM_PLL_CNTL_FLAG_FRACTION_DISABLE         4
-#define ATOM_PLL_CNTL_FLAG_SPLL_ISPARE_9
               8
-
-
-// V4 are only used for APU which PLL outside GPU
-typedef struct _COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V4
-{
-#if ATOM_BIG_ENDIAN
-  ULONG  ucPostDiv:8;        //return parameter: post divider which is

used to program to register directly

hw/display/atombios.h deleted +0 -4
-  ULONG  ulClock:24;         //Input= target clock, output = actual clock
-#else
-  ULONG  ulClock:24;         //Input= target clock, output = actual clock
-  ULONG  ucPostDiv:8;        //return parameter: post divider which is

used to program to register directly

hw/display/atombios.h deleted +0 -17
-#endif
-}COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V4;
-
-typedef struct _COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V5
-{
-  union
-  {
-    ATOM_COMPUTE_CLOCK_FREQ  ulClock;         //Input Parameter
-    ULONG ulClockParams;                      //ULONG access for BE
-    ATOM_S_MPLL_FB_DIVIDER   ulFbDiv;         //Output Parameter
-  };
-  UCHAR   ucRefDiv;                           //Output Parameter
-  UCHAR   ucPostDiv;                          //Output Parameter
-  union
-  {
-    UCHAR   ucCntlFlag;                       //Output Flags
-    UCHAR   ucInputFlag;                      //Input Flags.

ucInputFlag[0] - Strobe(1)/Performance(0) mode

hw/display/atombios.h deleted +0 -19
-  };
-  UCHAR   ucReserved;
-}COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V5;
-
-
-typedef struct _COMPUTE_GPU_CLOCK_INPUT_PARAMETERS_V1_6
-{
-  ATOM_COMPUTE_CLOCK_FREQ  ulClock;         //Input Parameter
-  ULONG   ulReserved[2];
-}COMPUTE_GPU_CLOCK_INPUT_PARAMETERS_V1_6;
-
-//ATOM_COMPUTE_CLOCK_FREQ.ulComputeClockFlag
-#define COMPUTE_GPUCLK_INPUT_FLAG_CLK_TYPE_MASK            0x0f
-#define COMPUTE_GPUCLK_INPUT_FLAG_DEFAULT_GPUCLK           0x00
-#define COMPUTE_GPUCLK_INPUT_FLAG_SCLK                     0x01
-
-typedef struct _COMPUTE_GPU_CLOCK_OUTPUT_PARAMETERS_V1_6
-{
-  COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V4  ulClock;         //Output

Parameter: ucPostDiv=DFS divider
- ATOM_S_MPLL_FB_DIVIDER ulFbDiv; //Output Parameter: PLL FB
divider
- UCHAR ucPllRefDiv; //Output Parameter: PLL ref
divider
- UCHAR ucPllPostDiv; //Output Parameter: PLL post
divider

hw/display/atombios.h deleted +0 -10
-  UCHAR   ucPllCntlFlag;                    //Output Flags: control flag
-  UCHAR   ucReserved;
-}COMPUTE_GPU_CLOCK_OUTPUT_PARAMETERS_V1_6;
-
-//ucPllCntlFlag
-#define SPLL_CNTL_FLAG_VCO_MODE_MASK            0x03
-
-
-// ucInputFlag
-#define ATOM_PLL_INPUT_FLAG_PLL_STROBE_MODE_EN  1   // 1-StrobeMode,

0-PerformanceMode

hw/display/atombios.h deleted +0 -8
-
-// use for ComputeMemoryClockParamTable
-typedef struct _COMPUTE_MEMORY_CLOCK_PARAM_PARAMETERS_V2_1
-{
-  union
-  {
-    ULONG  ulClock;
-    ATOM_S_MPLL_FB_DIVIDER   ulFbDiv;
 //Output:UPPER_WORD=FB_DIV_INTEGER,  LOWER_WORD=FB_DIV_FRAC shl

(16-FB_FRACTION_BITS)

hw/display/atombios.h deleted +0 -5
-  };
-  UCHAR   ucDllSpeed;                         //Output
-  UCHAR   ucPostDiv;                          //Output
-  union{
-    UCHAR   ucInputFlag;                      //Input :

ATOM_PLL_INPUT_FLAG_PLL_STROBE_MODE_EN: 1-StrobeMode, 0-PerformanceMode

hw/display/atombios.h deleted +0 -30
-    UCHAR   ucPllCntlFlag;                    //Output:
-  };
-  UCHAR   ucBWCntl;
-}COMPUTE_MEMORY_CLOCK_PARAM_PARAMETERS_V2_1;
-
-// definition of ucInputFlag
-#define MPLL_INPUT_FLAG_STROBE_MODE_EN          0x01
-// definition of ucPllCntlFlag
-#define MPLL_CNTL_FLAG_VCO_MODE_MASK            0x03
-#define MPLL_CNTL_FLAG_BYPASS_DQ_PLL            0x04
-#define MPLL_CNTL_FLAG_QDR_ENABLE               0x08
-#define MPLL_CNTL_FLAG_AD_HALF_RATE             0x10
-
-//MPLL_CNTL_FLAG_BYPASS_AD_PLL has a wrong name, should be BYPASS_DQ_PLL
-#define MPLL_CNTL_FLAG_BYPASS_AD_PLL            0x04
-
-typedef struct _DYNAMICE_MEMORY_SETTINGS_PARAMETER
-{
-  ATOM_COMPUTE_CLOCK_FREQ ulClock;
-  ULONG ulReserved[2];
-}DYNAMICE_MEMORY_SETTINGS_PARAMETER;
-
-typedef struct _DYNAMICE_ENGINE_SETTINGS_PARAMETER
-{
-  ATOM_COMPUTE_CLOCK_FREQ ulClock;
-  ULONG ulMemoryClock;
-  ULONG ulReserved;
-}DYNAMICE_ENGINE_SETTINGS_PARAMETER;
-
-/****************************************************************************/

<

#7 lore raw

Re: [RFC 09/10] Clean up Radeon Header files

Quoted 9 lines · Aleksandar Markovic
Quoted 3 lines · On Tuesday, November 26, 2019, <[email protected]> wrote:

From: Aaron Dominick <[email protected]>

---

Your commit message is poor. You should have clearly explained what do you do in this cleanup, and why.

That the commit message is not helpful is the smallest problem. Clearly there are more to improve in this series but please bear with new contributors who may need to get used to the workflow with git and QEMU patch submission and don't scare them away by criticising small problems without helping them.

This whole series is RFC and was stated in the original cover letter of the v1 series that this is work in progress submitted for enquiring about the direction taken not meant to be finished. That said it's still hard to review in this state so some improvements are needed. This v1 was an attempt for that but looks like it's not correct yet. I've found at least these problems:

- Series says it has 10 patches but I've only got 5-9 so it may have been edited by hand instead of properly using git format-patch.

- Patch 9 added to remove unneded headers at the end but that does not help to make Patch 5 more clear so this should be squashed into patch 5 instead (try git rebase -i and squash patches 5 and 9 so we end up with only the necessary files added instead of one patch adding them and another removing them later).

- The resulting patch 5 (that should really be 1) should be split into two: one copying existing files without modifying them and another patch adding new headers to make it clear what changes are made that is hard to find if copying and modifying files are done in the same patch.

As for the original question if this is the right direction I can't really tell but I think it may be but to make it work we will need to implement Microengine (aka. command processor/CCE/PM4) that reads packets from a shared memory buffer and converts them to register accesses but it's not documented so either we can get some info about it from somewhere (maybe AMD) or manage to reverse engineer the microcode or just implement its functionality not modeling the actual microengine the real card has but only do packet parsing that it should do.

There was another question about GART which I can't answer not knowing much about it but maybe we only need the addresses and then the device can access system memory directly so we don't need to model the whole IOMMU/DMA but I'm not sure what GART is used for so I may be wrong. Comments from those who know more about ATI GPUs are welcome.

Regards,
BALATON Zoltan

#8 lore raw
In reply to [email protected]
Quoted 9 lines · On Tue, Nov 26, 2019 at 06:14:27PM +0530, [email protected] wrote:

From: Aaron Dominick <[email protected]>

I have removed the botched patches and have got the code working upto the GART initialization.
I am not sure how to implement the GART. I am guessing it should be an IOMMU device but I think that is a bit much for an emulated card. The earlier problem of display probing seems to be resolved by using an R300 bios I got from TechPowerUP's GPU database:

	https://www.techpowerup.com/vgabios/14509/14509

I am NOT sure if we can distribute it in the QEMU source tree. If it does cause problems I can send a patch to remove it.

That site seems to be a repository of BIOS uploaded by arbitrary users, with no information on what license terms might apply to the uploads.

We have to therefore assume the worst and treat the BIOS images on that site as proprietary and not re-distributable, despite the fact that the site itself is acting as a 3rd party distributor.

IOW, we can't have this in QEMU git I'm afraid, unless someone can find a trustworthy vendor source for the original image with accompanying license information.

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#9 lore raw

Hi Daniel, Aaron.

Quoted 11 lines · Daniel P. Berrangé
Quoted 9 lines · On Tue, Nov 26, 2019 at 06:14:27PM +0530, [email protected] wrote:

From: Aaron Dominick <[email protected]>

I have removed the botched patches and have got the code working upto the GART initialization.
I am not sure how to implement the GART. I am guessing it should be an IOMMU device but I think that is a bit much for an emulated card. The earlier problem of display probing seems to be resolved by using an R300 bios I got from TechPowerUP's GPU database:

	https://www.techpowerup.com/vgabios/14509/14509

I am NOT sure if we can distribute it in the QEMU source tree. If it does cause problems I can send a patch to remove it.

Quoted 6 lines

That site seems to be a repository of BIOS uploaded by arbitrary users, with no information on what license terms might apply to the uploads.

We have to therefore assume the worst and treat the BIOS images on that site as proprietary and not re-distributable, despite the fact that the site itself is acting as a 3rd party distributor.

We can not redistribute this BIOS.

Quoted 3 lines

IOW, we can't have this in QEMU git I'm afraid, unless someone can find a trustworthy vendor source for the original image with accompanying license information.

Daniel, I think there is no problem if Aaron contributes a model of the R300 device to QEMU, right? This doesn't involve redistributing any BIOS.

Aaron: I never received patches 1-4 and 10 of your series, not sure why, maybe they are too big.

I recommend to rebase your series, squashing patch 9 over patch 5.

If you don't know about git-rebase, this blog is quite easy to understand:
https://thoughtbot.com/blog/git-interactive-rebase-squash-amend-rewriting-history

Regards,

Phil.

#10 lore raw
Quoted 21 lines · Philippe Mathieu-Daudé

Hi Daniel, Aaron.

Quoted 11 lines · Daniel P. Berrangé
Quoted 9 lines · On Tue, Nov 26, 2019 at 06:14:27PM +0530, [email protected] wrote:

From: Aaron Dominick <[email protected]>

I have removed the botched patches and have got the code working upto the GART initialization.
I am not sure how to implement the GART. I am guessing it should be an IOMMU device but I think that is a bit much for an emulated card. The earlier problem of display probing seems to be resolved by using an R300 bios I got from TechPowerUP's GPU database:

	https://www.techpowerup.com/vgabios/14509/14509

I am NOT sure if we can distribute it in the QEMU source tree. If it does cause problems I can send a patch to remove it.

Quoted 6 lines

That site seems to be a repository of BIOS uploaded by arbitrary users, with no information on what license terms might apply to the uploads.

We have to therefore assume the worst and treat the BIOS images on that site as proprietary and not re-distributable, despite the fact that the site itself is acting as a 3rd party distributor.

Quoted 8 lines

We can not redistribute this BIOS.

Quoted 3 lines

IOW, we can't have this in QEMU git I'm afraid, unless someone can find a trustworthy vendor source for the original image with accompanying license information.

Daniel, I think there is no problem if Aaron contributes a model of the R300 device to QEMU, right? This doesn't involve redistributing any BIOS.

Having just the device impl doesn't cause any legal problems.

It does become a slight usability issue, as any users need to go and find the suitable BIOS in order to use the device. No downstream OS vendors are going to be able to distribute this BIOS either

I don't know if we have hit this problem before & if we have any general policies about it ?

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#11 lore raw

Cc'ing more.

Quoted 31 lines · Daniel P. Berrangé
Quoted 21 lines · Philippe Mathieu-Daudé

Hi Daniel, Aaron.

Quoted 11 lines · Daniel P. Berrangé
Quoted 9 lines · On Tue, Nov 26, 2019 at 06:14:27PM +0530, [email protected] wrote:

From: Aaron Dominick <[email protected]>

I have removed the botched patches and have got the code working upto the GART initialization.
I am not sure how to implement the GART. I am guessing it should be an IOMMU device but I think that is a bit much for an emulated card. The earlier problem of display probing seems to be resolved by using an R300 bios I got from TechPowerUP's GPU database:

	https://www.techpowerup.com/vgabios/14509/14509

I am NOT sure if we can distribute it in the QEMU source tree. If it does cause problems I can send a patch to remove it.

Quoted 6 lines

That site seems to be a repository of BIOS uploaded by arbitrary users, with no information on what license terms might apply to the uploads.

We have to therefore assume the worst and treat the BIOS images on that site as proprietary and not re-distributable, despite the fact that the site itself is acting as a 3rd party distributor.

Quoted 8 lines

We can not redistribute this BIOS.

Quoted 3 lines

IOW, we can't have this in QEMU git I'm afraid, unless someone can find a trustworthy vendor source for the original image with accompanying license information.

Daniel, I think there is no problem if Aaron contributes a model of the R300 device to QEMU, right? This doesn't involve redistributing any BIOS.

Quoted 8 lines

Having just the device impl doesn't cause any legal problems.

It does become a slight usability issue, as any users need to go and find the suitable BIOS in order to use the device. No downstream OS vendors are going to be able to distribute this BIOS either

I don't know if we have hit this problem before & if we have any general policies about it ?

This appears to me the same case as a user downloading a proprietary driver/firmware at some vendor website, accepting the EULA, then using the driver within a QEMU VM.

No close source blob are redistributed, but users can still run them, and both party (the QEMU project, and the users) are legally correct, right? But IANAL.

#12 lore raw
Quoted 43 lines · Philippe Mathieu-Daudé

Cc'ing more.

Quoted 31 lines · Daniel P. Berrangé
Quoted 21 lines · Philippe Mathieu-Daudé

Hi Daniel, Aaron.

Quoted 11 lines · Daniel P. Berrangé
Quoted 9 lines · On Tue, Nov 26, 2019 at 06:14:27PM +0530, [email protected] wrote:

From: Aaron Dominick <[email protected]>

I have removed the botched patches and have got the code working upto the GART initialization.
I am not sure how to implement the GART. I am guessing it should be an IOMMU device but I think that is a bit much for an emulated card. The earlier problem of display probing seems to be resolved by using an R300 bios I got from TechPowerUP's GPU database:

	https://www.techpowerup.com/vgabios/14509/14509

I am NOT sure if we can distribute it in the QEMU source tree. If it does cause problems I can send a patch to remove it.

Quoted 6 lines

That site seems to be a repository of BIOS uploaded by arbitrary users, with no information on what license terms might apply to the uploads.

We have to therefore assume the worst and treat the BIOS images on that site as proprietary and not re-distributable, despite the fact that the site itself is acting as a 3rd party distributor.

Quoted 8 lines

We can not redistribute this BIOS.

Quoted 3 lines

IOW, we can't have this in QEMU git I'm afraid, unless someone can find a trustworthy vendor source for the original image with accompanying license information.

Daniel, I think there is no problem if Aaron contributes a model of the R300 device to QEMU, right? This doesn't involve redistributing any BIOS.

Quoted 8 lines

Having just the device impl doesn't cause any legal problems.

It does become a slight usability issue, as any users need to go and find the suitable BIOS in order to use the device. No downstream OS vendors are going to be able to distribute this BIOS either

I don't know if we have hit this problem before & if we have any general policies about it ?

Quoted 7 lines

This appears to me the same case as a user downloading a proprietary driver/firmware at some vendor website, accepting the EULA, then using the driver within a QEMU VM.

No close source blob are redistributed, but users can still run them, and both party (the QEMU project, and the users) are legally correct, right? But IANAL.

Well in this case the user wouldn't be reading or accepting any EULA, because this 3rd party site doesn't provide any such things with the firmware it is re-distributing.

IOW, the only way the user can use this device is to download the firmware from this 3rd site & ignore the lack of legal information they provide about license/distribution rules.

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#13 lore raw
In reply to Daniel P. Berrangé
Quoted 28 lines · Daniel P. Berrangé
Quoted 27 lines · Philippe Mathieu-Daudé

Hi Daniel, Aaron.

Quoted 11 lines · Daniel P. Berrangé
Quoted 9 lines · On Tue, Nov 26, 2019 at 06:14:27PM +0530, [email protected] wrote:

From: Aaron Dominick <[email protected]>

I have removed the botched patches and have got the code working upto the GART initialization.
I am not sure how to implement the GART. I am guessing it should be an IOMMU device but I think that is a bit much for an emulated card. The earlier problem of display probing seems to be resolved by using an R300 bios I got from TechPowerUP's GPU database:

	https://www.techpowerup.com/vgabios/14509/14509

I am NOT sure if we can distribute it in the QEMU source tree. If it does cause problems I can send a patch to remove it.

Quoted 6 lines

That site seems to be a repository of BIOS uploaded by arbitrary users, with no information on what license terms might apply to the uploads.

We have to therefore assume the worst and treat the BIOS images on that site as proprietary and not re-distributable, despite the fact that the site itself is acting as a 3rd party distributor.

We can not redistribute this BIOS.

Quoted 3 lines

IOW, we can't have this in QEMU git I'm afraid, unless someone can find a trustworthy vendor source for the original image with accompanying license information.

Quoted 8 lines
Quoted 2 lines

Daniel, I think there is no problem if Aaron contributes a model of the R300 device to QEMU, right? This doesn't involve redistributing any BIOS.

Having just the device impl doesn't cause any legal problems.

It does become a slight usability issue, as any users need to go and find the suitable BIOS in order to use the device. No downstream OS vendors are going to be able to distribute this BIOS either

We may be able to avoid this problem if we identify what the driver needs from the BIOS and implement that in our vgabios. Gerd has already added some tables that some drivers need in the latest vgabios version that's currently in git master (but those were for Rage128 and RV100 that ati-vga currently implements). Aaron, did you try with latest git master and does that still need a BIOS from a real card or if so do you happen to know what the driver needs from the BIOS? (It may be some tables/structure or BIOS calls that the QEMU vgabios-ati does not implement yet.) If that's not too difficult to add it may be implemented in QEMU's vgabios to avoid needing proprietary blobs. It could also be EDID access that may use different registers on R300 but I think that may be simple to fix if more details are known.

Quoted 2 lines

I don't know if we have hit this problem before & if we have any general policies about it ?

I don't know but this may be similar to boards needing firmware ROMs or the firmware blobs needed by some Linux kernel drivers. How are those handled? Distros usually put them in a non-free repo I think.

Regrads,
BALATON Zoltan

#14 lore raw
In reply to Daniel P. Berrangé

Hi,

Quoted 6 lines

It does become a slight usability issue, as any users need to go and find the suitable BIOS in order to use the device. No downstream OS vendors are going to be able to distribute this BIOS either

I don't know if we have hit this problem before & if we have any general policies about it ?

Booting from lsi scsi adapter used to work with a vendor bios only loooooong ago. Fixed by adding an lsi driver to seabios.

Building a r300 vgabios shouldn't be too hard, we already have support in seavgabios for the other ati variants emulated by qemu.

cheers,
Gerd

#15 lore raw
Quoted 6 lines · Gerd Hoffmann

Hi,

Quoted 4 lines

It does become a slight usability issue, as any users need to go and find the suitable BIOS in order to use the device. No downstream OS vendors are going to be able to distribute this BIOS either

Quoted 8 lines
Quoted 2 lines

I don't know if we have hit this problem before & if we have any general policies about it ?

Booting from lsi scsi adapter used to work with a vendor bios only loooooong ago. Fixed by adding an lsi driver to seabios.

Building a r300 vgabios shouldn't be too hard, we already have support in seavgabios for the other ati variants emulated by qemu.

That sounds reasonable, so it is fine to add r300 to QEMU without the BIOS.

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#16 lore raw

I tested my code with the vgabios-ati.bin rom file and it seems to get passed the earlier issue I had.
I have cleaned up my code and have sent a new patch series. The new one is pretty big but it contains only the necessary header files and it should be a little easier to review

Quoted 31 lines · Daniel P. Berrangé
Quoted 3 lines · Gerd Hoffmann

Hi,

Quoted 1 line

It does become a slight usability issue, as any users need to go and

find

Quoted 1 line
Quoted 1 line

the suitable BIOS in order to use the device. No downstream OS vendors

are

Quoted 10 lines
Quoted 4 lines

going to be able to distribute this BIOS either

I don't know if we have hit this problem before & if we have any general policies about it ?

Booting from lsi scsi adapter used to work with a vendor bios only loooooong ago. Fixed by adding an lsi driver to seabios.

Building a r300 vgabios shouldn't be too hard, we already have support in seavgabios for the other ati variants emulated by qemu.

That sounds reasonable, so it is fine to add r300 to QEMU without the BIOS.

Regards,
Daniel
--
|: https://berrange.com -o-
https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-
https://fstop138.berrange.com :|
|: https://entangle-photo.org -o-
https://www.instagram.com/dberrange :|

#17 lore raw

Hello,

Quoted 2 lines · Aaron Zakhrov

I tested my code with the vgabios-ati.bin rom file and it seems to get passed the earlier issue I had.

Good, so then the BIOS problem seems to be sorted for now. (Maybe it needed the tables or EDID support that some drivers use from the VGA BIOS.)

Quoted 1 line

I have cleaned up my code and have sent a new patch series. The new one is

I still got pathces twice so rebase may not have worked completely and changes are still not separate patches but hopefully there are less unnecessary files in the last series. If you have problem with rebase and using git to rework patches you could also start from a clean git tree then apply patches with patch command and make new separate commits to clean them up. This may be easier to do until you get familiar with git's more obscure commands.

Quoted 2 lines

pretty big but it contains only the necessary header files and it should be a little easier to review

I don't have time now to check all the added registers but is there a reason you're targetting r300 instead of trying to make rv100 working first? RV100 is a simpler chip with less features so you probably will have less to implement and it's also clearer what might be needed than having to implement a lot of new features the newer r300 may have. Once rv100 works it may be easier to update that to r300 than going for that right away, at least that's what I thought. If you think you can do all of r300 features or you need that for some reason I'm fine with trying to target r300 just saying that a more incremental approach may be easier to do.

I haven't checked this but I think what you get now is that the driver is trying to set up shared memory buffers via GART that it will use to send command packets to the GPU that the emulated chip will need to parse and convert to register access. This is the microengine/command processor/CCE/PM4 I've referred to before. Unless we implement this in some way it won't work as communication between the driver and card is done using this facility so this should be the next step before adding more registers and emulation. If you search for "ati microengine" it may turn up some documentation on this where the buffers and command packets are described but the actual microengine and it's microcode appears to be undocumented. I've also said before that Xenia emulator has some code to parse command packets of the XBox 360 GPU which is similar to some late r5xx GPUs so some of these might be useful for emulating previous Radeons as well.

Regards,
BALATON Zoltan