drm/vgaarb: add VGA arbitration support to the drm and kms.

VGA arb requires DRM support for non-kms drivers, to turn on/off
irqs when disabling the mem/io regions.

VGA arb requires KMS support for GPUs where we can turn off VGA
decoding. Currently we know how to do this for intel and radeon
kms drivers, which allows them to be removed from the arbiter.

This patch comes from Fedora rawhide kernel.

Signed-off-by: Dave Airlie <airlied@redhat.com>

6 files changed, 63 insertions, 1 deletions

diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 737970b43aef..be51c5f7d0f6 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -1955,6 +1955,20 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
                 rdev->mc.real_vram_size = rdev->mc.aper_size;
 }
 
+void r100_vga_set_state(struct radeon_device *rdev, bool state)
+{
+        uint32_t temp;
+
+        temp = RREG32(RADEON_CONFIG_CNTL);
+        if (state == false) {
+                temp &= ~(1<<8);
+                temp |= (1<<9);
+        } else {
+                temp &= ~(1<<9);
+        }
+        WREG32(RADEON_CONFIG_CNTL, temp);
+}
+
 void r100_vram_info(struct radeon_device *rdev)
 {
         r100_vram_get_type(rdev);
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 5f42fad19190..eab31c1d6df1 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -1499,6 +1499,20 @@ int r600_startup(struct radeon_device *rdev)
         return 0;
 }
 
+void r600_vga_set_state(struct radeon_device *rdev, bool state)
+{
+        uint32_t temp;
+
+        temp = RREG32(CONFIG_CNTL);
+        if (state == false) {
+                temp &= ~(1<<0);
+                temp |= (1<<1);
+        } else {
+                temp &= ~(1<<1);
+        }
+        WREG32(CONFIG_CNTL, temp);
+}
+
 int r600_resume(struct radeon_device *rdev)
 {
         int r;
diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h
index 723295f59281..4a9028a85c9b 100644
--- a/drivers/gpu/drm/radeon/r600d.h
+++ b/drivers/gpu/drm/radeon/r600d.h
@@ -78,6 +78,7 @@
 #define CB_COLOR0_MASK                                  0x28100
 
 #define CONFIG_MEMSIZE                                  0x5428
+#define CONFIG_CNTL                                     0x5424
 #define CP_STAT                                         0x8680
 #define CP_COHER_BASE                                   0x85F8
 #define CP_DEBUG                                        0xC1FC
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 817af8ecff10..c839b608970f 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -596,6 +596,7 @@ struct radeon_asic {
         int (*suspend)(struct radeon_device *rdev);
         void (*errata)(struct radeon_device *rdev);
         void (*vram_info)(struct radeon_device *rdev);
+        void (*vga_set_state)(struct radeon_device *rdev, bool state);
         int (*gpu_reset)(struct radeon_device *rdev);
         int (*mc_init)(struct radeon_device *rdev);
         void (*mc_fini)(struct radeon_device *rdev);
@@ -954,6 +955,7 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
 #define radeon_cs_parse(p) rdev->asic->cs_parse((p))
 #define radeon_errata(rdev) (rdev)->asic->errata((rdev))
 #define radeon_vram_info(rdev) (rdev)->asic->vram_info((rdev))
+#define radeon_vga_set_state(rdev, state) (rdev)->asic->vga_set_state((rdev), (state))
 #define radeon_gpu_reset(rdev) (rdev)->asic->gpu_reset((rdev))
 #define radeon_mc_init(rdev) (rdev)->asic->mc_init((rdev))
 #define radeon_mc_fini(rdev) (rdev)->asic->mc_fini((rdev))
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index 5f2a9e6f12c5..8968f78fa1e3 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -47,6 +47,7 @@ uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg);
 void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);
 void r100_errata(struct radeon_device *rdev);
 void r100_vram_info(struct radeon_device *rdev);
+void r100_vga_set_state(struct radeon_device *rdev, bool state);
 int r100_gpu_reset(struct radeon_device *rdev);
 int r100_mc_init(struct radeon_device *rdev);
 void r100_mc_fini(struct radeon_device *rdev);
@@ -89,6 +90,7 @@ static struct radeon_asic r100_asic = {
         .init = &r100_init,
         .errata = &r100_errata,
         .vram_info = &r100_vram_info,
+        .vga_set_state = &r100_vga_set_state,
         .gpu_reset = &r100_gpu_reset,
         .mc_init = &r100_mc_init,
         .mc_fini = &r100_mc_fini,
@@ -158,6 +160,7 @@ static struct radeon_asic r300_asic = {
         .init = &r300_init,
         .errata = &r300_errata,
         .vram_info = &r300_vram_info,
+        .vga_set_state = &r100_vga_set_state,
         .gpu_reset = &r300_gpu_reset,
         .mc_init = &r300_mc_init,
         .mc_fini = &r300_mc_fini,
@@ -208,6 +211,7 @@ static struct radeon_asic r420_asic = {
         .resume = &r420_resume,
         .errata = NULL,
         .vram_info = NULL,
+        .vga_set_state = &r100_vga_set_state,
         .gpu_reset = &r300_gpu_reset,
         .mc_init = NULL,
         .mc_fini = NULL,
@@ -262,6 +266,7 @@ static struct radeon_asic rs400_asic = {
         .init = &r300_init,
         .errata = &rs400_errata,
         .vram_info = &rs400_vram_info,
+        .vga_set_state = &r100_vga_set_state,
         .gpu_reset = &r300_gpu_reset,
         .mc_init = &rs400_mc_init,
         .mc_fini = &rs400_mc_fini,
@@ -323,6 +328,7 @@ static struct radeon_asic rs600_asic = {
         .init = &rs600_init,
         .errata = &rs600_errata,
         .vram_info = &rs600_vram_info,
+        .vga_set_state = &r100_vga_set_state,
         .gpu_reset = &r300_gpu_reset,
         .mc_init = &rs600_mc_init,
         .mc_fini = &rs600_mc_fini,
@@ -372,6 +378,7 @@ static struct radeon_asic rs690_asic = {
         .init = &rs600_init,
         .errata = &rs690_errata,
         .vram_info = &rs690_vram_info,
+        .vga_set_state = &r100_vga_set_state,
         .gpu_reset = &r300_gpu_reset,
         .mc_init = &rs690_mc_init,
         .mc_fini = &rs690_mc_fini,
@@ -428,6 +435,7 @@ static struct radeon_asic rv515_asic = {
         .init = &rv515_init,
         .errata = &rv515_errata,
         .vram_info = &rv515_vram_info,
+        .vga_set_state = &r100_vga_set_state,
         .gpu_reset = &rv515_gpu_reset,
         .mc_init = &rv515_mc_init,
         .mc_fini = &rv515_mc_fini,
@@ -477,6 +485,7 @@ static struct radeon_asic r520_asic = {
         .init = &rv515_init,
         .errata = &r520_errata,
         .vram_info = &r520_vram_info,
+        .vga_set_state = &r100_vga_set_state,
         .gpu_reset = &rv515_gpu_reset,
         .mc_init = &r520_mc_init,
         .mc_fini = &r520_mc_fini,
@@ -520,6 +529,7 @@ int r600_init(struct radeon_device *rdev);
 void r600_fini(struct radeon_device *rdev);
 int r600_suspend(struct radeon_device *rdev);
 int r600_resume(struct radeon_device *rdev);
+void r600_vga_set_state(struct radeon_device *rdev, bool state);
 int r600_wb_init(struct radeon_device *rdev);
 void r600_wb_fini(struct radeon_device *rdev);
 void r600_cp_commit(struct radeon_device *rdev);
@@ -556,6 +566,7 @@ static struct radeon_asic r600_asic = {
         .resume = &r600_resume,
         .cp_commit = &r600_cp_commit,
         .vram_info = NULL,
+        .vga_set_state = &r600_vga_set_state,
         .gpu_reset = &r600_gpu_reset,
         .mc_init = NULL,
         .mc_fini = NULL,
@@ -606,6 +617,7 @@ static struct radeon_asic rv770_asic = {
         .cp_commit = &r600_cp_commit,
         .vram_info = NULL,
         .gpu_reset = &rv770_gpu_reset,
+        .vga_set_state = &r600_vga_set_state,
         .mc_init = NULL,
         .mc_fini = NULL,
         .wb_init = &r600_wb_init,
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 8a40c616b534..daf5db780956 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -29,6 +29,7 @@
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/radeon_drm.h>
+#include <linux/vgaarb.h>
 #include "radeon_reg.h"
 #include "radeon.h"
 #include "radeon_asic.h"
@@ -480,7 +481,18 @@ void radeon_combios_fini(struct radeon_device *rdev)
 {
 }
 
+/* if we get transitioned to only one device, tak VGA back */
+static unsigned int radeon_vga_set_decode(void *cookie, bool state)
+{
+        struct radeon_device *rdev = cookie;
 
+        radeon_vga_set_state(rdev, state);
+        if (state)
+                return VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM |
+                       VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
+        else
+                return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
+}
 /*
  * Radeon device.
  */
@@ -578,6 +590,13 @@ int radeon_device_init(struct radeon_device *rdev,
         if (r) {
                 return r;
         }
+
+        /* if we have > 1 VGA cards, then disable the radeon VGA resources */
+        r = vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
+        if (r) {
+                return -EINVAL;
+        }
+
         if (!rdev->new_init_path) {
                 /* Setup errata flags */
                 radeon_errata(rdev);
@@ -586,7 +605,6 @@ int radeon_device_init(struct radeon_device *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))
@@ -697,6 +715,7 @@ void radeon_device_fini(struct radeon_device *rdev)
                 radeon_agp_fini(rdev);
 #endif
                 radeon_irq_kms_fini(rdev);
+                vga_client_register(rdev->pdev, NULL, NULL, NULL);
                 radeon_fence_driver_fini(rdev);
                 radeon_clocks_fini(rdev);
                 radeon_object_fini(rdev);