forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-04 1543e317f1da31b75942316931e8f491a8920811
kernel/drivers/gpu/drm/gma500/oaktrail_device.c
....@@ -1,35 +1,25 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /**************************************************************************
23 * Copyright (c) 2011, Intel Corporation.
34 * All Rights Reserved.
45 *
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.
17
- *
186 **************************************************************************/
197
208 #include <linux/backlight.h>
21
-#include <linux/module.h>
9
+#include <linux/delay.h>
2210 #include <linux/dmi.h>
23
-#include <drm/drmP.h>
24
-#include <drm/drm.h>
25
-#include <drm/gma_drm.h>
26
-#include "psb_drv.h"
27
-#include "psb_reg.h"
28
-#include "psb_intel_reg.h"
11
+#include <linux/module.h>
12
+
2913 #include <asm/intel-mid.h>
3014 #include <asm/intel_scu_ipc.h>
31
-#include "mid_bios.h"
15
+
16
+#include <drm/drm.h>
17
+
3218 #include "intel_bios.h"
19
+#include "mid_bios.h"
20
+#include "psb_drv.h"
21
+#include "psb_intel_reg.h"
22
+#include "psb_reg.h"
3323
3424 static int oaktrail_output_init(struct drm_device *dev)
3525 {
....@@ -327,7 +317,7 @@
327317
328318 /* Actually enable it */
329319 PSB_WVDC32(p->dpll, MRST_DPLL_A);
330
- DRM_UDELAY(150);
320
+ udelay(150);
331321
332322 /* Restore mode */
333323 PSB_WVDC32(p->htotal, HTOTAL_A);