forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-11 04dd17822334871b23ea2862f7798fb0e0007777
kernel/drivers/gpu/drm/omapdrm/dss/hdmi.h
....@@ -1,19 +1,8 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
12 /*
23 * HDMI driver definition for TI OMAP4 Processor.
34 *
45 * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/
5
- *
6
- * This program is free software; you can redistribute it and/or modify it
7
- * under the terms of the GNU General Public License version 2 as published by
8
- * the Free Software Foundation.
9
- *
10
- * This program is distributed in the hope that it will be useful, but WITHOUT
11
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
13
- * more details.
14
- *
15
- * You should have received a copy of the GNU General Public License along with
16
- * this program. If not, see <http://www.gnu.org/licenses/>.
176 */
187
198 #ifndef _HDMI_H
....@@ -25,6 +14,7 @@
2514 #include <linux/hdmi.h>
2615 #include <sound/omap-hdmi-audio.h>
2716 #include <media/cec.h>
17
+#include <drm/drm_bridge.h>
2818
2919 #include "omapdss.h"
3020 #include "dss.h"
....@@ -313,13 +303,13 @@
313303 int hdmi_wp_set_phy_pwr(struct hdmi_wp_data *wp, enum hdmi_phy_pwr val);
314304 int hdmi_wp_set_pll_pwr(struct hdmi_wp_data *wp, enum hdmi_pll_pwr val);
315305 void hdmi_wp_video_config_format(struct hdmi_wp_data *wp,
316
- struct hdmi_video_format *video_fmt);
306
+ const struct hdmi_video_format *video_fmt);
317307 void hdmi_wp_video_config_interface(struct hdmi_wp_data *wp,
318
- struct videomode *vm);
308
+ const struct videomode *vm);
319309 void hdmi_wp_video_config_timing(struct hdmi_wp_data *wp,
320
- struct videomode *vm);
310
+ const struct videomode *vm);
321311 void hdmi_wp_init_vid_fmt_timings(struct hdmi_video_format *video_fmt,
322
- struct videomode *vm, struct hdmi_config *param);
312
+ struct videomode *vm, const struct hdmi_config *param);
323313 int hdmi_wp_init(struct platform_device *pdev, struct hdmi_wp_data *wp,
324314 unsigned int version);
325315 phys_addr_t hdmi_wp_get_audio_dma_addr(struct hdmi_wp_data *wp);
....@@ -375,6 +365,7 @@
375365 bool core_enabled;
376366
377367 struct omap_dss_device output;
368
+ struct drm_bridge bridge;
378369
379370 struct platform_device *audio_pdev;
380371 void (*audio_abort_cb)(struct device *dev);
....@@ -389,6 +380,6 @@
389380 bool display_enabled;
390381 };
391382
392
-#define dssdev_to_hdmi(dssdev) container_of(dssdev, struct omap_hdmi, output)
383
+#define drm_bridge_to_hdmi(b) container_of(b, struct omap_hdmi, bridge)
393384
394385 #endif