|
@@ -2937,7 +2937,7 @@
|
|
|
#define PIPE_FRMCOUNT_GM45(pipe) _PIPE(pipe, _PIPEA_FRMCOUNT_GM45, _PIPEB_FRMCOUNT_GM45)
|
|
|
|
|
|
/* Cursor A & B regs */
|
|
|
-#define _CURACNTR 0x70080
|
|
|
+#define _CURACNTR (dev_priv->info->display_mmio_offset + 0x70080)
|
|
|
/* Old style CUR*CNTR flags (desktop 8xx) */
|
|
|
#define CURSOR_ENABLE 0x80000000
|
|
|
#define CURSOR_GAMMA_ENABLE 0x40000000
|
|
@@ -2958,16 +2958,16 @@
|
|
|
#define MCURSOR_PIPE_A 0x00
|
|
|
#define MCURSOR_PIPE_B (1 << 28)
|
|
|
#define MCURSOR_GAMMA_ENABLE (1 << 26)
|
|
|
-#define _CURABASE 0x70084
|
|
|
-#define _CURAPOS 0x70088
|
|
|
+#define _CURABASE (dev_priv->info->display_mmio_offset + 0x70084)
|
|
|
+#define _CURAPOS (dev_priv->info->display_mmio_offset + 0x70088)
|
|
|
#define CURSOR_POS_MASK 0x007FF
|
|
|
#define CURSOR_POS_SIGN 0x8000
|
|
|
#define CURSOR_X_SHIFT 0
|
|
|
#define CURSOR_Y_SHIFT 16
|
|
|
#define CURSIZE 0x700a0
|
|
|
-#define _CURBCNTR 0x700c0
|
|
|
-#define _CURBBASE 0x700c4
|
|
|
-#define _CURBPOS 0x700c8
|
|
|
+#define _CURBCNTR (dev_priv->info->display_mmio_offset + 0x700c0)
|
|
|
+#define _CURBBASE (dev_priv->info->display_mmio_offset + 0x700c4)
|
|
|
+#define _CURBPOS (dev_priv->info->display_mmio_offset + 0x700c8)
|
|
|
|
|
|
#define _CURBCNTR_IVB 0x71080
|
|
|
#define _CURBBASE_IVB 0x71084
|