Revert "drm/v3d: Use V3D_SMS registers for power on/off and reset on V3D 7.x"

This reverts commit 850bf1a.

Author: popcornmix

drivers/gpu/drm/v3d/v3d_drv.c

@@ -482,8 +482,6 @@ static void v3d_platform_drm_remove(struct platform_device *pdev)
 	dma_free_wc(v3d->drm.dev, 4096, v3d->mmu_scratch,
 		    v3d->mmu_scratch_paddr);
 
-	v3d_power_off_sms(v3d);
-
 	clk_disable_unprepare(v3d->clk);
 }
 

drivers/gpu/drm/v3d/v3d_drv.h

@@ -118,7 +118,6 @@ struct v3d_dev {
 	void __iomem *core_regs[3];
 	void __iomem *bridge_regs;
 	void __iomem *gca_regs;
-	void __iomem *sms_regs;
 	struct clk *clk;
 	struct delayed_work clk_down_work;
 	unsigned long clk_up_rate, clk_down_rate;
@@ -275,15 +274,6 @@ to_v3d_fence(struct dma_fence *fence)
 #define V3D_GCA_READ(offset) readl(v3d->gca_regs + offset)
 #define V3D_GCA_WRITE(offset, val) writel(val, v3d->gca_regs + offset)
 
-#define V3D_SMS_IDLE				0x0
-#define V3D_SMS_ISOLATING_FOR_RESET		0xa
-#define V3D_SMS_RESETTING			0xb
-#define V3D_SMS_ISOLATING_FOR_POWER_OFF	0xc
-#define V3D_SMS_POWER_OFF_STATE		0xd
-
-#define V3D_SMS_READ(offset) readl(v3d->sms_regs + (offset))
-#define V3D_SMS_WRITE(offset, val) writel(val, v3d->sms_regs + (offset))
-
 #define V3D_CORE_READ(core, offset) readl(v3d->core_regs[core] + offset)
 #define V3D_CORE_WRITE(core, offset, val) writel(val, v3d->core_regs[core] + offset)
 
@@ -562,7 +552,6 @@ struct dma_fence *v3d_fence_create(struct v3d_dev *v3d, enum v3d_queue queue);
 /* v3d_gem.c */
 int v3d_gem_init(struct drm_device *dev);
 void v3d_gem_destroy(struct drm_device *dev);
-void v3d_reset_sms(struct v3d_dev *v3d);
 void v3d_reset(struct v3d_dev *v3d);
 void v3d_invalidate_caches(struct v3d_dev *v3d);
 void v3d_clean_caches(struct v3d_dev *v3d);

drivers/gpu/drm/v3d/v3d_gem.c

@@ -105,22 +105,6 @@ v3d_reset_v3d(struct v3d_dev *v3d)
 	v3d_init_hw_state(v3d);
 }
 
-void
-v3d_reset_sms(struct v3d_dev *v3d)
-{
-	if (v3d->ver < V3D_GEN_71)
-		return;
-
-	V3D_SMS_WRITE(V3D_SMS_REE_CS, V3D_SET_FIELD(0x4, V3D_SMS_STATE));
-
-	if (wait_for(!(V3D_GET_FIELD(V3D_SMS_READ(V3D_SMS_REE_CS),
-				     V3D_SMS_STATE) == V3D_SMS_ISOLATING_FOR_RESET) &&
-		     !(V3D_GET_FIELD(V3D_SMS_READ(V3D_SMS_REE_CS),
-				     V3D_SMS_STATE) == V3D_SMS_RESETTING), 100)) {
-		DRM_ERROR("Failed to wait for SMS reset\n");
-	}
-}
-
 void
 v3d_reset(struct v3d_dev *v3d)
 {
@@ -136,7 +120,6 @@ v3d_reset(struct v3d_dev *v3d)
 		v3d_idle_axi(v3d, 0);
 
 	v3d_idle_gca(v3d);
-	v3d_reset_sms(v3d);
 	v3d_reset_v3d(v3d);
 
 	v3d_mmu_set_page_table(v3d);

drivers/gpu/drm/v3d/v3d_regs.h

@@ -515,30 +515,4 @@
 # define V3D_ERR_VPAERGS                               BIT(1)
 # define V3D_ERR_VPAEABB                               BIT(0)
 
-#define V3D_SMS_REE_CS                                 0x00000
-#define V3D_SMS_TEE_CS                                 0x00400
-# define V3D_SMS_INTERRUPT                             BIT(31)
-# define V3D_SMS_POWER_OFF                             BIT(30)
-# define V3D_SMS_CLEAR_POWER_OFF                       BIT(29)
-# define V3D_SMS_LOCK                                  BIT(28)
-# define V3D_SMS_CLEAR_LOCK                            BIT(27)
-# define V3D_SMS_SVP_MODE_EXIT                         BIT(26)
-# define V3D_SMS_CLEAR_SVP_MODE_EXIT                   BIT(25)
-# define V3D_SMS_SVP_MODE_ENTER                        BIT(24)
-# define V3D_SMS_CLEAR_SVP_MODE_ENTER                  BIT(23)
-# define V3D_SMS_THEIR_MODE_EXIT                       BIT(22)
-# define V3D_SMS_THEIR_MODE_ENTER                      BIT(21)
-# define V3D_SMS_OUR_MODE_EXIT                         BIT(20)
-# define V3D_SMS_CLEAR_OUR_MODE_EXIT                   BIT(19)
-# define V3D_SMS_SEQ_PC_MASK                           V3D_MASK(16, 10)
-# define V3D_SMS_SEQ_PC_SHIFT                          10
-# define V3D_SMS_HUBCORE_STATUS_MASK                   V3D_MASK(9, 8)
-# define V3D_SMS_HUBCORE_STATUS_SHIFT                  8
-# define V3D_SMS_NEW_MODE_MASK                         V3D_MASK(7, 6)
-# define V3D_SMS_NEW_MODE_SHIFT                        6
-# define V3D_SMS_OLD_MODE_MASK                         V3D_MASK(5, 4)
-# define V3D_SMS_OLD_MODE_SHIFT                        4
-# define V3D_SMS_STATE_MASK                            V3D_MASK(3, 0)
-# define V3D_SMS_STATE_SHIFT                           0
-
 #endif /* V3D_REGS_H */