audio ok

hc

2023-12-11 223293205a7265c8b02882461ba8996650048ade

 kernel/drivers/gpu/drm/tegra/dc.h
..
..
@@ -1,10 +1,7 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /*
2
3
  * Copyright (C) 2012 Avionic Design GmbH
3
4
  * Copyright (C) 2012 NVIDIA CORPORATION.  All rights reserved.
4
- *
5
- * This program is free software; you can redistribute it and/or modify
6
- * it under the terms of the GNU General Public License version 2 as
7
- * published by the Free Software Foundation.
8
5
  */
9
6
 
10
7
 #ifndef TEGRA_DC_H
..
..
@@ -93,8 +90,6 @@
93
90
 	struct drm_info_list *debugfs_files;
94
91
 
95
92
 	const struct tegra_dc_soc_info *soc;
96
-
97
-	struct iommu_group *group;
98
93
 };
99
94
 
100
95
 static inline struct tegra_dc *
..
..
@@ -141,7 +136,8 @@
141
136
 	unsigned int stride[2];
142
137
 	unsigned long base[3];
143
138
 	unsigned int zpos;
144
-	bool bottom_up;
139
+	bool reflect_x;
140
+	bool reflect_y;
145
141
 
146
142
 	struct tegra_bo_tiling tiling;
147
143
 	u32 format;
..
..
@@ -300,7 +296,7 @@
300
296
 #define SOR1_TIMING_CYA	(1 << 27)
301
297
 #define CURSOR_ENABLE	(1 << 16)
302
298
 
303
-#define SOR_ENABLE(x)	(1 << (25 + (x)))
299
+#define SOR_ENABLE(x)	(1 << (25 + (((x) > 1) ? ((x) + 1) : (x))))
304
300
 
305
301
 #define DC_DISP_DISP_MEM_HIGH_PRIORITY		0x403
306
302
 #define CURSOR_THRESHOLD(x)   (((x) & 0x03) << 24)