Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-xe] [PATCH] fixup! drm/i915/display: Remaining changes to make xe compile
@ 2023-08-03 10:53 Jani Nikula
  2023-08-03 10:57 ` [Intel-xe] ✓ CI.Patch_applied: success for fixup! drm/i915/display: Remaining changes to make xe compile (rev3) Patchwork
                   ` (14 more replies)
  0 siblings, 15 replies; 23+ messages in thread
From: Jani Nikula @ 2023-08-03 10:53 UTC (permalink / raw)
  To: intel-xe; +Cc: jani.nikula, Rodrigo Vivi

Remove some changes completely unrelated to building for xe.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_color.c             | 1 -
 drivers/gpu/drm/i915/display/intel_display.c           | 6 +++---
 drivers/gpu/drm/i915/display/intel_display.h           | 1 -
 drivers/gpu/drm/i915/display/intel_display_power_map.c | 1 +
 drivers/gpu/drm/i915/display/intel_display_rps.c       | 1 -
 drivers/gpu/drm/i915/display/intel_dp.c                | 2 +-
 drivers/gpu/drm/i915/display/intel_dpio_phy.h          | 1 -
 drivers/gpu/drm/i915/display/intel_dpll.c              | 1 +
 drivers/gpu/drm/i915/display/intel_dsb.c               | 1 -
 drivers/gpu/drm/i915/display/intel_dsi_vbt.c           | 6 ++++--
 drivers/gpu/drm/i915/display/intel_pipe_crc.c          | 1 -
 drivers/gpu/drm/i915/display/intel_pps.c               | 1 -
 drivers/gpu/drm/i915/display/intel_sprite.c            | 2 --
 drivers/gpu/drm/i915/display/skl_universal_plane.c     | 2 +-
 14 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
index ccc4b636c2b8..8966e6560516 100644
--- a/drivers/gpu/drm/i915/display/intel_color.c
+++ b/drivers/gpu/drm/i915/display/intel_color.c
@@ -26,7 +26,6 @@
 #include "intel_color.h"
 #include "intel_de.h"
 #include "intel_display_types.h"
-#include "intel_dpll.h"
 #include "intel_dsb.h"
 
 struct intel_color_funcs {
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 45a932c9b1b3..f9eda7ad892e 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7423,7 +7423,7 @@ static u32 intel_encoder_possible_crtcs(struct intel_encoder *encoder)
 	return possible_crtcs;
 }
 
-static inline bool ilk_has_edp_a(struct drm_i915_private *dev_priv)
+static bool ilk_has_edp_a(struct drm_i915_private *dev_priv)
 {
 	if (!IS_MOBILE(dev_priv))
 		return false;
@@ -7437,7 +7437,7 @@ static inline bool ilk_has_edp_a(struct drm_i915_private *dev_priv)
 	return true;
 }
 
-static inline bool intel_ddi_crt_present(struct drm_i915_private *dev_priv)
+static bool intel_ddi_crt_present(struct drm_i915_private *dev_priv)
 {
 	if (DISPLAY_VER(dev_priv) >= 9)
 		return false;
@@ -7468,6 +7468,7 @@ bool assert_port_valid(struct drm_i915_private *i915, enum port port)
 void intel_setup_outputs(struct drm_i915_private *dev_priv)
 {
 	struct intel_encoder *encoder;
+	bool dpd_is_edp = false;
 
 	intel_pps_unlock_regs_wa(dev_priv);
 
@@ -7491,7 +7492,6 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)
 		if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv))
 			vlv_dsi_init(dev_priv);
 	} else if (HAS_PCH_SPLIT(dev_priv)) {
-		bool dpd_is_edp = false;
 		int found;
 
 		/*
diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 8b8ea8a4a7b0..991461d9c221 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -429,7 +429,6 @@ int vlv_get_cck_clock(struct drm_i915_private *dev_priv,
 		      const char *name, u32 reg, int ref_freq);
 int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv,
 			   const char *name, u32 reg);
-void intel_hpd_poll_fini(struct drm_i915_private *i915);
 void intel_init_display_hooks(struct drm_i915_private *dev_priv);
 unsigned int intel_fb_xy_to_linear(int x, int y,
 				   const struct intel_plane_state *state,
diff --git a/drivers/gpu/drm/i915/display/intel_display_power_map.c b/drivers/gpu/drm/i915/display/intel_display_power_map.c
index be0c5a945669..5ad04cd42c15 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power_map.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power_map.c
@@ -5,6 +5,7 @@
 
 #include "i915_drv.h"
 #include "i915_reg.h"
+
 #include "vlv_sideband_reg.h"
 
 #include "intel_display_power_map.h"
diff --git a/drivers/gpu/drm/i915/display/intel_display_rps.c b/drivers/gpu/drm/i915/display/intel_display_rps.c
index 8c81f542e5e8..918d0327169a 100644
--- a/drivers/gpu/drm/i915/display/intel_display_rps.c
+++ b/drivers/gpu/drm/i915/display/intel_display_rps.c
@@ -7,7 +7,6 @@
 #include <drm/drm_vblank.h>
 
 #include "gt/intel_rps.h"
-
 #include "i915_drv.h"
 #include "intel_display_rps.h"
 #include "intel_display_types.h"
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 5427ce10c06f..9f40da20e88d 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -5416,8 +5416,8 @@ intel_edp_add_properties(struct intel_dp *intel_dp)
 static void intel_edp_backlight_setup(struct intel_dp *intel_dp,
 				      struct intel_connector *connector)
 {
-	enum pipe pipe = INVALID_PIPE;
 	struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+	enum pipe pipe = INVALID_PIPE;
 
 	if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) {
 		/*
diff --git a/drivers/gpu/drm/i915/display/intel_dpio_phy.h b/drivers/gpu/drm/i915/display/intel_dpio_phy.h
index 882bf1bc6b6e..4d43dbbdf81c 100644
--- a/drivers/gpu/drm/i915/display/intel_dpio_phy.h
+++ b/drivers/gpu/drm/i915/display/intel_dpio_phy.h
@@ -7,7 +7,6 @@
 #define __INTEL_DPIO_PHY_H__
 
 #include <linux/types.h>
-#include "intel_display.h"
 
 enum pipe;
 enum port;
diff --git a/drivers/gpu/drm/i915/display/intel_dpll.c b/drivers/gpu/drm/i915/display/intel_dpll.c
index dab8dd915282..999badfe2906 100644
--- a/drivers/gpu/drm/i915/display/intel_dpll.c
+++ b/drivers/gpu/drm/i915/display/intel_dpll.c
@@ -2054,6 +2054,7 @@ void i9xx_disable_pll(const struct intel_crtc_state *crtc_state)
 	intel_de_posting_read(dev_priv, DPLL(pipe));
 }
 
+
 /**
  * vlv_force_pll_off - forcibly disable just the PLL
  * @dev_priv: i915 private structure
diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c
index 3830309aacf4..70d3a41e8b35 100644
--- a/drivers/gpu/drm/i915/display/intel_dsb.c
+++ b/drivers/gpu/drm/i915/display/intel_dsb.c
@@ -15,7 +15,6 @@
 #include "i915_drv.h"
 #include "i915_reg.h"
 #include "intel_de.h"
-#include "intel_dsb.h"
 #include "intel_display_types.h"
 #include "intel_dsb.h"
 #include "intel_dsb_regs.h"
diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
index 173607ab8560..e56ec3f2d84a 100644
--- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
+++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
@@ -831,7 +831,9 @@ bool intel_dsi_vbt_init(struct intel_dsi *intel_dsi, u16 panel_id)
 	intel_dsi->eotp_pkt = mipi_config->eot_pkt_disabled ? 0 : 1;
 	intel_dsi->clock_stop = mipi_config->enable_clk_stop ? 1 : 0;
 	intel_dsi->lane_count = mipi_config->lane_cnt + 1;
-	intel_dsi->pixel_format = mipi_config->videomode_color_format << 7;
+	intel_dsi->pixel_format =
+			pixel_format_from_register_bits(
+				mipi_config->videomode_color_format << 7);
 
 	intel_dsi->dual_link = mipi_config->dual_link;
 	intel_dsi->pixel_overlap = mipi_config->pixel_overlap;
@@ -845,7 +847,7 @@ bool intel_dsi_vbt_init(struct intel_dsi *intel_dsi, u16 panel_id)
 	intel_dsi->init_count = mipi_config->master_init_timer;
 	intel_dsi->bw_timer = mipi_config->dbi_bw_timer;
 	intel_dsi->video_frmt_cfg_bits =
-		mipi_config->bta_enabled ? BIT(3) : 0;
+		mipi_config->bta_enabled ? DISABLE_VIDEO_BTA : 0;
 	intel_dsi->bgr_enabled = mipi_config->rgb_flip;
 
 	/* Starting point, adjusted depending on dual link and burst mode */
diff --git a/drivers/gpu/drm/i915/display/intel_pipe_crc.c b/drivers/gpu/drm/i915/display/intel_pipe_crc.c
index 57a576097b47..5a468ed6e26c 100644
--- a/drivers/gpu/drm/i915/display/intel_pipe_crc.c
+++ b/drivers/gpu/drm/i915/display/intel_pipe_crc.c
@@ -34,7 +34,6 @@
 #include "intel_de.h"
 #include "intel_display_types.h"
 #include "intel_pipe_crc.h"
-#include "i915_irq.h"
 
 static const char * const pipe_crc_sources[] = {
 	[INTEL_PIPE_CRC_SOURCE_NONE] = "none",
diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c
index 19558895c360..73f0f1714b37 100644
--- a/drivers/gpu/drm/i915/display/intel_pps.c
+++ b/drivers/gpu/drm/i915/display/intel_pps.c
@@ -11,7 +11,6 @@
 #include "intel_display_types.h"
 #include "intel_dp.h"
 #include "intel_dpio_phy.h"
-#include "intel_dpio_phy.h"
 #include "intel_dpll.h"
 #include "intel_lvds.h"
 #include "intel_lvds_regs.h"
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index d9713094735b..25034bbf1445 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -40,7 +40,6 @@
 
 #include "i915_drv.h"
 #include "i915_reg.h"
-#include "i915_vgpu.h"
 #include "i9xx_plane.h"
 #include "intel_atomic_plane.h"
 #include "intel_de.h"
@@ -1666,4 +1665,3 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
 
 	return ERR_PTR(ret);
 }
-
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 1064af3c80d8..3c212d8401c8 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -1336,7 +1336,7 @@ skl_plane_async_flip(struct intel_plane *plane,
 			  skl_plane_surf(plane_state, 0));
 }
 
-static inline bool intel_format_is_p01x(u32 format)
+static bool intel_format_is_p01x(u32 format)
 {
 	switch (format) {
 	case DRM_FORMAT_P010:
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [Intel-xe] [PATCH] fixup! drm/i915/display: Remaining changes to make xe compile
@ 2023-05-11 12:29 Jani Nikula
  2023-05-11 22:24 ` Lucas De Marchi
  0 siblings, 1 reply; 23+ messages in thread
From: Jani Nikula @ 2023-05-11 12:29 UTC (permalink / raw)
  To: intel-xe; +Cc: Jani Nikula, Lucas De Marchi

I don't think the ifdef is needed anymore.

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/i915_reg_defs.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_reg_defs.h b/drivers/gpu/drm/i915/i915_reg_defs.h
index eac5a4141bfa..622d603080f9 100644
--- a/drivers/gpu/drm/i915/i915_reg_defs.h
+++ b/drivers/gpu/drm/i915/i915_reg_defs.h
@@ -231,12 +231,8 @@ typedef struct {
  * simply operations on the register's offset and don't care about the MCR vs
  * non-MCR nature of the register.
  */
-#ifdef I915
 #define i915_mmio_reg_offset(r) \
 	_Generic((r), i915_reg_t: (r).reg, i915_mcr_reg_t: (r).reg)
-#else
-#define i915_mmio_reg_offset(r) ((r).reg)
-#endif
 #define i915_mmio_reg_equal(a, b) (i915_mmio_reg_offset(a) == i915_mmio_reg_offset(b))
 #define i915_mmio_reg_valid(r) (!i915_mmio_reg_equal(r, INVALID_MMIO_REG))
 
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [Intel-xe] [PATCH] fixup! drm/i915/display: Remaining changes to make xe compile
@ 2023-05-11  9:28 Jani Nikula
  2023-05-16 20:59 ` Rodrigo Vivi
  0 siblings, 1 reply; 23+ messages in thread
From: Jani Nikula @ 2023-05-11  9:28 UTC (permalink / raw)
  To: intel-xe; +Cc: Jani Nikula, Rodrigo Vivi

The dsparb_lock may be coming back with [1] later, but adding it here is
probably just a rebase leftover. Drop it.

[1] https://patchwork.freedesktop.org/patch/msgid/20230327161223.406573-1-rodrigo.vivi@intel.com

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_core.h | 3 ---
 drivers/gpu/drm/i915/i915_driver.c                | 1 -
 2 files changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index 437f623337e3..e36f88a39b86 100644
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -264,9 +264,6 @@ struct intel_wm {
 	 */
 	struct mutex wm_mutex;
 
-	/* protects DSPARB registers on pre-g4x/vlv/chv */
-	spinlock_t dsparb_lock;
-
 	bool ipc_enabled;
 };
 
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 5d302602793c..12ba7cf78b1e 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -215,7 +215,6 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)
 	spin_lock_init(&dev_priv->irq_lock);
 	spin_lock_init(&dev_priv->gpu_error.lock);
 	spin_lock_init(&dev_priv->display.fb_tracking.lock);
-	spin_lock_init(&dev_priv->display.wm.dsparb_lock);
 	mutex_init(&dev_priv->display.backlight.lock);
 
 	mutex_init(&dev_priv->sb_lock);
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 23+ messages in thread
end of thread, other threads:[~2023-08-08  7:47 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-03 10:53 [Intel-xe] [PATCH] fixup! drm/i915/display: Remaining changes to make xe compile Jani Nikula
2023-08-03 10:57 ` [Intel-xe] ✓ CI.Patch_applied: success for fixup! drm/i915/display: Remaining changes to make xe compile (rev3) Patchwork
2023-08-03 10:57 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-08-03 10:58 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-08-03 11:02 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-08-03 11:03 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-08-03 11:03 ` [Intel-xe] ✗ CI.checksparse: warning " Patchwork
2023-08-03 12:27 ` [Intel-xe] ✓ CI.Patch_applied: success " Patchwork
2023-08-03 12:27 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-08-03 12:28 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-08-03 12:32 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-08-03 12:32 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-08-03 12:32 ` [Intel-xe] ✗ CI.checksparse: warning " Patchwork
2023-08-04  8:35 ` [Intel-xe] ○ CI.BAT: info " Patchwork
2023-08-04  8:37 ` Patchwork
2023-08-07 22:09 ` [Intel-xe] [PATCH] fixup! drm/i915/display: Remaining changes to make xe compile Rodrigo Vivi
2023-08-08  7:46   ` Jani Nikula
  -- strict thread matches above, loose matches on Subject: below --
2023-05-11 12:29 Jani Nikula
2023-05-11 22:24 ` Lucas De Marchi
2023-05-12  7:28   ` Jani Nikula
2023-05-11  9:28 Jani Nikula
2023-05-16 20:59 ` Rodrigo Vivi
2023-05-17  7:53   ` Jani Nikula

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