change otg to host mode

hc

2024-05-11 04dd17822334871b23ea2862f7798fb0e0007777

 kernel/drivers/gpu/drm/i810/i810_dma.c
..
..
@@ -30,13 +30,20 @@
30
30
  *
31
31
  */
32
32
 
33
-#include <drm/drmP.h>
34
-#include <drm/i810_drm.h>
35
-#include "i810_drv.h"
36
-#include <linux/interrupt.h>	/* For task queue support */
37
33
 #include <linux/delay.h>
38
-#include <linux/slab.h>
39
-#include <linux/pagemap.h>
34
+#include <linux/mman.h>
35
+#include <linux/pci.h>
36
+
37
+#include <drm/drm_agpsupport.h>
38
+#include <drm/drm_device.h>
39
+#include <drm/drm_drv.h>
40
+#include <drm/drm_file.h>
41
+#include <drm/drm_ioctl.h>
42
+#include <drm/drm_irq.h>
43
+#include <drm/drm_print.h>
44
+#include <drm/i810_drm.h>
45
+
46
+#include "i810_drv.h"
40
47
 
41
48
 #define I810_BUF_FREE		2
42
49
 #define I810_BUF_CLIENT		1
..
..
@@ -213,9 +220,9 @@
213
220
 		if (dev_priv->ring.virtual_start)
214
221
 			drm_legacy_ioremapfree(&dev_priv->ring.map, dev);
215
222
 		if (dev_priv->hw_status_page) {
216
-			pci_free_consistent(dev->pdev, PAGE_SIZE,
217
-					    dev_priv->hw_status_page,
218
-					    dev_priv->dma_status_page);
223
+			dma_free_coherent(&dev->pdev->dev, PAGE_SIZE,
224
+					  dev_priv->hw_status_page,
225
+					  dev_priv->dma_status_page);
219
226
 		}
220
227
 		kfree(dev->dev_private);
221
228
 		dev->dev_private = NULL;
..
..
@@ -391,8 +398,8 @@
391
398
 
392
399
 	/* Program Hardware Status Page */
393
400
 	dev_priv->hw_status_page =
394
-		pci_zalloc_consistent(dev->pdev, PAGE_SIZE,
395
-				      &dev_priv->dma_status_page);
401
+		dma_alloc_coherent(&dev->pdev->dev, PAGE_SIZE,
402
+				   &dev_priv->dma_status_page, GFP_KERNEL);
396
403
 	if (!dev_priv->hw_status_page) {
397
404
 		dev->dev_private = (void *)dev_priv;
398
405
 		i810_dma_cleanup(dev);
..
..
@@ -846,11 +853,11 @@
846
853
 	i810_wait_ring(dev, dev_priv->ring.Size - 8);
847
854
 }
848
855
 
849
-static int i810_flush_queue(struct drm_device *dev)
856
+static void i810_flush_queue(struct drm_device *dev)
850
857
 {
851
858
 	drm_i810_private_t *dev_priv = dev->dev_private;
852
859
 	struct drm_device_dma *dma = dev->dma;
853
-	int i, ret = 0;
860
+	int i;
854
861
 	RING_LOCALS;
855
862
 
856
863
 	i810_kernel_lost_context(dev);
..
..
@@ -875,7 +882,7 @@
875
882
 			DRM_DEBUG("still on client\n");
876
883
 	}
877
884
 
878
-	return ret;
885
+	return;
879
886
 }
880
887
 
881
888
 /* Must be called with the lock held */