change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/drivers/gpu/drm/radeon/radeon_drv.c
..
..
@@ -29,20 +29,28 @@
29
29
  * OTHER DEALINGS IN THE SOFTWARE.
30
30
  */
31
31
 
32
-#include <drm/drmP.h>
33
-#include <drm/radeon_drm.h>
34
-#include "radeon_drv.h"
35
32
 
36
-#include <drm/drm_pciids.h>
33
+#include <linux/compat.h>
37
34
 #include <linux/console.h>
38
35
 #include <linux/module.h>
39
36
 #include <linux/pm_runtime.h>
40
37
 #include <linux/vga_switcheroo.h>
41
-#include <linux/compat.h>
42
-#include <drm/drm_gem.h>
43
-#include <drm/drm_fb_helper.h>
38
+#include <linux/mmu_notifier.h>
39
+#include <linux/pci.h>
44
40
 
41
+#include <drm/drm_agpsupport.h>
45
42
 #include <drm/drm_crtc_helper.h>
43
+#include <drm/drm_drv.h>
44
+#include <drm/drm_fb_helper.h>
45
+#include <drm/drm_file.h>
46
+#include <drm/drm_gem.h>
47
+#include <drm/drm_ioctl.h>
48
+#include <drm/drm_pciids.h>
49
+#include <drm/drm_probe_helper.h>
50
+#include <drm/drm_vblank.h>
51
+#include <drm/radeon_drm.h>
52
+
53
+#include "radeon_drv.h"
46
54
 
47
55
 /*
48
56
  * KMS wrapper.
..
..
@@ -112,9 +120,6 @@
112
120
 int radeon_suspend_kms(struct drm_device *dev, bool suspend,
113
121
 		       bool fbcon, bool freeze);
114
122
 int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon);
115
-u32 radeon_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe);
116
-int radeon_enable_vblank_kms(struct drm_device *dev, unsigned int pipe);
117
-void radeon_disable_vblank_kms(struct drm_device *dev, unsigned int pipe);
118
123
 void radeon_driver_irq_preinstall_kms(struct drm_device *dev);
119
124
 int radeon_driver_irq_postinstall_kms(struct drm_device *dev);
120
125
 void radeon_driver_irq_uninstall_kms(struct drm_device *dev);
..
..
@@ -124,8 +129,7 @@
124
129
 				struct drm_file *file_priv);
125
130
 void radeon_gem_object_close(struct drm_gem_object *obj,
126
131
 				struct drm_file *file_priv);
127
-struct dma_buf *radeon_gem_prime_export(struct drm_device *dev,
128
-					struct drm_gem_object *gobj,
132
+struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj,
129
133
 					int flags);
130
134
 extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int crtc,
131
135
 				      unsigned int flags, int *vpos, int *hpos,
..
..
@@ -147,7 +151,6 @@
147
151
 							struct sg_table *sg);
148
152
 int radeon_gem_prime_pin(struct drm_gem_object *obj);
149
153
 void radeon_gem_prime_unpin(struct drm_gem_object *obj);
150
-struct reservation_object *radeon_gem_prime_res_obj(struct drm_gem_object *);
151
154
 void *radeon_gem_prime_vmap(struct drm_gem_object *obj);
152
155
 void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
153
156
 
..
..
@@ -311,31 +314,11 @@
311
314
 
312
315
 bool radeon_device_is_virtual(void);
313
316
 
314
-static int radeon_kick_out_firmware_fb(struct pci_dev *pdev)
315
-{
316
-	struct apertures_struct *ap;
317
-	bool primary = false;
318
-
319
-	ap = alloc_apertures(1);
320
-	if (!ap)
321
-		return -ENOMEM;
322
-
323
-	ap->ranges[0].base = pci_resource_start(pdev, 0);
324
-	ap->ranges[0].size = pci_resource_len(pdev, 0);
325
-
326
-#ifdef CONFIG_X86
327
-	primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;
328
-#endif
329
-	drm_fb_helper_remove_conflicting_framebuffers(ap, "radeondrmfb", primary);
330
-	kfree(ap);
331
-
332
-	return 0;
333
-}
334
-
335
317
 static int radeon_pci_probe(struct pci_dev *pdev,
336
318
 			    const struct pci_device_id *ent)
337
319
 {
338
320
 	unsigned long flags = 0;
321
+	struct drm_device *dev;
339
322
 	int ret;
340
323
 
341
324
 	if (!ent)
..
..
@@ -372,11 +355,48 @@
372
355
 		return -EPROBE_DEFER;
373
356
 
374
357
 	/* Get rid of things like offb */
375
-	ret = radeon_kick_out_firmware_fb(pdev);
358
+	ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "radeondrmfb");
376
359
 	if (ret)
377
360
 		return ret;
378
361
 
379
-	return drm_get_pci_dev(pdev, ent, &kms_driver);
362
+	dev = drm_dev_alloc(&kms_driver, &pdev->dev);
363
+	if (IS_ERR(dev))
364
+		return PTR_ERR(dev);
365
+
366
+	ret = pci_enable_device(pdev);
367
+	if (ret)
368
+		goto err_free;
369
+
370
+	dev->pdev = pdev;
371
+#ifdef __alpha__
372
+	dev->hose = pdev->sysdata;
373
+#endif
374
+
375
+	pci_set_drvdata(pdev, dev);
376
+
377
+	if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP))
378
+		dev->agp = drm_agp_init(dev);
379
+	if (dev->agp) {
380
+		dev->agp->agp_mtrr = arch_phys_wc_add(
381
+			dev->agp->agp_info.aper_base,
382
+			dev->agp->agp_info.aper_size *
383
+			1024 * 1024);
384
+	}
385
+
386
+	ret = drm_dev_register(dev, ent->driver_data);
387
+	if (ret)
388
+		goto err_agp;
389
+
390
+	return 0;
391
+
392
+err_agp:
393
+	if (dev->agp)
394
+		arch_phys_wc_del(dev->agp->agp_mtrr);
395
+	kfree(dev->agp);
396
+	pci_disable_device(pdev);
397
+err_free:
398
+	drm_dev_put(dev);
399
+	return ret;
380
400
 }
381
401
 
382
402
 static void
..
..
@@ -395,19 +415,28 @@
395
415
 	 */
396
416
 	if (radeon_device_is_virtual())
397
417
 		radeon_pci_remove(pdev);
418
+
419
+#if defined(CONFIG_PPC64) || defined(CONFIG_MACH_LOONGSON64)
420
+	/*
421
+	 * Some adapters need to be suspended before a
422
+	 * shutdown occurs in order to prevent an error
423
+	 * during kexec, shutdown or reboot.
424
+	 * Make this power and Loongson specific because
425
+	 * it breaks some other boards.
426
+	 */
427
+	radeon_suspend_kms(pci_get_drvdata(pdev), true, true, false);
428
+#endif
398
429
 }
399
430
 
400
431
 static int radeon_pmops_suspend(struct device *dev)
401
432
 {
402
-	struct pci_dev *pdev = to_pci_dev(dev);
403
-	struct drm_device *drm_dev = pci_get_drvdata(pdev);
433
+	struct drm_device *drm_dev = dev_get_drvdata(dev);
404
434
 	return radeon_suspend_kms(drm_dev, true, true, false);
405
435
 }
406
436
 
407
437
 static int radeon_pmops_resume(struct device *dev)
408
438
 {
409
-	struct pci_dev *pdev = to_pci_dev(dev);
410
-	struct drm_device *drm_dev = pci_get_drvdata(pdev);
439
+	struct drm_device *drm_dev = dev_get_drvdata(dev);
411
440
 
412
441
 	/* GPU comes up enabled by the bios on resume */
413
442
 	if (radeon_is_px(drm_dev)) {
..
..
@@ -421,15 +450,13 @@
421
450
 
422
451
 static int radeon_pmops_freeze(struct device *dev)
423
452
 {
424
-	struct pci_dev *pdev = to_pci_dev(dev);
425
-	struct drm_device *drm_dev = pci_get_drvdata(pdev);
453
+	struct drm_device *drm_dev = dev_get_drvdata(dev);
426
454
 	return radeon_suspend_kms(drm_dev, false, true, true);
427
455
 }
428
456
 
429
457
 static int radeon_pmops_thaw(struct device *dev)
430
458
 {
431
-	struct pci_dev *pdev = to_pci_dev(dev);
432
-	struct drm_device *drm_dev = pci_get_drvdata(pdev);
459
+	struct drm_device *drm_dev = dev_get_drvdata(dev);
433
460
 	return radeon_resume_kms(drm_dev, false, true);
434
461
 }
435
462
 
..
..
@@ -488,8 +515,7 @@
488
515
 
489
516
 static int radeon_pmops_runtime_idle(struct device *dev)
490
517
 {
491
-	struct pci_dev *pdev = to_pci_dev(dev);
492
-	struct drm_device *drm_dev = pci_get_drvdata(pdev);
518
+	struct drm_device *drm_dev = dev_get_drvdata(dev);
493
519
 	struct drm_crtc *crtc;
494
520
 
495
521
 	if (!radeon_is_px(drm_dev)) {
..
..
@@ -570,31 +596,14 @@
570
596
 #endif
571
597
 };
572
598
 
573
-static bool
574
-radeon_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe,
575
-				 bool in_vblank_irq, int *vpos, int *hpos,
576
-				 ktime_t *stime, ktime_t *etime,
577
-				 const struct drm_display_mode *mode)
578
-{
579
-	return radeon_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,
580
-					  stime, etime, mode);
581
-}
582
-
583
599
 static struct drm_driver kms_driver = {
584
600
 	.driver_features =
585
-	    DRIVER_USE_AGP |
586
-	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
587
-	    DRIVER_PRIME | DRIVER_RENDER,
601
+	    DRIVER_GEM | DRIVER_RENDER,
588
602
 	.load = radeon_driver_load_kms,
589
603
 	.open = radeon_driver_open_kms,
590
604
 	.postclose = radeon_driver_postclose_kms,
591
605
 	.lastclose = radeon_driver_lastclose_kms,
592
606
 	.unload = radeon_driver_unload_kms,
593
-	.get_vblank_counter = radeon_get_vblank_counter_kms,
594
-	.enable_vblank = radeon_enable_vblank_kms,
595
-	.disable_vblank = radeon_disable_vblank_kms,
596
-	.get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos,
597
-	.get_scanout_position = radeon_get_crtc_scanout_position,
598
607
 	.irq_preinstall = radeon_driver_irq_preinstall_kms,
599
608
 	.irq_postinstall = radeon_driver_irq_postinstall_kms,
600
609
 	.irq_uninstall = radeon_driver_irq_uninstall_kms,
..
..
@@ -610,10 +619,8 @@
610
619
 	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
611
620
 	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
612
621
 	.gem_prime_export = radeon_gem_prime_export,
613
-	.gem_prime_import = drm_gem_prime_import,
614
622
 	.gem_prime_pin = radeon_gem_prime_pin,
615
623
 	.gem_prime_unpin = radeon_gem_prime_unpin,
616
-	.gem_prime_res_obj = radeon_gem_prime_res_obj,
617
624
 	.gem_prime_get_sg_table = radeon_gem_prime_get_sg_table,
618
625
 	.gem_prime_import_sg_table = radeon_gem_prime_import_sg_table,
619
626
 	.gem_prime_vmap = radeon_gem_prime_vmap,
..
..
@@ -669,6 +676,7 @@
669
676
 {
670
677
 	pci_unregister_driver(pdriver);
671
678
 	radeon_unregister_atpx_handler();
679
+	mmu_notifier_synchronize();
672
680
 }
673
681
 
674
682
 module_init(radeon_init);