Skip to contentSkip to conversation

drm/radeon: allow unaligned shader loads on CIK

PATCH In review Marek Olšák 2 participants 4 messages Feb 13, 2017 3 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/radeon: allow unaligned shader loads on CIK

From: Marek Olšák <[email protected]>

---
 drivers/gpu/drm/radeon/cik.c        | 7 +++++--
 drivers/gpu/drm/radeon/radeon_drv.c | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/cik.c +5 -2
index f6ff41a..ac0d939 100644
@@ -28,20 +28,23 @@
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "radeon_audio.h"
 #include "cikd.h"
 #include "atom.h"
 #include "cik_blit_shaders.h"
 #include "radeon_ucode.h"
 #include "clearstate_ci.h"
 #include "radeon_kfd.h"
 
+#define SH_MEM_CONFIG_GFX_DEFAULT \
+	ALIGNMENT_MODE(SH_MEM_ALIGNMENT_MODE_UNALIGNED)
+
 MODULE_FIRMWARE("radeon/BONAIRE_pfp.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_me.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_ce.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_mec.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_mc.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_mc2.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_rlc.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_sdma.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_smc.bin");
 
@@ -5580,21 +5583,21 @@ static int cik_pcie_gart_enable(struct radeon_device *rdev)
 		tmp &= ~BYPASS_VM;
 		WREG32(CHUB_CONTROL, tmp);
 	}
 
 	/* XXX SH_MEM regs */
 	/* where to put LDS, scratch, GPUVM in FSA64 space */
 	mutex_lock(&rdev->srbm_mutex);
 	for (i = 0; i < 16; i++) {
 		cik_srbm_select(rdev, 0, 0, 0, i);
 		/* CP and shaders */
-		WREG32(SH_MEM_CONFIG, 0);
+		WREG32(SH_MEM_CONFIG, SH_MEM_CONFIG_GFX_DEFAULT);
 		WREG32(SH_MEM_APE1_BASE, 1);
 		WREG32(SH_MEM_APE1_LIMIT, 0);
 		WREG32(SH_MEM_BASES, 0);
 		/* SDMA GFX */
 		WREG32(SDMA0_GFX_VIRTUAL_ADDR + SDMA0_REGISTER_OFFSET, 0);
 		WREG32(SDMA0_GFX_APE1_CNTL + SDMA0_REGISTER_OFFSET, 0);
 		WREG32(SDMA0_GFX_VIRTUAL_ADDR + SDMA1_REGISTER_OFFSET, 0);
 		WREG32(SDMA0_GFX_APE1_CNTL + SDMA1_REGISTER_OFFSET, 0);
 		/* XXX SDMA RLC - todo */
 	}
@@ -5787,21 +5790,21 @@ void cik_vm_flush(struct radeon_device *rdev, struct radeon_ring *ring,
 	radeon_ring_write(ring, 0);
 	radeon_ring_write(ring, VMID(vm_id));
 
 	radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 6));
 	radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
 				 WRITE_DATA_DST_SEL(0)));
 	radeon_ring_write(ring, SH_MEM_BASES >> 2);
 	radeon_ring_write(ring, 0);
 
 	radeon_ring_write(ring, 0); /* SH_MEM_BASES */
-	radeon_ring_write(ring, 0); /* SH_MEM_CONFIG */
+	radeon_ring_write(ring, SH_MEM_CONFIG_GFX_DEFAULT); /* SH_MEM_CONFIG */
 	radeon_ring_write(ring, 1); /* SH_MEM_APE1_BASE */
 	radeon_ring_write(ring, 0); /* SH_MEM_APE1_LIMIT */
 
 	radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
 	radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
 				 WRITE_DATA_DST_SEL(0)));
 	radeon_ring_write(ring, SRBM_GFX_CNTL >> 2);
 	radeon_ring_write(ring, 0);
 	radeon_ring_write(ring, VMID(0));
 
drivers/gpu/drm/radeon/radeon_drv.c +2 -1
index 30bd4a6..2e5d680 100644
@@ -91,23 +91,24 @@
  *            CS to GPU on >= r600
  *   2.41.0 - evergreen/cayman: Add SET_BASE/DRAW_INDIRECT command parsing support
  *   2.42.0 - Add VCE/VUI (Video Usability Information) support
  *   2.43.0 - RADEON_INFO_GPU_RESET_COUNTER
  *   2.44.0 - SET_APPEND_CNT packet3 support
  *   2.45.0 - Allow setting shader registers using DMA/COPY packet3 on SI
  *   2.46.0 - Add PFP_SYNC_ME support on evergreen
  *   2.47.0 - Add UVD_NO_OP register support
  *   2.48.0 - TA_CS_BC_BASE_ADDR allowed on SI
  *   2.49.0 - DRM_RADEON_GEM_INFO ioctl returns correct vram_size/visible values
+ *   2.50.0 - Allows unaligned shader loads on CIK. (needed by OpenGL)
  */
 #define KMS_DRIVER_MAJOR	2
-#define KMS_DRIVER_MINOR	49
+#define KMS_DRIVER_MINOR	50
 #define KMS_DRIVER_PATCHLEVEL	0
 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
 int radeon_driver_unload_kms(struct drm_device *dev);
 void radeon_driver_lastclose_kms(struct drm_device *dev);
 int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv);
 void radeon_driver_postclose_kms(struct drm_device *dev,
 				 struct drm_file *file_priv);
 void radeon_driver_preclose_kms(struct drm_device *dev,
 				struct drm_file *file_priv);
 int radeon_suspend_kms(struct drm_device *dev, bool suspend,
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1487005079-2257-1-git-send-email-maraeo-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

Reviewed-by Alex Deucher
#2 lore raw
Quoted 10 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Marek Olšák
Sent: Monday, February 13, 2017 11:58 AM
To: [email protected]
Subject: [PATCH] drm/radeon: allow unaligned shader loads on CIK

From: Marek Olšák <[email protected]>

Add a better patch description. With that fixed:

Quoted 124 lines
---
 drivers/gpu/drm/radeon/cik.c        | 7 +++++--
 drivers/gpu/drm/radeon/radeon_drv.c | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/cik.c +4 -1
index f6ff41a..ac0d939 100644
@@ -28,20 +28,23 @@
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "radeon_audio.h"
 #include "cikd.h"
 #include "atom.h"
 #include "cik_blit_shaders.h"
 #include "radeon_ucode.h"
 #include "clearstate_ci.h"
 #include "radeon_kfd.h"
 
+#define SH_MEM_CONFIG_GFX_DEFAULT \
+	ALIGNMENT_MODE(SH_MEM_ALIGNMENT_MODE_UNALIGNED)
+
 MODULE_FIRMWARE("radeon/BONAIRE_pfp.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_me.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_ce.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_mec.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_mc.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_mc2.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_rlc.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_sdma.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_smc.bin");
 
@@ -5580,21 +5583,21 @@ static int cik_pcie_gart_enable(struct
 radeon_device *rdev)
 		tmp &= ~BYPASS_VM;
 		WREG32(CHUB_CONTROL, tmp);
 	}
 
 	/* XXX SH_MEM regs */
 	/* where to put LDS, scratch, GPUVM in FSA64 space */
 	mutex_lock(&rdev->srbm_mutex);
 	for (i = 0; i < 16; i++) {
 		cik_srbm_select(rdev, 0, 0, 0, i);
 		/* CP and shaders */
-		WREG32(SH_MEM_CONFIG, 0);
+		WREG32(SH_MEM_CONFIG,
 SH_MEM_CONFIG_GFX_DEFAULT);
 		WREG32(SH_MEM_APE1_BASE, 1);
 		WREG32(SH_MEM_APE1_LIMIT, 0);
 		WREG32(SH_MEM_BASES, 0);
 		/* SDMA GFX */
 		WREG32(SDMA0_GFX_VIRTUAL_ADDR +
 SDMA0_REGISTER_OFFSET, 0);
 		WREG32(SDMA0_GFX_APE1_CNTL +
 SDMA0_REGISTER_OFFSET, 0);

WREG32(SDMA0_GFX_VIRTUAL_ADDR +
SDMA1_REGISTER_OFFSET, 0);
WREG32(SDMA0_GFX_APE1_CNTL +
SDMA1_REGISTER_OFFSET, 0);

drivers/gpu/drm/radeon/cik.c +1 -1
 		/* XXX SDMA RLC - todo */
 	}
@@ -5787,21 +5790,21 @@ void cik_vm_flush(struct radeon_device *rdev,
 struct radeon_ring *ring,
 	radeon_ring_write(ring, 0);
 	radeon_ring_write(ring, VMID(vm_id));
 
 	radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 6));
 	radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
 				 WRITE_DATA_DST_SEL(0)));
 	radeon_ring_write(ring, SH_MEM_BASES >> 2);
 	radeon_ring_write(ring, 0);
 
 	radeon_ring_write(ring, 0); /* SH_MEM_BASES */
-	radeon_ring_write(ring, 0); /* SH_MEM_CONFIG */
+	radeon_ring_write(ring, SH_MEM_CONFIG_GFX_DEFAULT); /*

SH_MEM_CONFIG */

drivers/gpu/drm/radeon/cik.c +0 -0
 	radeon_ring_write(ring, 1); /* SH_MEM_APE1_BASE */
 	radeon_ring_write(ring, 0); /* SH_MEM_APE1_LIMIT */
 
 	radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
 	radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
 				 WRITE_DATA_DST_SEL(0)));
 	radeon_ring_write(ring, SRBM_GFX_CNTL >> 2);
 	radeon_ring_write(ring, 0);
 	radeon_ring_write(ring, VMID(0));
drivers/gpu/drm/radeon/radeon_drv.c +0 -0
index 30bd4a6..2e5d680 100644
@@ -91,23 +91,24 @@
  *            CS to GPU on >= r600
  *   2.41.0 - evergreen/cayman: Add SET_BASE/DRAW_INDIRECT command

parsing support

  *   2.42.0 - Add VCE/VUI (Video Usability Information) support
  *   2.43.0 - RADEON_INFO_GPU_RESET_COUNTER
  *   2.44.0 - SET_APPEND_CNT packet3 support
  *   2.45.0 - Allow setting shader registers using DMA/COPY packet3 on SI
  *   2.46.0 - Add PFP_SYNC_ME support on evergreen
  *   2.47.0 - Add UVD_NO_OP register support
  *   2.48.0 - TA_CS_BC_BASE_ADDR allowed on SI
  *   2.49.0 - DRM_RADEON_GEM_INFO ioctl returns correct vram_size/visible

values
+ * 2.50.0 - Allows unaligned shader loads on CIK. (needed by OpenGL)
*/
#define KMS_DRIVER_MAJOR 2

drivers/gpu/drm/radeon/radeon_drv.c +1 -1
-#define KMS_DRIVER_MINOR	49
+#define KMS_DRIVER_MINOR	50
 #define KMS_DRIVER_PATCHLEVEL	0
 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
 int radeon_driver_unload_kms(struct drm_device *dev);
 void radeon_driver_lastclose_kms(struct drm_device *dev);
 int radeon_driver_open_kms(struct drm_device *dev, struct drm_file

*file_priv);
void radeon_driver_postclose_kms(struct drm_device *dev,

drivers/gpu/drm/radeon/radeon_drv.c +0 -1
 				 struct drm_file *file_priv);
 void radeon_driver_preclose_kms(struct drm_device *dev,
 				struct drm_file *file_priv);
 int radeon_suspend_kms(struct drm_device *dev, bool suspend,
--

2.7.4

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): BN6PR12MB165298F99139B6DADA6CA4F6F7590-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

#4 lore raw
Quoted 7 lines · Alexander
Quoted 7 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Marek Olšák
Sent: Monday, February 13, 2017 11:58 AM
To: [email protected]
Subject: [PATCH] drm/radeon: allow unaligned shader loads on CIK

Quoted 6 lines
Quoted 3 lines

From: Marek Olšák <[email protected]>

Add a better patch description. With that fixed:

What's a better patch description? "drm/radeon: set SH_MEM_CONFIG.ALIGNMENT_MODE = UNALIGNED on CIK"?

Marek

Quoted 126 lines
Quoted 126 lines

---
 drivers/gpu/drm/radeon/cik.c        | 7 +++++--
 drivers/gpu/drm/radeon/radeon_drv.c | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/cik.c +4 -1
index f6ff41a..ac0d939 100644
@@ -28,20 +28,23 @@
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "radeon_audio.h"
 #include "cikd.h"
 #include "atom.h"
 #include "cik_blit_shaders.h"
 #include "radeon_ucode.h"
 #include "clearstate_ci.h"
 #include "radeon_kfd.h"
 
+#define SH_MEM_CONFIG_GFX_DEFAULT \
+     ALIGNMENT_MODE(SH_MEM_ALIGNMENT_MODE_UNALIGNED)
+
 MODULE_FIRMWARE("radeon/BONAIRE_pfp.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_me.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_ce.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_mec.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_mc.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_mc2.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_rlc.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_sdma.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_smc.bin");
 
@@ -5580,21 +5583,21 @@ static int cik_pcie_gart_enable(struct
 radeon_device *rdev)
              tmp &= ~BYPASS_VM;
              WREG32(CHUB_CONTROL, tmp);
      }
 
      /* XXX SH_MEM regs */
      /* where to put LDS, scratch, GPUVM in FSA64 space */
      mutex_lock(&rdev->srbm_mutex);
      for (i = 0; i < 16; i++) {
              cik_srbm_select(rdev, 0, 0, 0, i);
              /* CP and shaders */
-             WREG32(SH_MEM_CONFIG, 0);
+             WREG32(SH_MEM_CONFIG,
 SH_MEM_CONFIG_GFX_DEFAULT);
              WREG32(SH_MEM_APE1_BASE, 1);
              WREG32(SH_MEM_APE1_LIMIT, 0);
              WREG32(SH_MEM_BASES, 0);
              /* SDMA GFX */
              WREG32(SDMA0_GFX_VIRTUAL_ADDR +
 SDMA0_REGISTER_OFFSET, 0);
              WREG32(SDMA0_GFX_APE1_CNTL +
 SDMA0_REGISTER_OFFSET, 0);
              WREG32(SDMA0_GFX_VIRTUAL_ADDR +
SDMA1_REGISTER_OFFSET, 0);
              WREG32(SDMA0_GFX_APE1_CNTL +
SDMA1_REGISTER_OFFSET, 0);
              /* XXX SDMA RLC - todo */
      }
drivers/gpu/drm/radeon/cik.c +1 -1
@@ -5787,21 +5790,21 @@ void cik_vm_flush(struct radeon_device *rdev,
 struct radeon_ring *ring,
      radeon_ring_write(ring, 0);
      radeon_ring_write(ring, VMID(vm_id));
 
      radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 6));
      radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
                               WRITE_DATA_DST_SEL(0)));
      radeon_ring_write(ring, SH_MEM_BASES >> 2);
      radeon_ring_write(ring, 0);
 
      radeon_ring_write(ring, 0); /* SH_MEM_BASES */
-     radeon_ring_write(ring, 0); /* SH_MEM_CONFIG */
+     radeon_ring_write(ring, SH_MEM_CONFIG_GFX_DEFAULT); /*

SH_MEM_CONFIG */

      radeon_ring_write(ring, 1); /* SH_MEM_APE1_BASE */
      radeon_ring_write(ring, 0); /* SH_MEM_APE1_LIMIT */

      radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
      radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
                               WRITE_DATA_DST_SEL(0)));
      radeon_ring_write(ring, SRBM_GFX_CNTL >> 2);
      radeon_ring_write(ring, 0);
      radeon_ring_write(ring, VMID(0));
drivers/gpu/drm/radeon/radeon_drv.c +0 -0
index 30bd4a6..2e5d680 100644
@@ -91,23 +91,24 @@
  *            CS to GPU on >= r600
  *   2.41.0 - evergreen/cayman: Add SET_BASE/DRAW_INDIRECT command

parsing support

  *   2.42.0 - Add VCE/VUI (Video Usability Information) support
  *   2.43.0 - RADEON_INFO_GPU_RESET_COUNTER
  *   2.44.0 - SET_APPEND_CNT packet3 support
  *   2.45.0 - Allow setting shader registers using DMA/COPY packet3 on SI
  *   2.46.0 - Add PFP_SYNC_ME support on evergreen
  *   2.47.0 - Add UVD_NO_OP register support
  *   2.48.0 - TA_CS_BC_BASE_ADDR allowed on SI
  *   2.49.0 - DRM_RADEON_GEM_INFO ioctl returns correct vram_size/visible

values
+ * 2.50.0 - Allows unaligned shader loads on CIK. (needed by OpenGL)
*/
#define KMS_DRIVER_MAJOR 2

drivers/gpu/drm/radeon/radeon_drv.c +1 -1
-#define KMS_DRIVER_MINOR     49
+#define KMS_DRIVER_MINOR     50
 #define KMS_DRIVER_PATCHLEVEL        0
 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
 int radeon_driver_unload_kms(struct drm_device *dev);
 void radeon_driver_lastclose_kms(struct drm_device *dev);
 int radeon_driver_open_kms(struct drm_device *dev, struct drm_file

*file_priv);
void radeon_driver_postclose_kms(struct drm_device *dev,

                               struct drm_file *file_priv);
 void radeon_driver_preclose_kms(struct drm_device *dev,
                              struct drm_file *file_priv);

int radeon_suspend_kms(struct drm_device *dev, bool suspend,
--
2.7.4

Quoted 4 lines
Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CAAxE2A7qi+7sMYiLYeYN5pY7VzUmw7wCTiQXO6BmXRfKq1fvRg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#6 lore raw
Quoted 21 lines

-----Original Message-----
From: Marek Olšák [mailto:[email protected]]
Sent: Monday, February 13, 2017 12:04 PM
To: Deucher, Alexander
Cc: [email protected]
Subject: Re: [PATCH] drm/radeon: allow unaligned shader loads on CIK

Quoted 2 lines · Alexander
Quoted 2 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On

Behalf

Quoted 7 lines
Quoted 7 lines

Of Marek Olšák
Sent: Monday, February 13, 2017 11:58 AM
To: [email protected]
Subject: [PATCH] drm/radeon: allow unaligned shader loads on CIK

From: Marek Olšák <[email protected]>

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Add a better patch description. With that fixed:

What's a better patch description? "drm/radeon: set SH_MEM_CONFIG.ALIGNMENT_MODE = UNALIGNED on CIK"?

The title is fine. Just add a description. Something like:

Set alignment mode to unaligned on CIK to align with amdgpu. This is needed for unaligned loads to work properly in mesa. The current setting requires dword alignment.

Alex

Quoted 112 lines

Marek

Quoted 57 lines
Quoted 57 lines

---
 drivers/gpu/drm/radeon/cik.c        | 7 +++++--
 drivers/gpu/drm/radeon/radeon_drv.c | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/cik.c +4 -1
index f6ff41a..ac0d939 100644
@@ -28,20 +28,23 @@
 #include "radeon.h"
 #include "radeon_asic.h"
 #include "radeon_audio.h"
 #include "cikd.h"
 #include "atom.h"
 #include "cik_blit_shaders.h"
 #include "radeon_ucode.h"
 #include "clearstate_ci.h"
 #include "radeon_kfd.h"
 
+#define SH_MEM_CONFIG_GFX_DEFAULT \
+     ALIGNMENT_MODE(SH_MEM_ALIGNMENT_MODE_UNALIGNED)
+
 MODULE_FIRMWARE("radeon/BONAIRE_pfp.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_me.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_ce.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_mec.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_mc.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_mc2.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_rlc.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_sdma.bin");
 MODULE_FIRMWARE("radeon/BONAIRE_smc.bin");
 
@@ -5580,21 +5583,21 @@ static int cik_pcie_gart_enable(struct
 radeon_device *rdev)
              tmp &= ~BYPASS_VM;
              WREG32(CHUB_CONTROL, tmp);
      }
 
      /* XXX SH_MEM regs */
      /* where to put LDS, scratch, GPUVM in FSA64 space */
      mutex_lock(&rdev->srbm_mutex);
      for (i = 0; i < 16; i++) {
              cik_srbm_select(rdev, 0, 0, 0, i);
              /* CP and shaders */
-             WREG32(SH_MEM_CONFIG, 0);
+             WREG32(SH_MEM_CONFIG,
 SH_MEM_CONFIG_GFX_DEFAULT);
              WREG32(SH_MEM_APE1_BASE, 1);
              WREG32(SH_MEM_APE1_LIMIT, 0);
              WREG32(SH_MEM_BASES, 0);
              /* SDMA GFX */
              WREG32(SDMA0_GFX_VIRTUAL_ADDR +
 SDMA0_REGISTER_OFFSET, 0);
              WREG32(SDMA0_GFX_APE1_CNTL +
Quoted 8 lines

drivers/gpu/drm/radeon/cik.c void cik_vm_flush(struct radeon_device

Quoted 8 lines
drivers/gpu/drm/radeon/cik.c +0 -0
 SDMA0_REGISTER_OFFSET, 0);
              WREG32(SDMA0_GFX_VIRTUAL_ADDR +
SDMA1_REGISTER_OFFSET, 0);
              WREG32(SDMA0_GFX_APE1_CNTL +
SDMA1_REGISTER_OFFSET, 0);
              /* XXX SDMA RLC - todo */
      }
drivers/gpu/drm/radeon/cik.c +0 -0
@@ -5787,21 +5790,21 @@ void cik_vm_flush(struct radeon_device

*rdev,

Quoted 24 lines
Quoted 24 lines
drivers/gpu/drm/radeon/cik.c +1 -1
 struct radeon_ring *ring,
      radeon_ring_write(ring, 0);
      radeon_ring_write(ring, VMID(vm_id));
 
      radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 6));
      radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
                               WRITE_DATA_DST_SEL(0)));
      radeon_ring_write(ring, SH_MEM_BASES >> 2);
      radeon_ring_write(ring, 0);
 
      radeon_ring_write(ring, 0); /* SH_MEM_BASES */
-     radeon_ring_write(ring, 0); /* SH_MEM_CONFIG */
+     radeon_ring_write(ring, SH_MEM_CONFIG_GFX_DEFAULT); /*

SH_MEM_CONFIG */

      radeon_ring_write(ring, 1); /* SH_MEM_APE1_BASE */
      radeon_ring_write(ring, 0); /* SH_MEM_APE1_LIMIT */

      radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
      radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
                               WRITE_DATA_DST_SEL(0)));
      radeon_ring_write(ring, SRBM_GFX_CNTL >> 2);
      radeon_ring_write(ring, 0);
      radeon_ring_write(ring, VMID(0));
Quoted 8 lines

drivers/gpu/drm/radeon/radeon_drv.c line 92

Quoted 8 lines
drivers/gpu/drm/radeon/radeon_drv.c +0 -0
index 30bd4a6..2e5d680 100644
@@ -91,23 +91,24 @@
  *            CS to GPU on >= r600
  *   2.41.0 - evergreen/cayman: Add SET_BASE/DRAW_INDIRECT

command

Quoted 9 lines
Quoted 9 lines

parsing support

  *   2.42.0 - Add VCE/VUI (Video Usability Information) support
  *   2.43.0 - RADEON_INFO_GPU_RESET_COUNTER
  *   2.44.0 - SET_APPEND_CNT packet3 support
  *   2.45.0 - Allow setting shader registers using DMA/COPY packet3 on SI
  *   2.46.0 - Add PFP_SYNC_ME support on evergreen
  *   2.47.0 - Add UVD_NO_OP register support
  *   2.48.0 - TA_CS_BC_BASE_ADDR allowed on SI
  *   2.49.0 - DRM_RADEON_GEM_INFO ioctl returns correct

vram_size/visible

Quoted 25 lines
Quoted 8 lines

drivers/gpu/drm/radeon/radeon_drv.c

Quoted 8 lines

values
+ * 2.50.0 - Allows unaligned shader loads on CIK. (needed by OpenGL)
*/
#define KMS_DRIVER_MAJOR 2

drivers/gpu/drm/radeon/radeon_drv.c +1 -1
-#define KMS_DRIVER_MINOR     49
+#define KMS_DRIVER_MINOR     50
 #define KMS_DRIVER_PATCHLEVEL        0
 int radeon_driver_load_kms(struct drm_device *dev, unsigned long

flags);

Quoted 16 lines
Quoted 16 lines

int radeon_driver_unload_kms(struct drm_device *dev); void radeon_driver_lastclose_kms(struct drm_device *dev); int radeon_driver_open_kms(struct drm_device *dev, struct drm_file
*file_priv);
void radeon_driver_postclose_kms(struct drm_device *dev,

                               struct drm_file *file_priv);
 void radeon_driver_preclose_kms(struct drm_device *dev,
                              struct drm_file *file_priv);

int radeon_suspend_kms(struct drm_device *dev, bool suspend,
--
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx