hc
2024-05-10 61598093bbdd283a7edc367d900f223070ead8d2
kernel/drivers/gpu/drm/gma500/psb_drv.h
....@@ -1,19 +1,7 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
12 /**************************************************************************
23 * Copyright (c) 2007-2011, Intel Corporation.
34 * All Rights Reserved.
4
- *
5
- * This program is free software; you can redistribute it and/or modify it
6
- * under the terms and conditions of the GNU General Public License,
7
- * version 2, as published by the Free Software Foundation.
8
- *
9
- * This program is distributed in the hope it will be useful, but WITHOUT
10
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
12
- * more details.
13
- *
14
- * You should have received a copy of the GNU General Public License along with
15
- * this program; if not, write to the Free Software Foundation, Inc.,
16
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
175 *
186 **************************************************************************/
197
....@@ -23,18 +11,17 @@
2311 #include <linux/kref.h>
2412 #include <linux/mm_types.h>
2513
26
-#include <drm/drmP.h>
27
-#include <drm/drm_global.h>
28
-#include <drm/gma_drm.h>
29
-#include "psb_reg.h"
30
-#include "psb_intel_drv.h"
14
+#include <drm/drm_device.h>
15
+
3116 #include "gma_display.h"
32
-#include "intel_bios.h"
3317 #include "gtt.h"
34
-#include "power.h"
35
-#include "opregion.h"
36
-#include "oaktrail.h"
18
+#include "intel_bios.h"
3719 #include "mmu.h"
20
+#include "oaktrail.h"
21
+#include "opregion.h"
22
+#include "power.h"
23
+#include "psb_intel_drv.h"
24
+#include "psb_reg.h"
3825
3926 #define DRIVER_AUTHOR "Alan Cox <alan@linux.intel.com> and others"
4027
....@@ -242,6 +229,8 @@
242229 #define KSEL_BYPASS_25 6
243230 #define KSEL_BYPASS_83_100 7
244231
232
+struct drm_fb_helper;
233
+
245234 struct opregion_header;
246235 struct opregion_acpi;
247236 struct opregion_swsci;
....@@ -445,7 +434,7 @@
445434 struct pci_dev *lpc_pdev; /* Currently only used by mrst */
446435 const struct psb_ops *ops;
447436 const struct psb_offset *regmap;
448
-
437
+
449438 struct child_device_config *child_dev;
450439 int child_dev_num;
451440
....@@ -553,7 +542,7 @@
553542
554543 /* Oaktrail HDMI state */
555544 struct oaktrail_hdmi_dev *hdmi_priv;
556
-
545
+
557546 /* Register state */
558547 struct psb_save_area regs;
559548
....@@ -585,7 +574,7 @@
585574 uint32_t blc_adj1;
586575 uint32_t blc_adj2;
587576
588
- void *fbdev;
577
+ struct drm_fb_helper *fb_helper;
589578
590579 /* 2D acceleration */
591580 spinlock_t lock_2d;
....@@ -692,15 +681,15 @@
692681 extern void psb_irq_uninstall_islands(struct drm_device *dev, int hw_islands);
693682 extern int psb_vblank_wait2(struct drm_device *dev, unsigned int *sequence);
694683 extern int psb_vblank_wait(struct drm_device *dev, unsigned int *sequence);
695
-extern int psb_enable_vblank(struct drm_device *dev, unsigned int pipe);
696
-extern void psb_disable_vblank(struct drm_device *dev, unsigned int pipe);
684
+extern int psb_enable_vblank(struct drm_crtc *crtc);
685
+extern void psb_disable_vblank(struct drm_crtc *crtc);
697686 void
698687 psb_enable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask);
699688
700689 void
701690 psb_disable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask);
702691
703
-extern u32 psb_get_vblank_counter(struct drm_device *dev, unsigned int pipe);
692
+extern u32 psb_get_vblank_counter(struct drm_crtc *crtc);
704693
705694 /* framebuffer.c */
706695 extern int psbfb_probed(struct drm_device *dev);