drm/radeon/kms: restore surface registers on resume.
[safe/jmp/linux-2.6] / drivers / gpu / drm / radeon / rv515.c
index 31a7f66..59632a5 100644 (file)
  */
 #include <linux/seq_file.h>
 #include "drmP.h"
-#include "rv515r.h"
+#include "rv515d.h"
 #include "radeon.h"
-#include "radeon_share.h"
-
-/* rv515 depends on : */
-void r100_hdp_reset(struct radeon_device *rdev);
-int r100_cp_reset(struct radeon_device *rdev);
-int r100_rb2d_reset(struct radeon_device *rdev);
-int r100_gui_wait_for_idle(struct radeon_device *rdev);
-int r100_cp_init(struct radeon_device *rdev, unsigned ring_size);
-int rv370_pcie_gart_enable(struct radeon_device *rdev);
-void rv370_pcie_gart_disable(struct radeon_device *rdev);
-void r420_pipes_init(struct radeon_device *rdev);
-void rs600_mc_disable_clients(struct radeon_device *rdev);
-void rs600_disable_vga(struct radeon_device *rdev);
-
-/* This files gather functions specifics to:
- * rv515
- *
- * Some of these functions might be used by newer ASICs.
- */
+#include "atom.h"
+#include "rv515_reg_safe.h"
+
+/* This files gather functions specifics to: rv515 */
 int rv515_debugfs_pipes_info_init(struct radeon_device *rdev);
 int rv515_debugfs_ga_info_init(struct radeon_device *rdev);
 void rv515_gpu_init(struct radeon_device *rdev);
 int rv515_mc_wait_for_idle(struct radeon_device *rdev);
 
-
-/*
- * MC
- */
-int rv515_mc_init(struct radeon_device *rdev)
+void rv515_debugfs(struct radeon_device *rdev)
 {
-       uint32_t tmp;
-       int r;
-
        if (r100_debugfs_rbbm_init(rdev)) {
                DRM_ERROR("Failed to register debugfs file for RBBM !\n");
        }
@@ -71,70 +49,8 @@ int rv515_mc_init(struct radeon_device *rdev)
        if (rv515_debugfs_ga_info_init(rdev)) {
                DRM_ERROR("Failed to register debugfs file for pipes !\n");
        }
-
-       rv515_gpu_init(rdev);
-       rv370_pcie_gart_disable(rdev);
-
-       /* Setup GPU memory space */
-       rdev->mc.vram_location = 0xFFFFFFFFUL;
-       rdev->mc.gtt_location = 0xFFFFFFFFUL;
-       if (rdev->flags & RADEON_IS_AGP) {
-               r = radeon_agp_init(rdev);
-               if (r) {
-                       printk(KERN_WARNING "[drm] Disabling AGP\n");
-                       rdev->flags &= ~RADEON_IS_AGP;
-                       rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;
-               } else {
-                       rdev->mc.gtt_location = rdev->mc.agp_base;
-               }
-       }
-       r = radeon_mc_setup(rdev);
-       if (r) {
-               return r;
-       }
-
-       /* Program GPU memory space */
-       rs600_mc_disable_clients(rdev);
-       if (rv515_mc_wait_for_idle(rdev)) {
-               printk(KERN_WARNING "Failed to wait MC idle while "
-                      "programming pipes. Bad things might happen.\n");
-       }
-       /* Write VRAM size in case we are limiting it */
-       WREG32(RADEON_CONFIG_MEMSIZE, rdev->mc.real_vram_size);
-       tmp = REG_SET(MC_FB_START, rdev->mc.vram_location >> 16);
-       WREG32(0x134, tmp);
-       tmp = rdev->mc.vram_location + rdev->mc.mc_vram_size - 1;
-       tmp = REG_SET(MC_FB_TOP, tmp >> 16);
-       tmp |= REG_SET(MC_FB_START, rdev->mc.vram_location >> 16);
-       WREG32_MC(MC_FB_LOCATION, tmp);
-       WREG32(HDP_FB_LOCATION, rdev->mc.vram_location >> 16);
-       WREG32(0x310, rdev->mc.vram_location);
-       if (rdev->flags & RADEON_IS_AGP) {
-               tmp = rdev->mc.gtt_location + rdev->mc.gtt_size - 1;
-               tmp = REG_SET(MC_AGP_TOP, tmp >> 16);
-               tmp |= REG_SET(MC_AGP_START, rdev->mc.gtt_location >> 16);
-               WREG32_MC(MC_AGP_LOCATION, tmp);
-               WREG32_MC(MC_AGP_BASE, rdev->mc.agp_base);
-               WREG32_MC(MC_AGP_BASE_2, 0);
-       } else {
-               WREG32_MC(MC_AGP_LOCATION, 0x0FFFFFFF);
-               WREG32_MC(MC_AGP_BASE, 0);
-               WREG32_MC(MC_AGP_BASE_2, 0);
-       }
-       return 0;
-}
-
-void rv515_mc_fini(struct radeon_device *rdev)
-{
-       rv370_pcie_gart_disable(rdev);
-       radeon_gart_table_vram_free(rdev);
-       radeon_gart_fini(rdev);
 }
 
-
-/*
- * Global GPU functions
- */
 void rv515_ring_start(struct radeon_device *rdev)
 {
        int r;
@@ -203,11 +119,6 @@ void rv515_ring_start(struct radeon_device *rdev)
        radeon_ring_unlock_commit(rdev);
 }
 
-void rv515_errata(struct radeon_device *rdev)
-{
-       rdev->pll_errata = 0;
-}
-
 int rv515_mc_wait_for_idle(struct radeon_device *rdev)
 {
        unsigned i;
@@ -224,6 +135,12 @@ int rv515_mc_wait_for_idle(struct radeon_device *rdev)
        return -1;
 }
 
+void rv515_vga_render_disable(struct radeon_device *rdev)
+{
+       WREG32(R_000300_VGA_RENDER_CONTROL,
+               RREG32(R_000300_VGA_RENDER_CONTROL) & C_000300_VGA_VSTATUS_CNTL);
+}
+
 void rv515_gpu_init(struct radeon_device *rdev)
 {
        unsigned pipe_select_current, gb_pipe_select, tmp;
@@ -236,7 +153,7 @@ void rv515_gpu_init(struct radeon_device *rdev)
                       "reseting GPU. Bad things might happen.\n");
        }
 
-       rs600_disable_vga(rdev);
+       rv515_vga_render_disable(rdev);
 
        r420_pipes_init(rdev);
        gb_pipe_select = RREG32(0x402C);
@@ -340,10 +257,6 @@ int rv515_gpu_reset(struct radeon_device *rdev)
        return 0;
 }
 
-
-/*
- * VRAM info
- */
 static void rv515_vram_get_type(struct radeon_device *rdev)
 {
        uint32_t tmp;
@@ -379,10 +292,6 @@ void rv515_vram_info(struct radeon_device *rdev)
        rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a);
 }
 
-
-/*
- * Indirect registers accessor
- */
 uint32_t rv515_mc_rreg(struct radeon_device *rdev, uint32_t reg)
 {
        uint32_t r;
@@ -400,9 +309,6 @@ void rv515_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v)
        WREG32(MC_IND_INDEX, 0);
 }
 
-/*
- * Debugfs info
- */
 #if defined(CONFIG_DEBUG_FS)
 static int rv515_debugfs_pipes_info(struct seq_file *m, void *data)
 {
@@ -464,301 +370,490 @@ int rv515_debugfs_ga_info_init(struct radeon_device *rdev)
 #endif
 }
 
+void rv515_mc_stop(struct radeon_device *rdev, struct rv515_mc_save *save)
+{
+       save->d1vga_control = RREG32(R_000330_D1VGA_CONTROL);
+       save->d2vga_control = RREG32(R_000338_D2VGA_CONTROL);
+       save->vga_render_control = RREG32(R_000300_VGA_RENDER_CONTROL);
+       save->vga_hdp_control = RREG32(R_000328_VGA_HDP_CONTROL);
+       save->d1crtc_control = RREG32(R_006080_D1CRTC_CONTROL);
+       save->d2crtc_control = RREG32(R_006880_D2CRTC_CONTROL);
+
+       /* Stop all video */
+       WREG32(R_0068E8_D2CRTC_UPDATE_LOCK, 0);
+       WREG32(R_000300_VGA_RENDER_CONTROL, 0);
+       WREG32(R_0060E8_D1CRTC_UPDATE_LOCK, 1);
+       WREG32(R_0068E8_D2CRTC_UPDATE_LOCK, 1);
+       WREG32(R_006080_D1CRTC_CONTROL, 0);
+       WREG32(R_006880_D2CRTC_CONTROL, 0);
+       WREG32(R_0060E8_D1CRTC_UPDATE_LOCK, 0);
+       WREG32(R_0068E8_D2CRTC_UPDATE_LOCK, 0);
+       WREG32(R_000330_D1VGA_CONTROL, 0);
+       WREG32(R_000338_D2VGA_CONTROL, 0);
+}
 
-/*
- * Asic initialization
- */
-static const unsigned r500_reg_safe_bm[219] = {
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
-       0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000,
-       0xF0000038, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0x1FFFFC78, 0xFFFFE000, 0xFFFFFFFE, 0xFFFFFFFF,
-       0x38CF8F50, 0xFFF88082, 0xFF0000FC, 0xFAE009FF,
-       0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
-       0xFFFF8CFC, 0xFFFFC1FF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFF80FFFF,
-       0x00000000, 0x00000000, 0x00000000, 0x00000000,
-       0x0003FC01, 0x3FFFFCF8, 0xFE800B19, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-       0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-};
+void rv515_mc_resume(struct radeon_device *rdev, struct rv515_mc_save *save)
+{
+       WREG32(R_006110_D1GRPH_PRIMARY_SURFACE_ADDRESS, rdev->mc.vram_start);
+       WREG32(R_006118_D1GRPH_SECONDARY_SURFACE_ADDRESS, rdev->mc.vram_start);
+       WREG32(R_006910_D2GRPH_PRIMARY_SURFACE_ADDRESS, rdev->mc.vram_start);
+       WREG32(R_006918_D2GRPH_SECONDARY_SURFACE_ADDRESS, rdev->mc.vram_start);
+       WREG32(R_000310_VGA_MEMORY_BASE_ADDRESS, rdev->mc.vram_start);
+       /* Unlock host access */
+       WREG32(R_000328_VGA_HDP_CONTROL, save->vga_hdp_control);
+       mdelay(1);
+       /* Restore video state */
+       WREG32(R_000330_D1VGA_CONTROL, save->d1vga_control);
+       WREG32(R_000338_D2VGA_CONTROL, save->d2vga_control);
+       WREG32(R_0060E8_D1CRTC_UPDATE_LOCK, 1);
+       WREG32(R_0068E8_D2CRTC_UPDATE_LOCK, 1);
+       WREG32(R_006080_D1CRTC_CONTROL, save->d1crtc_control);
+       WREG32(R_006880_D2CRTC_CONTROL, save->d2crtc_control);
+       WREG32(R_0060E8_D1CRTC_UPDATE_LOCK, 0);
+       WREG32(R_0068E8_D2CRTC_UPDATE_LOCK, 0);
+       WREG32(R_000300_VGA_RENDER_CONTROL, save->vga_render_control);
+}
 
-int rv515_init(struct radeon_device *rdev)
+void rv515_mc_program(struct radeon_device *rdev)
+{
+       struct rv515_mc_save save;
+
+       /* Stops all mc clients */
+       rv515_mc_stop(rdev, &save);
+
+       /* Wait for mc idle */
+       if (rv515_mc_wait_for_idle(rdev))
+               dev_warn(rdev->dev, "Wait MC idle timeout before updating MC.\n");
+       /* Write VRAM size in case we are limiting it */
+       WREG32(R_0000F8_CONFIG_MEMSIZE, rdev->mc.real_vram_size);
+       /* Program MC, should be a 32bits limited address space */
+       WREG32_MC(R_000001_MC_FB_LOCATION,
+                       S_000001_MC_FB_START(rdev->mc.vram_start >> 16) |
+                       S_000001_MC_FB_TOP(rdev->mc.vram_end >> 16));
+       WREG32(R_000134_HDP_FB_LOCATION,
+               S_000134_HDP_FB_START(rdev->mc.vram_start >> 16));
+       if (rdev->flags & RADEON_IS_AGP) {
+               WREG32_MC(R_000002_MC_AGP_LOCATION,
+                       S_000002_MC_AGP_START(rdev->mc.gtt_start >> 16) |
+                       S_000002_MC_AGP_TOP(rdev->mc.gtt_end >> 16));
+               WREG32_MC(R_000003_MC_AGP_BASE, lower_32_bits(rdev->mc.agp_base));
+               WREG32_MC(R_000004_MC_AGP_BASE_2,
+                       S_000004_AGP_BASE_ADDR_2(upper_32_bits(rdev->mc.agp_base)));
+       } else {
+               WREG32_MC(R_000002_MC_AGP_LOCATION, 0xFFFFFFFF);
+               WREG32_MC(R_000003_MC_AGP_BASE, 0);
+               WREG32_MC(R_000004_MC_AGP_BASE_2, 0);
+       }
+
+       rv515_mc_resume(rdev, &save);
+}
+
+void rv515_clock_startup(struct radeon_device *rdev)
+{
+       if (radeon_dynclks != -1 && radeon_dynclks)
+               radeon_atom_set_clock_gating(rdev, 1);
+       /* We need to force on some of the block */
+       WREG32_PLL(R_00000F_CP_DYN_CNTL,
+               RREG32_PLL(R_00000F_CP_DYN_CNTL) | S_00000F_CP_FORCEON(1));
+       WREG32_PLL(R_000011_E2_DYN_CNTL,
+               RREG32_PLL(R_000011_E2_DYN_CNTL) | S_000011_E2_FORCEON(1));
+       WREG32_PLL(R_000013_IDCT_DYN_CNTL,
+               RREG32_PLL(R_000013_IDCT_DYN_CNTL) | S_000013_IDCT_FORCEON(1));
+}
+
+static int rv515_startup(struct radeon_device *rdev)
 {
-       rdev->config.r300.reg_safe_bm = r500_reg_safe_bm;
-       rdev->config.r300.reg_safe_bm_size = ARRAY_SIZE(r500_reg_safe_bm);
+       int r;
+
+       rv515_mc_program(rdev);
+       /* Resume clock */
+       rv515_clock_startup(rdev);
+       /* Initialize GPU configuration (# pipes, ...) */
+       rv515_gpu_init(rdev);
+       /* Initialize GART (initialize after TTM so we can allocate
+        * memory through TTM but finalize after TTM) */
+       if (rdev->flags & RADEON_IS_PCIE) {
+               r = rv370_pcie_gart_enable(rdev);
+               if (r)
+                       return r;
+       }
+       /* Enable IRQ */
+       rs600_irq_set(rdev);
+       /* 1M ring buffer */
+       r = r100_cp_init(rdev, 1024 * 1024);
+       if (r) {
+               dev_err(rdev->dev, "failled initializing CP (%d).\n", r);
+               return r;
+       }
+       r = r100_wb_init(rdev);
+       if (r)
+               dev_err(rdev->dev, "failled initializing WB (%d).\n", r);
+       r = r100_ib_init(rdev);
+       if (r) {
+               dev_err(rdev->dev, "failled initializing IB (%d).\n", r);
+               return r;
+       }
        return 0;
 }
 
-void atom_rv515_force_tv_scaler(struct radeon_device *rdev)
+int rv515_resume(struct radeon_device *rdev)
 {
+       /* Make sur GART are not working */
+       if (rdev->flags & RADEON_IS_PCIE)
+               rv370_pcie_gart_disable(rdev);
+       /* Resume clock before doing reset */
+       rv515_clock_startup(rdev);
+       /* Reset gpu before posting otherwise ATOM will enter infinite loop */
+       if (radeon_gpu_reset(rdev)) {
+               dev_warn(rdev->dev, "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n",
+                       RREG32(R_000E40_RBBM_STATUS),
+                       RREG32(R_0007C0_CP_STAT));
+       }
+       /* post */
+       atom_asic_init(rdev->mode_info.atom_context);
+       /* Resume clock after posting */
+       rv515_clock_startup(rdev);
+       /* Initialize surface registers */
+       radeon_surface_init(rdev);
+       return rv515_startup(rdev);
+}
 
-       WREG32(0x659C, 0x0);
-       WREG32(0x6594, 0x705);
-       WREG32(0x65A4, 0x10001);
-       WREG32(0x65D8, 0x0);
-       WREG32(0x65B0, 0x0);
-       WREG32(0x65C0, 0x0);
-       WREG32(0x65D4, 0x0);
-       WREG32(0x6578, 0x0);
-       WREG32(0x657C, 0x841880A8);
-       WREG32(0x6578, 0x1);
-       WREG32(0x657C, 0x84208680);
-       WREG32(0x6578, 0x2);
-       WREG32(0x657C, 0xBFF880B0);
-       WREG32(0x6578, 0x100);
-       WREG32(0x657C, 0x83D88088);
-       WREG32(0x6578, 0x101);
-       WREG32(0x657C, 0x84608680);
-       WREG32(0x6578, 0x102);
-       WREG32(0x657C, 0xBFF080D0);
-       WREG32(0x6578, 0x200);
-       WREG32(0x657C, 0x83988068);
-       WREG32(0x6578, 0x201);
-       WREG32(0x657C, 0x84A08680);
-       WREG32(0x6578, 0x202);
-       WREG32(0x657C, 0xBFF080F8);
-       WREG32(0x6578, 0x300);
-       WREG32(0x657C, 0x83588058);
-       WREG32(0x6578, 0x301);
-       WREG32(0x657C, 0x84E08660);
-       WREG32(0x6578, 0x302);
-       WREG32(0x657C, 0xBFF88120);
-       WREG32(0x6578, 0x400);
-       WREG32(0x657C, 0x83188040);
-       WREG32(0x6578, 0x401);
-       WREG32(0x657C, 0x85008660);
-       WREG32(0x6578, 0x402);
-       WREG32(0x657C, 0xBFF88150);
-       WREG32(0x6578, 0x500);
-       WREG32(0x657C, 0x82D88030);
-       WREG32(0x6578, 0x501);
-       WREG32(0x657C, 0x85408640);
-       WREG32(0x6578, 0x502);
-       WREG32(0x657C, 0xBFF88180);
-       WREG32(0x6578, 0x600);
-       WREG32(0x657C, 0x82A08018);
-       WREG32(0x6578, 0x601);
-       WREG32(0x657C, 0x85808620);
-       WREG32(0x6578, 0x602);
-       WREG32(0x657C, 0xBFF081B8);
-       WREG32(0x6578, 0x700);
-       WREG32(0x657C, 0x82608010);
-       WREG32(0x6578, 0x701);
-       WREG32(0x657C, 0x85A08600);
-       WREG32(0x6578, 0x702);
-       WREG32(0x657C, 0x800081F0);
-       WREG32(0x6578, 0x800);
-       WREG32(0x657C, 0x8228BFF8);
-       WREG32(0x6578, 0x801);
-       WREG32(0x657C, 0x85E085E0);
-       WREG32(0x6578, 0x802);
-       WREG32(0x657C, 0xBFF88228);
-       WREG32(0x6578, 0x10000);
-       WREG32(0x657C, 0x82A8BF00);
-       WREG32(0x6578, 0x10001);
-       WREG32(0x657C, 0x82A08CC0);
-       WREG32(0x6578, 0x10002);
-       WREG32(0x657C, 0x8008BEF8);
-       WREG32(0x6578, 0x10100);
-       WREG32(0x657C, 0x81F0BF28);
-       WREG32(0x6578, 0x10101);
-       WREG32(0x657C, 0x83608CA0);
-       WREG32(0x6578, 0x10102);
-       WREG32(0x657C, 0x8018BED0);
-       WREG32(0x6578, 0x10200);
-       WREG32(0x657C, 0x8148BF38);
-       WREG32(0x6578, 0x10201);
-       WREG32(0x657C, 0x84408C80);
-       WREG32(0x6578, 0x10202);
-       WREG32(0x657C, 0x8008BEB8);
-       WREG32(0x6578, 0x10300);
-       WREG32(0x657C, 0x80B0BF78);
-       WREG32(0x6578, 0x10301);
-       WREG32(0x657C, 0x85008C20);
-       WREG32(0x6578, 0x10302);
-       WREG32(0x657C, 0x8020BEA0);
-       WREG32(0x6578, 0x10400);
-       WREG32(0x657C, 0x8028BF90);
-       WREG32(0x6578, 0x10401);
-       WREG32(0x657C, 0x85E08BC0);
-       WREG32(0x6578, 0x10402);
-       WREG32(0x657C, 0x8018BE90);
-       WREG32(0x6578, 0x10500);
-       WREG32(0x657C, 0xBFB8BFB0);
-       WREG32(0x6578, 0x10501);
-       WREG32(0x657C, 0x86C08B40);
-       WREG32(0x6578, 0x10502);
-       WREG32(0x657C, 0x8010BE90);
-       WREG32(0x6578, 0x10600);
-       WREG32(0x657C, 0xBF58BFC8);
-       WREG32(0x6578, 0x10601);
-       WREG32(0x657C, 0x87A08AA0);
-       WREG32(0x6578, 0x10602);
-       WREG32(0x657C, 0x8010BE98);
-       WREG32(0x6578, 0x10700);
-       WREG32(0x657C, 0xBF10BFF0);
-       WREG32(0x6578, 0x10701);
-       WREG32(0x657C, 0x886089E0);
-       WREG32(0x6578, 0x10702);
-       WREG32(0x657C, 0x8018BEB0);
-       WREG32(0x6578, 0x10800);
-       WREG32(0x657C, 0xBED8BFE8);
-       WREG32(0x6578, 0x10801);
-       WREG32(0x657C, 0x89408940);
-       WREG32(0x6578, 0x10802);
-       WREG32(0x657C, 0xBFE8BED8);
-       WREG32(0x6578, 0x20000);
-       WREG32(0x657C, 0x80008000);
-       WREG32(0x6578, 0x20001);
-       WREG32(0x657C, 0x90008000);
-       WREG32(0x6578, 0x20002);
-       WREG32(0x657C, 0x80008000);
-       WREG32(0x6578, 0x20003);
-       WREG32(0x657C, 0x80008000);
-       WREG32(0x6578, 0x20100);
-       WREG32(0x657C, 0x80108000);
-       WREG32(0x6578, 0x20101);
-       WREG32(0x657C, 0x8FE0BF70);
-       WREG32(0x6578, 0x20102);
-       WREG32(0x657C, 0xBFE880C0);
-       WREG32(0x6578, 0x20103);
-       WREG32(0x657C, 0x80008000);
-       WREG32(0x6578, 0x20200);
-       WREG32(0x657C, 0x8018BFF8);
-       WREG32(0x6578, 0x20201);
-       WREG32(0x657C, 0x8F80BF08);
-       WREG32(0x6578, 0x20202);
-       WREG32(0x657C, 0xBFD081A0);
-       WREG32(0x6578, 0x20203);
-       WREG32(0x657C, 0xBFF88000);
-       WREG32(0x6578, 0x20300);
-       WREG32(0x657C, 0x80188000);
-       WREG32(0x6578, 0x20301);
-       WREG32(0x657C, 0x8EE0BEC0);
-       WREG32(0x6578, 0x20302);
-       WREG32(0x657C, 0xBFB082A0);
-       WREG32(0x6578, 0x20303);
-       WREG32(0x657C, 0x80008000);
-       WREG32(0x6578, 0x20400);
-       WREG32(0x657C, 0x80188000);
-       WREG32(0x6578, 0x20401);
-       WREG32(0x657C, 0x8E00BEA0);
-       WREG32(0x6578, 0x20402);
-       WREG32(0x657C, 0xBF8883C0);
-       WREG32(0x6578, 0x20403);
-       WREG32(0x657C, 0x80008000);
-       WREG32(0x6578, 0x20500);
-       WREG32(0x657C, 0x80188000);
-       WREG32(0x6578, 0x20501);
-       WREG32(0x657C, 0x8D00BE90);
-       WREG32(0x6578, 0x20502);
-       WREG32(0x657C, 0xBF588500);
-       WREG32(0x6578, 0x20503);
-       WREG32(0x657C, 0x80008008);
-       WREG32(0x6578, 0x20600);
-       WREG32(0x657C, 0x80188000);
-       WREG32(0x6578, 0x20601);
-       WREG32(0x657C, 0x8BC0BE98);
-       WREG32(0x6578, 0x20602);
-       WREG32(0x657C, 0xBF308660);
-       WREG32(0x6578, 0x20603);
-       WREG32(0x657C, 0x80008008);
-       WREG32(0x6578, 0x20700);
-       WREG32(0x657C, 0x80108000);
-       WREG32(0x6578, 0x20701);
-       WREG32(0x657C, 0x8A80BEB0);
-       WREG32(0x6578, 0x20702);
-       WREG32(0x657C, 0xBF0087C0);
-       WREG32(0x6578, 0x20703);
-       WREG32(0x657C, 0x80008008);
-       WREG32(0x6578, 0x20800);
-       WREG32(0x657C, 0x80108000);
-       WREG32(0x6578, 0x20801);
-       WREG32(0x657C, 0x8920BED0);
-       WREG32(0x6578, 0x20802);
-       WREG32(0x657C, 0xBED08920);
-       WREG32(0x6578, 0x20803);
-       WREG32(0x657C, 0x80008010);
-       WREG32(0x6578, 0x30000);
-       WREG32(0x657C, 0x90008000);
-       WREG32(0x6578, 0x30001);
-       WREG32(0x657C, 0x80008000);
-       WREG32(0x6578, 0x30100);
-       WREG32(0x657C, 0x8FE0BF90);
-       WREG32(0x6578, 0x30101);
-       WREG32(0x657C, 0xBFF880A0);
-       WREG32(0x6578, 0x30200);
-       WREG32(0x657C, 0x8F60BF40);
-       WREG32(0x6578, 0x30201);
-       WREG32(0x657C, 0xBFE88180);
-       WREG32(0x6578, 0x30300);
-       WREG32(0x657C, 0x8EC0BF00);
-       WREG32(0x6578, 0x30301);
-       WREG32(0x657C, 0xBFC88280);
-       WREG32(0x6578, 0x30400);
-       WREG32(0x657C, 0x8DE0BEE0);
-       WREG32(0x6578, 0x30401);
-       WREG32(0x657C, 0xBFA083A0);
-       WREG32(0x6578, 0x30500);
-       WREG32(0x657C, 0x8CE0BED0);
-       WREG32(0x6578, 0x30501);
-       WREG32(0x657C, 0xBF7884E0);
-       WREG32(0x6578, 0x30600);
-       WREG32(0x657C, 0x8BA0BED8);
-       WREG32(0x6578, 0x30601);
-       WREG32(0x657C, 0xBF508640);
-       WREG32(0x6578, 0x30700);
-       WREG32(0x657C, 0x8A60BEE8);
-       WREG32(0x6578, 0x30701);
-       WREG32(0x657C, 0xBF2087A0);
-       WREG32(0x6578, 0x30800);
-       WREG32(0x657C, 0x8900BF00);
-       WREG32(0x6578, 0x30801);
-       WREG32(0x657C, 0xBF008900);
+int rv515_suspend(struct radeon_device *rdev)
+{
+       r100_cp_disable(rdev);
+       r100_wb_disable(rdev);
+       rs600_irq_disable(rdev);
+       if (rdev->flags & RADEON_IS_PCIE)
+               rv370_pcie_gart_disable(rdev);
+       return 0;
+}
+
+void rv515_set_safe_registers(struct radeon_device *rdev)
+{
+       rdev->config.r300.reg_safe_bm = rv515_reg_safe_bm;
+       rdev->config.r300.reg_safe_bm_size = ARRAY_SIZE(rv515_reg_safe_bm);
+}
+
+void rv515_fini(struct radeon_device *rdev)
+{
+       rv515_suspend(rdev);
+       r100_cp_fini(rdev);
+       r100_wb_fini(rdev);
+       r100_ib_fini(rdev);
+       radeon_gem_fini(rdev);
+       rv370_pcie_gart_fini(rdev);
+       radeon_agp_fini(rdev);
+       radeon_irq_kms_fini(rdev);
+       radeon_fence_driver_fini(rdev);
+       radeon_bo_fini(rdev);
+       radeon_atombios_fini(rdev);
+       kfree(rdev->bios);
+       rdev->bios = NULL;
+}
+
+int rv515_init(struct radeon_device *rdev)
+{
+       int r;
+
+       /* Initialize scratch registers */
+       radeon_scratch_init(rdev);
+       /* Initialize surface registers */
+       radeon_surface_init(rdev);
+       /* TODO: disable VGA need to use VGA request */
+       /* BIOS*/
+       if (!radeon_get_bios(rdev)) {
+               if (ASIC_IS_AVIVO(rdev))
+                       return -EINVAL;
+       }
+       if (rdev->is_atom_bios) {
+               r = radeon_atombios_init(rdev);
+               if (r)
+                       return r;
+       } else {
+               dev_err(rdev->dev, "Expecting atombios for RV515 GPU\n");
+               return -EINVAL;
+       }
+       /* Reset gpu before posting otherwise ATOM will enter infinite loop */
+       if (radeon_gpu_reset(rdev)) {
+               dev_warn(rdev->dev,
+                       "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n",
+                       RREG32(R_000E40_RBBM_STATUS),
+                       RREG32(R_0007C0_CP_STAT));
+       }
+       /* check if cards are posted or not */
+       if (radeon_boot_test_post_card(rdev) == false)
+               return -EINVAL;
+       /* Initialize clocks */
+       radeon_get_clock_info(rdev->ddev);
+       /* Initialize power management */
+       radeon_pm_init(rdev);
+       /* Get vram informations */
+       rv515_vram_info(rdev);
+       /* Initialize memory controller (also test AGP) */
+       r = r420_mc_init(rdev);
+       if (r)
+               return r;
+       rv515_debugfs(rdev);
+       /* Fence driver */
+       r = radeon_fence_driver_init(rdev);
+       if (r)
+               return r;
+       r = radeon_irq_kms_init(rdev);
+       if (r)
+               return r;
+       /* Memory manager */
+       r = radeon_bo_init(rdev);
+       if (r)
+               return r;
+       r = rv370_pcie_gart_init(rdev);
+       if (r)
+               return r;
+       rv515_set_safe_registers(rdev);
+       rdev->accel_working = true;
+       r = rv515_startup(rdev);
+       if (r) {
+               /* Somethings want wront with the accel init stop accel */
+               dev_err(rdev->dev, "Disabling GPU acceleration\n");
+               rv515_suspend(rdev);
+               r100_cp_fini(rdev);
+               r100_wb_fini(rdev);
+               r100_ib_fini(rdev);
+               rv370_pcie_gart_fini(rdev);
+               radeon_agp_fini(rdev);
+               radeon_irq_kms_fini(rdev);
+               rdev->accel_working = false;
+       }
+       return 0;
+}
+
+void atom_rv515_force_tv_scaler(struct radeon_device *rdev, struct radeon_crtc *crtc)
+{
+       int index_reg = 0x6578 + crtc->crtc_offset;
+       int data_reg = 0x657c + crtc->crtc_offset;
+
+       WREG32(0x659C + crtc->crtc_offset, 0x0);
+       WREG32(0x6594 + crtc->crtc_offset, 0x705);
+       WREG32(0x65A4 + crtc->crtc_offset, 0x10001);
+       WREG32(0x65D8 + crtc->crtc_offset, 0x0);
+       WREG32(0x65B0 + crtc->crtc_offset, 0x0);
+       WREG32(0x65C0 + crtc->crtc_offset, 0x0);
+       WREG32(0x65D4 + crtc->crtc_offset, 0x0);
+       WREG32(index_reg, 0x0);
+       WREG32(data_reg, 0x841880A8);
+       WREG32(index_reg, 0x1);
+       WREG32(data_reg, 0x84208680);
+       WREG32(index_reg, 0x2);
+       WREG32(data_reg, 0xBFF880B0);
+       WREG32(index_reg, 0x100);
+       WREG32(data_reg, 0x83D88088);
+       WREG32(index_reg, 0x101);
+       WREG32(data_reg, 0x84608680);
+       WREG32(index_reg, 0x102);
+       WREG32(data_reg, 0xBFF080D0);
+       WREG32(index_reg, 0x200);
+       WREG32(data_reg, 0x83988068);
+       WREG32(index_reg, 0x201);
+       WREG32(data_reg, 0x84A08680);
+       WREG32(index_reg, 0x202);
+       WREG32(data_reg, 0xBFF080F8);
+       WREG32(index_reg, 0x300);
+       WREG32(data_reg, 0x83588058);
+       WREG32(index_reg, 0x301);
+       WREG32(data_reg, 0x84E08660);
+       WREG32(index_reg, 0x302);
+       WREG32(data_reg, 0xBFF88120);
+       WREG32(index_reg, 0x400);
+       WREG32(data_reg, 0x83188040);
+       WREG32(index_reg, 0x401);
+       WREG32(data_reg, 0x85008660);
+       WREG32(index_reg, 0x402);
+       WREG32(data_reg, 0xBFF88150);
+       WREG32(index_reg, 0x500);
+       WREG32(data_reg, 0x82D88030);
+       WREG32(index_reg, 0x501);
+       WREG32(data_reg, 0x85408640);
+       WREG32(index_reg, 0x502);
+       WREG32(data_reg, 0xBFF88180);
+       WREG32(index_reg, 0x600);
+       WREG32(data_reg, 0x82A08018);
+       WREG32(index_reg, 0x601);
+       WREG32(data_reg, 0x85808620);
+       WREG32(index_reg, 0x602);
+       WREG32(data_reg, 0xBFF081B8);
+       WREG32(index_reg, 0x700);
+       WREG32(data_reg, 0x82608010);
+       WREG32(index_reg, 0x701);
+       WREG32(data_reg, 0x85A08600);
+       WREG32(index_reg, 0x702);
+       WREG32(data_reg, 0x800081F0);
+       WREG32(index_reg, 0x800);
+       WREG32(data_reg, 0x8228BFF8);
+       WREG32(index_reg, 0x801);
+       WREG32(data_reg, 0x85E085E0);
+       WREG32(index_reg, 0x802);
+       WREG32(data_reg, 0xBFF88228);
+       WREG32(index_reg, 0x10000);
+       WREG32(data_reg, 0x82A8BF00);
+       WREG32(index_reg, 0x10001);
+       WREG32(data_reg, 0x82A08CC0);
+       WREG32(index_reg, 0x10002);
+       WREG32(data_reg, 0x8008BEF8);
+       WREG32(index_reg, 0x10100);
+       WREG32(data_reg, 0x81F0BF28);
+       WREG32(index_reg, 0x10101);
+       WREG32(data_reg, 0x83608CA0);
+       WREG32(index_reg, 0x10102);
+       WREG32(data_reg, 0x8018BED0);
+       WREG32(index_reg, 0x10200);
+       WREG32(data_reg, 0x8148BF38);
+       WREG32(index_reg, 0x10201);
+       WREG32(data_reg, 0x84408C80);
+       WREG32(index_reg, 0x10202);
+       WREG32(data_reg, 0x8008BEB8);
+       WREG32(index_reg, 0x10300);
+       WREG32(data_reg, 0x80B0BF78);
+       WREG32(index_reg, 0x10301);
+       WREG32(data_reg, 0x85008C20);
+       WREG32(index_reg, 0x10302);
+       WREG32(data_reg, 0x8020BEA0);
+       WREG32(index_reg, 0x10400);
+       WREG32(data_reg, 0x8028BF90);
+       WREG32(index_reg, 0x10401);
+       WREG32(data_reg, 0x85E08BC0);
+       WREG32(index_reg, 0x10402);
+       WREG32(data_reg, 0x8018BE90);
+       WREG32(index_reg, 0x10500);
+       WREG32(data_reg, 0xBFB8BFB0);
+       WREG32(index_reg, 0x10501);
+       WREG32(data_reg, 0x86C08B40);
+       WREG32(index_reg, 0x10502);
+       WREG32(data_reg, 0x8010BE90);
+       WREG32(index_reg, 0x10600);
+       WREG32(data_reg, 0xBF58BFC8);
+       WREG32(index_reg, 0x10601);
+       WREG32(data_reg, 0x87A08AA0);
+       WREG32(index_reg, 0x10602);
+       WREG32(data_reg, 0x8010BE98);
+       WREG32(index_reg, 0x10700);
+       WREG32(data_reg, 0xBF10BFF0);
+       WREG32(index_reg, 0x10701);
+       WREG32(data_reg, 0x886089E0);
+       WREG32(index_reg, 0x10702);
+       WREG32(data_reg, 0x8018BEB0);
+       WREG32(index_reg, 0x10800);
+       WREG32(data_reg, 0xBED8BFE8);
+       WREG32(index_reg, 0x10801);
+       WREG32(data_reg, 0x89408940);
+       WREG32(index_reg, 0x10802);
+       WREG32(data_reg, 0xBFE8BED8);
+       WREG32(index_reg, 0x20000);
+       WREG32(data_reg, 0x80008000);
+       WREG32(index_reg, 0x20001);
+       WREG32(data_reg, 0x90008000);
+       WREG32(index_reg, 0x20002);
+       WREG32(data_reg, 0x80008000);
+       WREG32(index_reg, 0x20003);
+       WREG32(data_reg, 0x80008000);
+       WREG32(index_reg, 0x20100);
+       WREG32(data_reg, 0x80108000);
+       WREG32(index_reg, 0x20101);
+       WREG32(data_reg, 0x8FE0BF70);
+       WREG32(index_reg, 0x20102);
+       WREG32(data_reg, 0xBFE880C0);
+       WREG32(index_reg, 0x20103);
+       WREG32(data_reg, 0x80008000);
+       WREG32(index_reg, 0x20200);
+       WREG32(data_reg, 0x8018BFF8);
+       WREG32(index_reg, 0x20201);
+       WREG32(data_reg, 0x8F80BF08);
+       WREG32(index_reg, 0x20202);
+       WREG32(data_reg, 0xBFD081A0);
+       WREG32(index_reg, 0x20203);
+       WREG32(data_reg, 0xBFF88000);
+       WREG32(index_reg, 0x20300);
+       WREG32(data_reg, 0x80188000);
+       WREG32(index_reg, 0x20301);
+       WREG32(data_reg, 0x8EE0BEC0);
+       WREG32(index_reg, 0x20302);
+       WREG32(data_reg, 0xBFB082A0);
+       WREG32(index_reg, 0x20303);
+       WREG32(data_reg, 0x80008000);
+       WREG32(index_reg, 0x20400);
+       WREG32(data_reg, 0x80188000);
+       WREG32(index_reg, 0x20401);
+       WREG32(data_reg, 0x8E00BEA0);
+       WREG32(index_reg, 0x20402);
+       WREG32(data_reg, 0xBF8883C0);
+       WREG32(index_reg, 0x20403);
+       WREG32(data_reg, 0x80008000);
+       WREG32(index_reg, 0x20500);
+       WREG32(data_reg, 0x80188000);
+       WREG32(index_reg, 0x20501);
+       WREG32(data_reg, 0x8D00BE90);
+       WREG32(index_reg, 0x20502);
+       WREG32(data_reg, 0xBF588500);
+       WREG32(index_reg, 0x20503);
+       WREG32(data_reg, 0x80008008);
+       WREG32(index_reg, 0x20600);
+       WREG32(data_reg, 0x80188000);
+       WREG32(index_reg, 0x20601);
+       WREG32(data_reg, 0x8BC0BE98);
+       WREG32(index_reg, 0x20602);
+       WREG32(data_reg, 0xBF308660);
+       WREG32(index_reg, 0x20603);
+       WREG32(data_reg, 0x80008008);
+       WREG32(index_reg, 0x20700);
+       WREG32(data_reg, 0x80108000);
+       WREG32(index_reg, 0x20701);
+       WREG32(data_reg, 0x8A80BEB0);
+       WREG32(index_reg, 0x20702);
+       WREG32(data_reg, 0xBF0087C0);
+       WREG32(index_reg, 0x20703);
+       WREG32(data_reg, 0x80008008);
+       WREG32(index_reg, 0x20800);
+       WREG32(data_reg, 0x80108000);
+       WREG32(index_reg, 0x20801);
+       WREG32(data_reg, 0x8920BED0);
+       WREG32(index_reg, 0x20802);
+       WREG32(data_reg, 0xBED08920);
+       WREG32(index_reg, 0x20803);
+       WREG32(data_reg, 0x80008010);
+       WREG32(index_reg, 0x30000);
+       WREG32(data_reg, 0x90008000);
+       WREG32(index_reg, 0x30001);
+       WREG32(data_reg, 0x80008000);
+       WREG32(index_reg, 0x30100);
+       WREG32(data_reg, 0x8FE0BF90);
+       WREG32(index_reg, 0x30101);
+       WREG32(data_reg, 0xBFF880A0);
+       WREG32(index_reg, 0x30200);
+       WREG32(data_reg, 0x8F60BF40);
+       WREG32(index_reg, 0x30201);
+       WREG32(data_reg, 0xBFE88180);
+       WREG32(index_reg, 0x30300);
+       WREG32(data_reg, 0x8EC0BF00);
+       WREG32(index_reg, 0x30301);
+       WREG32(data_reg, 0xBFC88280);
+       WREG32(index_reg, 0x30400);
+       WREG32(data_reg, 0x8DE0BEE0);
+       WREG32(index_reg, 0x30401);
+       WREG32(data_reg, 0xBFA083A0);
+       WREG32(index_reg, 0x30500);
+       WREG32(data_reg, 0x8CE0BED0);
+       WREG32(index_reg, 0x30501);
+       WREG32(data_reg, 0xBF7884E0);
+       WREG32(index_reg, 0x30600);
+       WREG32(data_reg, 0x8BA0BED8);
+       WREG32(index_reg, 0x30601);
+       WREG32(data_reg, 0xBF508640);
+       WREG32(index_reg, 0x30700);
+       WREG32(data_reg, 0x8A60BEE8);
+       WREG32(index_reg, 0x30701);
+       WREG32(data_reg, 0xBF2087A0);
+       WREG32(index_reg, 0x30800);
+       WREG32(data_reg, 0x8900BF00);
+       WREG32(index_reg, 0x30801);
+       WREG32(data_reg, 0xBF008900);
 }
 
 struct rv515_watermark {
@@ -796,8 +891,9 @@ void rv515_crtc_bandwidth_compute(struct radeon_device *rdev,
 
        b.full = rfixed_const(mode->crtc_hdisplay);
        c.full = rfixed_const(256);
-       a.full = rfixed_mul(wm->num_line_pair, b);
-       request_fifo_depth.full = rfixed_div(a, c);
+       a.full = rfixed_div(b, c);
+       request_fifo_depth.full = rfixed_mul(a, wm->num_line_pair);
+       request_fifo_depth.full = rfixed_ceil(request_fifo_depth);
        if (a.full < rfixed_const(4)) {
                wm->lb_request_fifo_depth = 4;
        } else {
@@ -899,15 +995,17 @@ void rv515_crtc_bandwidth_compute(struct radeon_device *rdev,
        a.full = rfixed_const(16);
        wm->priority_mark_max.full = rfixed_const(crtc->base.mode.crtc_hdisplay);
        wm->priority_mark_max.full = rfixed_div(wm->priority_mark_max, a);
+       wm->priority_mark_max.full = rfixed_ceil(wm->priority_mark_max);
 
        /* Determine estimated width */
        estimated_width.full = tolerable_latency.full - wm->worst_case_latency.full;
        estimated_width.full = rfixed_div(estimated_width, consumption_time);
        if (rfixed_trunc(estimated_width) > crtc->base.mode.crtc_hdisplay) {
-               wm->priority_mark.full = rfixed_const(10);
+               wm->priority_mark.full = wm->priority_mark_max.full;
        } else {
                a.full = rfixed_const(16);
                wm->priority_mark.full = rfixed_div(estimated_width, a);
+               wm->priority_mark.full = rfixed_ceil(wm->priority_mark);
                wm->priority_mark.full = wm->priority_mark_max.full - wm->priority_mark.full;
        }
 }