Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-xe] [PATCH] fixup! drm/xe/display: Implement display support
@ 2023-09-19  8:36 Thomas Hellström
  2023-09-19  8:39 ` [Intel-xe] ✓ CI.Patch_applied: success for fixup! drm/xe/display: Implement display support (rev6) Patchwork
                   ` (6 more replies)
  0 siblings, 7 replies; 20+ messages in thread
From: Thomas Hellström @ 2023-09-19  8:36 UTC (permalink / raw)
  To: intel-xe

When selecting CONFIG_XE_DISPLAY, the following missing symbols can be
seen unless something else has selected the corresponding configs.

ERROR: modpost: "cfb_copyarea" [drivers/gpu/drm/xe/xe.ko] undefined!
ERROR: modpost: "cfb_fillrect" [drivers/gpu/drm/xe/xe.ko] undefined!
ERROR: modpost: "cfb_imageblit" [drivers/gpu/drm/xe/xe.ko] undefined

Make sure these are included in the Xe Display build.

v2:
- Use "select FB_IOMEM_HELPERS" (Maarten Lankhorst)

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/xe/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig
index 096bd066afa8..d57181ff47e6 100644
--- a/drivers/gpu/drm/xe/Kconfig
+++ b/drivers/gpu/drm/xe/Kconfig
@@ -45,6 +45,7 @@ config DRM_XE
 config DRM_XE_DISPLAY
 	bool "Enable display support"
 	depends on DRM_XE && EXPERT
+	select FB_IOMEM_HELPERS
 	select I2C
 	select I2C_ALGOBIT
 	default y
-- 
2.41.0


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [Intel-xe] [PATCH] fixup! drm/xe/display: Implement display support
@ 2023-08-01 14:36 Rodrigo Vivi
  2023-08-08 10:48 ` Jani Nikula
  0 siblings, 1 reply; 20+ messages in thread
From: Rodrigo Vivi @ 2023-08-01 14:36 UTC (permalink / raw)
  To: intel-xe; +Cc: Jani Nikula, Rodrigo Vivi

Removing unused declarations.

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 .../drm/xe/display/ext/intel_device_info.c    |  1 -
 .../drm/xe/display/ext/intel_device_info.h    | 38 -------------------
 drivers/gpu/drm/xe/xe_device_types.h          |  1 -
 3 files changed, 40 deletions(-)
 delete mode 100644 drivers/gpu/drm/xe/display/ext/intel_device_info.h

diff --git a/drivers/gpu/drm/xe/display/ext/intel_device_info.c b/drivers/gpu/drm/xe/display/ext/intel_device_info.c
index 9e9ccdef81f1..614cc2900104 100644
--- a/drivers/gpu/drm/xe/display/ext/intel_device_info.c
+++ b/drivers/gpu/drm/xe/display/ext/intel_device_info.c
@@ -25,7 +25,6 @@
 #include "intel_cdclk.h"
 #include "intel_de.h"
 #include "intel_display.h"
-#include "intel_device_info.h"
 #include "i915_drv.h"
 #include "i915_reg.h"
 #include <drm/drm_drv.h>
diff --git a/drivers/gpu/drm/xe/display/ext/intel_device_info.h b/drivers/gpu/drm/xe/display/ext/intel_device_info.h
deleted file mode 100644
index 959acb261007..000000000000
--- a/drivers/gpu/drm/xe/display/ext/intel_device_info.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright © 2014-2017 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- */
-
-#ifndef _INTEL_DEVICE_INFO_H_
-#define _INTEL_DEVICE_INFO_H_
-
-#include <linux/types.h>
-#include "xe_device_types.h"
-
-struct drm_i915_private;
-
-/* Minimal parts used by xe */
-#define intel_runtime_info xe_device_display_info
-
-void intel_device_info_runtime_init(struct drm_i915_private *dev_priv);
-
-#endif
diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index b156f69d7320..c60ce94c1aac 100644
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -18,7 +18,6 @@
 #include "xe_step_types.h"
 
 #if IS_ENABLED(CONFIG_DRM_XE_DISPLAY)
-#include "ext/intel_device_info.h"
 #include "soc/intel_pch.h"
 #include "intel_display_core.h"
 #include "intel_display_device.h"
-- 
2.41.0


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [Intel-xe] [PATCH] fixup! drm/xe/display: Implement display support
@ 2023-07-04 15:02 Francois Dugast
  2023-07-04 17:22 ` Lucas De Marchi
  0 siblings, 1 reply; 20+ messages in thread
From: Francois Dugast @ 2023-07-04 15:02 UTC (permalink / raw)
  To: intel-xe; +Cc: Francois Dugast

Ensure the license is correctly identified using SPDX license
identifiers in compat header files.

Signed-off-by: Francois Dugast <francois.dugast@intel.com>
---
 drivers/gpu/drm/xe/compat-i915-headers/i915_fixed.h         | 5 +++++
 drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h           | 5 +++++
 drivers/gpu/drm/xe/compat-i915-headers/i915_reg_defs.h      | 5 +++++
 drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h         | 5 +++++
 drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h           | 5 +++++
 drivers/gpu/drm/xe/compat-i915-headers/i915_vma_types.h     | 5 +++++
 drivers/gpu/drm/xe/compat-i915-headers/intel_clock_gating.h | 5 +++++
 drivers/gpu/drm/xe/compat-i915-headers/intel_mchbar_regs.h  | 5 +++++
 drivers/gpu/drm/xe/compat-i915-headers/intel_pci_config.h   | 5 +++++
 drivers/gpu/drm/xe/compat-i915-headers/intel_runtime_pm.h   | 5 +++++
 drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h      | 5 +++++
 drivers/gpu/drm/xe/compat-i915-headers/vlv_sideband_reg.h   | 5 +++++
 12 files changed, 60 insertions(+)

diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_fixed.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_fixed.h
index e55fed3cbe9e..45e4f129eba5 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/i915_fixed.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_fixed.h
@@ -1 +1,6 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
 #include "../../i915/i915_fixed.h"
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
index 36d863f4848b..a15d1fd7b1a0 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
@@ -1 +1,6 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
 #include "../../i915/i915_reg.h"
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg_defs.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_reg_defs.h
index 128a9a330c13..bc6332171df6 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/i915_reg_defs.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_reg_defs.h
@@ -1 +1,6 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
 #include "../../i915/i915_reg_defs.h"
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h
index a88a5196c79d..e54b1a5ddd8b 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h
@@ -1 +1,6 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
 #include "../../i915/i915_utils.h"
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h
index c40bb27ac72a..973422c4cce1 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h
@@ -1,3 +1,8 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
 #ifndef I915_VMA_H
 #define I915_VMA_H
 
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_vma_types.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_vma_types.h
index 99e7a2142a37..0ba42ed6912e 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/i915_vma_types.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_vma_types.h
@@ -1,3 +1,8 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
 #include <linux/types.h>
 #include <linux/build_bug.h>
 
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_clock_gating.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_clock_gating.h
index 6e35e0bace9e..fec266fbd5e5 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/intel_clock_gating.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_clock_gating.h
@@ -1 +1,6 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
 #include "../../i915/intel_clock_gating.h"
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_mchbar_regs.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_mchbar_regs.h
index f7c0585f277b..306d30e5744d 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/intel_mchbar_regs.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_mchbar_regs.h
@@ -1 +1,6 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
 #include "../../i915/intel_mchbar_regs.h"
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_pci_config.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_pci_config.h
index 741ef99dc0e4..9049a1ce1799 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/intel_pci_config.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_pci_config.h
@@ -1 +1,6 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
 #include "../../i915/intel_pci_config.h"
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_runtime_pm.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_runtime_pm.h
index 1a7a1224a750..a6e1e4f8b3f4 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/intel_runtime_pm.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_runtime_pm.h
@@ -1,3 +1,8 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
 #include "intel_wakeref.h"
 
 enum i915_drm_suspend_mode {
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
index 678f22c36d42..d7f78aed8c69 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
@@ -1,3 +1,8 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
 #include <linux/types.h>
 
 typedef bool intel_wakeref_t;
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/vlv_sideband_reg.h b/drivers/gpu/drm/xe/compat-i915-headers/vlv_sideband_reg.h
index 83166479ffb5..0bebf958c5cd 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/vlv_sideband_reg.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/vlv_sideband_reg.h
@@ -1 +1,6 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
 #include "../../i915/vlv_sideband_reg.h"
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [Intel-xe] [PATCH] fixup! drm/xe/display: Implement display support
@ 2023-05-29 11:43 Balasubramani Vivekanandan
  2023-06-01 16:50 ` Matt Roper
  0 siblings, 1 reply; 20+ messages in thread
From: Balasubramani Vivekanandan @ 2023-05-29 11:43 UTC (permalink / raw)
  To: intel-xe; +Cc: Bhanuprakash Modem

Printing HDCP feature missing log at KERN_ERR log level upsets CI.
Reduce it to KERN_INFO log level.
Also correct a typo in the log.

Signed-off-by: Balasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>
---
 drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
index 43d3ad50dc54..5c02675bbb09 100644
--- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
+++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
@@ -7,7 +7,7 @@
 
 int intel_hdcp_gsc_init(struct drm_i915_private *i915)
 {
-	drm_err(&i915->drm, "HCDP support not yet implemented\n");
+	drm_info(&i915->drm, "HDCP support not yet implemented\n");
 	return -ENODEV;
 }
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [Intel-xe] [PATCH] fixup! drm/xe/display: Implement display support
@ 2023-05-22 12:55 Gustavo Sousa
  2023-05-22 13:12 ` Gustavo Sousa
  2023-05-23  6:49 ` Lucas De Marchi
  0 siblings, 2 replies; 20+ messages in thread
From: Gustavo Sousa @ 2023-05-22 12:55 UTC (permalink / raw)
  To: intel-xe

Remove the call to drm_aperture_remove_conflicting_pci_framebuffers(),
which is already being done by xe_device_create().

Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>
---
 drivers/gpu/drm/xe/xe_display.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_display.c b/drivers/gpu/drm/xe/xe_display.c
index c122cc4b27c9..1a9e9c78966d 100644
--- a/drivers/gpu/drm/xe/xe_display.c
+++ b/drivers/gpu/drm/xe/xe_display.c
@@ -10,7 +10,6 @@
 
 #include <linux/fb.h>
 
-#include <drm/drm_aperture.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_managed.h>
 #include <drm/xe_drm.h>
@@ -199,11 +198,6 @@ int xe_display_init_noirq(struct xe_device *xe)
 
 	intel_device_info_runtime_init(xe);
 
-	err = drm_aperture_remove_conflicting_pci_framebuffers(to_pci_dev(xe->drm.dev),
-							       xe->drm.driver);
-	if (err)
-		return err;
-
 	err = intel_display_driver_probe_noirq(xe);
 	if (err)
 		return err;
-- 
2.40.1


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [Intel-xe] [PATCH] fixup! drm/xe/display: Implement display support
@ 2023-05-10 19:38 Nirmoy Das
  2023-05-10 20:18 ` Lucas De Marchi
  0 siblings, 1 reply; 20+ messages in thread
From: Nirmoy Das @ 2023-05-10 19:38 UTC (permalink / raw)
  To: intel-xe; +Cc: Jani Nikula, Nirmoy Das

Unlinking display will lead to guc tlb inval timeout for
the fbdev vma as irqs are disabled.

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
---
 drivers/gpu/drm/xe/xe_device.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index 32cc83c43b2a..430bd6eb4053 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -349,9 +349,9 @@ void xe_device_remove(struct xe_device *xe)
 {
 	xe_device_remove_display(xe);
 
-	xe_irq_shutdown(xe);
-
 	xe_display_unlink(xe);
+
+	xe_irq_shutdown(xe);
 }
 
 void xe_device_shutdown(struct xe_device *xe)
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 20+ messages in thread
end of thread, other threads:[~2023-09-19  9:21 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-19  8:36 [Intel-xe] [PATCH] fixup! drm/xe/display: Implement display support Thomas Hellström
2023-09-19  8:39 ` [Intel-xe] ✓ CI.Patch_applied: success for fixup! drm/xe/display: Implement display support (rev6) Patchwork
2023-09-19  8:39 ` [Intel-xe] ✓ CI.checkpatch: " Patchwork
2023-09-19  8:40 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-09-19  8:47 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-09-19  8:48 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-09-19  8:49 ` [Intel-xe] ✓ CI.checksparse: " Patchwork
2023-09-19  9:20 ` [Intel-xe] ✓ CI.BAT: " Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2023-08-01 14:36 [Intel-xe] [PATCH] fixup! drm/xe/display: Implement display support Rodrigo Vivi
2023-08-08 10:48 ` Jani Nikula
2023-07-04 15:02 Francois Dugast
2023-07-04 17:22 ` Lucas De Marchi
2023-05-29 11:43 Balasubramani Vivekanandan
2023-06-01 16:50 ` Matt Roper
2023-05-22 12:55 Gustavo Sousa
2023-05-22 13:12 ` Gustavo Sousa
2023-05-23  6:49 ` Lucas De Marchi
2023-05-23 12:24   ` Gustavo Sousa
2023-05-10 19:38 Nirmoy Das
2023-05-10 20:18 ` Lucas De Marchi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox