drm/i915: some more header juggling
Subsystems (3)
PATCH 1/10 drm/i915: move intel_display.c function declarations
In reply to Jani NikulaMove the declarations of functions in intel_display.c to intel_display.h. There is still plenty of cleanup to do in intel_display.[ch], but one step at a time.
--- drivers/gpu/drm/i915/display/intel_display.h | 171 +++++++++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 15 -- drivers/gpu/drm/i915/intel_drv.h | 134 --------------- 3 files changed, 171 insertions(+), 149 deletions(-)
drivers/gpu/drm/i915/display/intel_display.h +171 -0
@@ -28,8 +28,30 @@#include <drm/drm_util.h> #include <drm/i915_drm.h> +enum link_m_n_set ; +struct dpll ; +struct drm_connector ; +struct drm_device ; +struct drm_encoder ; +struct drm_file ; +struct drm_framebuffer ; +struct drm_i915_error_state_buf ; +struct drm_i915_gem_object ;struct drm_i915_private ; +struct drm_modeset_acquire_ctx ; +struct drm_plane ; +struct drm_plane_state ; +struct i915_ggtt_view ; +struct intel_crtc ; +struct intel_crtc_state ; +struct intel_digital_port ; +struct intel_dp ; +struct intel_encoder ; +struct intel_load_detect_pipe ; +struct intel_plane ;struct intel_plane_state ; +struct intel_remapped_info ; +struct intel_rotation_info ;enum i915_gpio {GPIOA ,
@@ -400,4 +422,153 @@ u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv,bool intel_plane_can_remap (const struct intel_plane_state *plane_state);enum phy intel_port_to_phy (struct drm_i915_private *i915,enum port port); +void intel_plane_destroy (struct drm_plane *plane); +void i830_enable_pipe (struct drm_i915_private *dev_priv,enum pipe pipe); +void i830_disable_pipe (struct drm_i915_private *dev_priv,enum pipe pipe); +enum pipe intel_crtc_pch_transcoder (struct intel_crtc *crtc); +int vlv_get_hpll_vco (struct drm_i915_private *dev_priv); +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 lpt_disable_pch_transcoder (struct drm_i915_private *dev_priv); +void lpt_disable_iclkip (struct drm_i915_private *dev_priv); +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, +int plane); +unsigned int intel_fb_align_height (const struct drm_framebuffer *fb, +int color_plane,unsigned int height); +void intel_add_fb_offsets (int *x,int *y, +const struct intel_plane_state *state,int plane); +unsigned int intel_rotation_info_size (const struct intel_rotation_info *rot_info); +unsigned int intel_remapped_info_size (const struct intel_remapped_info *rem_info); +bool intel_has_pending_fb_unpin (struct drm_i915_private *dev_priv); +int intel_display_suspend (struct drm_device *dev); +void intel_pps_unlock_regs_wa (struct drm_i915_private *dev_priv); +void intel_encoder_destroy (struct drm_encoder *encoder); +struct drm_display_mode * +intel_encoder_current_mode (struct intel_encoder *encoder); +bool intel_phy_is_combo (struct drm_i915_private *dev_priv,enum phy phy); +bool intel_phy_is_tc (struct drm_i915_private *dev_priv,enum phy phy); +enum tc_port intel_port_to_tc (struct drm_i915_private *dev_priv, +enum port port); +int intel_get_pipe_from_crtc_id_ioctl (struct drm_device *dev,void *data, +struct drm_file *file_priv); +enum transcoder intel_pipe_to_cpu_transcoder (struct drm_i915_private *dev_priv, +enum pipe pipe); +u32 intel_crtc_get_vblank_counter (struct intel_crtc *crtc); + +int ironlake_get_lanes_required (int target_clock,int link_bw,int bpp); +void vlv_wait_port_ready (struct drm_i915_private *dev_priv, +struct intel_digital_port *dport, +unsigned int expected_mask); +int intel_get_load_detect_pipe (struct drm_connector *connector, +const struct drm_display_mode *mode, +struct intel_load_detect_pipe *old, +struct drm_modeset_acquire_ctx *ctx); +void intel_release_load_detect_pipe (struct drm_connector *connector, +struct intel_load_detect_pipe *old, +struct drm_modeset_acquire_ctx *ctx); +struct i915_vma * +intel_pin_and_fence_fb_obj (struct drm_framebuffer *fb, +const struct i915_ggtt_view *view, +bool uses_fence, +unsigned long *out_flags); +void intel_unpin_fb_vma (struct i915_vma *vma,unsigned long flags); +struct drm_framebuffer * +intel_framebuffer_create (struct drm_i915_gem_object *obj, +struct drm_mode_fb_cmd2 *mode_cmd); +int intel_prepare_plane_fb (struct drm_plane *plane, +struct drm_plane_state *new_state); +void intel_cleanup_plane_fb (struct drm_plane *plane, +struct drm_plane_state *old_state); + +void assert_pch_transcoder_disabled (struct drm_i915_private *dev_priv, +enum pipe pipe); + +int vlv_force_pll_on (struct drm_i915_private *dev_priv,enum pipe pipe, +const struct dpll *dpll); +void vlv_force_pll_off (struct drm_i915_private *dev_priv,enum pipe pipe); +int lpt_get_iclkip (struct drm_i915_private *dev_priv); +bool intel_fuzzy_clock_check (int clock1,int clock2); + +void intel_prepare_reset (struct drm_i915_private *dev_priv); +void intel_finish_reset (struct drm_i915_private *dev_priv); +void intel_dp_get_m_n (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config); +void intel_dp_set_m_n (const struct intel_crtc_state *crtc_state, +enum link_m_n_set m_n); +void intel_dp_ycbcr_420_enable (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state); +int intel_dotclock_calculate (int link_freq,const struct intel_link_m_n *m_n); +bool bxt_find_best_dpll (struct intel_crtc_state *crtc_state, +struct dpll *best_clock); +int chv_calc_dpll_params (int refclk,struct dpll *pll_clock); + +bool intel_crtc_active (struct intel_crtc *crtc); +bool hsw_crtc_state_ips_capable (const struct intel_crtc_state *crtc_state); +void hsw_enable_ips (const struct intel_crtc_state *crtc_state); +void hsw_disable_ips (const struct intel_crtc_state *crtc_state); +enum intel_display_power_domain intel_port_to_power_domain (enum port port); +enum intel_display_power_domain +intel_aux_power_domain (struct intel_digital_port *dig_port); +void intel_mode_from_pipe_config (struct drm_display_mode *mode, +struct intel_crtc_state *pipe_config); +void intel_crtc_arm_fifo_underrun (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state); + +u16 skl_scaler_calc_phase (int sub,int scale,bool chroma_center); +int skl_update_scaler_crtc (struct intel_crtc_state *crtc_state); +int skl_max_scale (const struct intel_crtc_state *crtc_state, +u32 pixel_format); +u32 glk_plane_color_ctl (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state); +u32 glk_plane_color_ctl_crtc (const struct intel_crtc_state *crtc_state); +u32 skl_plane_ctl (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state); +u32 skl_plane_ctl_crtc (const struct intel_crtc_state *crtc_state); +u32 skl_plane_stride (const struct intel_plane_state *plane_state, +int plane); +int skl_check_plane_surface (struct intel_plane_state *plane_state); +int i9xx_check_plane_surface (struct intel_plane_state *plane_state); +int skl_format_to_fourcc (int format,bool rgb_order,bool alpha); +unsigned int i9xx_plane_max_stride (struct intel_plane *plane, +u32 pixel_format,u64 modifier, +unsigned int rotation); +int bdw_get_pipemisc_bpp (struct intel_crtc *crtc); + +struct intel_display_error_state * +intel_display_capture_error_state (struct drm_i915_private *dev_priv); +void intel_display_print_error_state (struct drm_i915_error_state_buf *e, +struct intel_display_error_state *error); + +/* modesetting */ +void intel_modeset_init_hw (struct drm_device *dev); +int intel_modeset_init (struct drm_device *dev); +void intel_modeset_driver_remove (struct drm_device *dev); +int intel_modeset_vga_set_state (struct drm_i915_private *dev_priv,bool state); +void intel_display_resume (struct drm_device *dev); +void i915_redisable_vga (struct drm_i915_private *dev_priv); +void i915_redisable_vga_power_on (struct drm_i915_private *dev_priv); +void intel_init_pch_refclk (struct drm_i915_private *dev_priv); + +/* modesetting asserts */ +void assert_panel_unlocked (struct drm_i915_private *dev_priv, +enum pipe pipe); +void assert_pll (struct drm_i915_private *dev_priv, +enum pipe pipe,bool state); +#define assert_pll_enabled (d, p) assert_pll(d, p, true) +#define assert_pll_disabled (d, p) assert_pll(d, p, false) +void assert_dsi_pll (struct drm_i915_private *dev_priv,bool state); +#define assert_dsi_pll_enabled (d) assert_dsi_pll(d, true) +#define assert_dsi_pll_disabled (d) assert_dsi_pll(d, false) +void assert_fdi_rx_pll (struct drm_i915_private *dev_priv, +enum pipe pipe,bool state); +#define assert_fdi_rx_pll_enabled (d, p) assert_fdi_rx_pll(d, p, true) +#define assert_fdi_rx_pll_disabled (d, p) assert_fdi_rx_pll(d, p, false) +void assert_pipe (struct drm_i915_private *dev_priv,enum pipe pipe,bool state); +#define assert_pipe_enabled (d, p) assert_pipe(d, p, true) +#define assert_pipe_disabled (d, p) assert_pipe(d, p, false) +#endif
drivers/gpu/drm/i915/i915_drv.h +0 -15
@@ -2635,24 +2635,9 @@ mkwrite_device_info(struct drm_i915_private *dev_priv)return (struct intel_device_info *)INTEL_INFO (dev_priv); } -/* modesetting */ -void intel_modeset_init_hw (struct drm_device *dev); -int intel_modeset_init (struct drm_device *dev); -void intel_modeset_driver_remove (struct drm_device *dev); -int intel_modeset_vga_set_state (struct drm_i915_private *dev_priv,bool state); -void intel_display_resume (struct drm_device *dev); -void i915_redisable_vga (struct drm_i915_private *dev_priv); -void i915_redisable_vga_power_on (struct drm_i915_private *dev_priv); -void intel_init_pch_refclk (struct drm_i915_private *dev_priv); -int i915_reg_read_ioctl (struct drm_device *dev,void *data,struct drm_file *file); -struct intel_display_error_state * -intel_display_capture_error_state (struct drm_i915_private *dev_priv); -void intel_display_print_error_state (struct drm_i915_error_state_buf *e, -struct intel_display_error_state *error); -#define __I915_REG_OP (op__, dev_priv__, ...) \ intel_uncore_##op__(&(dev_priv__)->uncore, __VA_ARGS__)
drivers/gpu/drm/i915/intel_drv.h +0 -134
149 lines not on this page · raw message
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
cover drm/i915: some more header juggling
The big theme here is to emphasize that intel_drv.h is a display header, so rename it display/intel_display_types.h and reduce its use in non-display code. Also reduce the inclusion of that and the other mega header i915_drv.h from other headers.
BR,
Jani.
Jani Nikula (10):
drm/i915: move intel_display.c function declarations drm/i915/sprite: un-inline icl_is_hdr_plane() drm/i915/irq: un-inline functions to avoid i915_drv.h include drm/i915/bw: make intel_atomic_get_bw_state() static drm/i915/mst: un-inline intel_dp_mst_encoder_active_links() drm/i915/tc: un-inline intel_tc_port_ref_held()
drm/i915: avoid including intel_drv.h via i915_drv.h->i915_trace.h drm/i915: rename intel_drv.h to display/intel_display_types.h drm/i915: remove unnecessary includes of intel_display_types.h header drm/i915: move property enums to intel_display_types.h
drivers/gpu/drm/i915/display/dvo_ch7017.c | 2 +-
drivers/gpu/drm/i915/display/dvo_ch7xxx.c | 2 +-
drivers/gpu/drm/i915/display/dvo_ivch.c | 2 +-
drivers/gpu/drm/i915/display/dvo_ns2501.c | 2 +-
drivers/gpu/drm/i915/display/dvo_sil164.c | 2 +-
drivers/gpu/drm/i915/display/dvo_tfp410.c | 2 +-
drivers/gpu/drm/i915/display/intel_atomic.c | 2 +-
.../gpu/drm/i915/display/intel_atomic_plane.c | 3 +-
drivers/gpu/drm/i915/display/intel_audio.c | 2 +-
drivers/gpu/drm/i915/display/intel_bw.c | 16 +-
drivers/gpu/drm/i915/display/intel_bw.h | 15 --
drivers/gpu/drm/i915/display/intel_cdclk.c | 2 +-
drivers/gpu/drm/i915/display/intel_color.c | 2 +-
.../gpu/drm/i915/display/intel_combo_phy.c | 2 +-
.../gpu/drm/i915/display/intel_connector.c | 2 +-
drivers/gpu/drm/i915/display/intel_crt.c | 2 +-
drivers/gpu/drm/i915/display/intel_ddi.c | 2 +-
drivers/gpu/drm/i915/display/intel_display.c | 4 +-
drivers/gpu/drm/i915/display/intel_display.h | 171 ++++++++++++++++++
.../drm/i915/display/intel_display_power.c | 2 +-
.../intel_display_types.h} | 148 ++-------------
drivers/gpu/drm/i915/display/intel_dp.c | 3 +-
.../drm/i915/display/intel_dp_aux_backlight.c | 2 +-
.../drm/i915/display/intel_dp_link_training.c | 2 +-
drivers/gpu/drm/i915/display/intel_dp_mst.c | 8 +-
drivers/gpu/drm/i915/display/intel_dp_mst.h | 9 +-
drivers/gpu/drm/i915/display/intel_dpio_phy.c | 2 +-
drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +-
drivers/gpu/drm/i915/display/intel_dsi.h | 3 +-
.../i915/display/intel_dsi_dcs_backlight.c | 2 +-
drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +-
drivers/gpu/drm/i915/display/intel_dvo.c | 2 +-
drivers/gpu/drm/i915/display/intel_fbc.c | 2 +-
drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +-
.../drm/i915/display/intel_fifo_underrun.c | 3 +-
.../gpu/drm/i915/display/intel_frontbuffer.c | 2 +-
drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +-
drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +-
drivers/gpu/drm/i915/display/intel_hdmi.c | 4 +-
drivers/gpu/drm/i915/display/intel_hotplug.c | 2 +-
drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +-
drivers/gpu/drm/i915/display/intel_lvds.c | 2 +-
drivers/gpu/drm/i915/display/intel_opregion.c | 2 +-
drivers/gpu/drm/i915/display/intel_overlay.c | 2 +-
drivers/gpu/drm/i915/display/intel_panel.c | 2 +-
drivers/gpu/drm/i915/display/intel_pipe_crc.c | 2 +-
drivers/gpu/drm/i915/display/intel_psr.c | 2 +-
drivers/gpu/drm/i915/display/intel_quirks.c | 2 +-
drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +-
drivers/gpu/drm/i915/display/intel_sprite.c | 9 +-
drivers/gpu/drm/i915/display/intel_sprite.h | 8 +-
drivers/gpu/drm/i915/display/intel_tc.c | 7 +
drivers/gpu/drm/i915/display/intel_tc.h | 10 +-
drivers/gpu/drm/i915/display/intel_tv.c | 2 +-
drivers/gpu/drm/i915/display/intel_vdsc.c | 2 +-
drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +-
drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 1 +
.../gpu/drm/i915/gem/i915_gem_client_blt.c | 4 +-
.../gpu/drm/i915/gem/i915_gem_execbuffer.c | 4 +-
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_object.c | 1 +
.../gpu/drm/i915/gem/i915_gem_object_blt.c | 5 +-
drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 1 +
drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 3 +-
drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 1 +
drivers/gpu/drm/i915/gt/intel_lrc.c | 1 +
drivers/gpu/drm/i915/gt/intel_reset.c | 1 +
.../gpu/drm/i915/gt/uc/intel_guc_submission.c | 1 +
drivers/gpu/drm/i915/i915_debugfs.c | 3 +-
drivers/gpu/drm/i915/i915_drv.c | 2 +-
drivers/gpu/drm/i915/i915_drv.h | 30 +--
drivers/gpu/drm/i915/i915_gem.c | 1 -
drivers/gpu/drm/i915/i915_gem.h | 2 +
drivers/gpu/drm/i915/i915_gem_evict.c | 1 -
drivers/gpu/drm/i915/i915_gem_gtt.c | 1 -
drivers/gpu/drm/i915/i915_irq.c | 21 ++-
drivers/gpu/drm/i915/i915_irq.h | 30 +--
drivers/gpu/drm/i915/i915_request.c | 1 +
drivers/gpu/drm/i915/i915_suspend.c | 2 +-
drivers/gpu/drm/i915/i915_sysfs.c | 1 -
drivers/gpu/drm/i915/i915_trace.h | 2 +-
drivers/gpu/drm/i915/i915_vgpu.c | 1 -
drivers/gpu/drm/i915/i915_vma.c | 1 +
drivers/gpu/drm/i915/intel_pm.c | 3 +-
drivers/gpu/drm/i915/intel_runtime_pm.c | 1 +
drivers/gpu/drm/i915/intel_sideband.c | 4 +-
drivers/gpu/drm/i915/intel_uncore.c | 2 +-
88 files changed, 340 insertions(+), 297 deletions(-)
rename drivers/gpu/drm/i915/{intel_drv.h => display/intel_display_types.h} (85%)Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/10 drm/i915/sprite: un-inline icl_is_hdr_plane()
Avoid including the i915_drv.h mega header from other header files to make further header cleanup easier.
--- drivers/gpu/drm/i915/display/intel_sprite.c | 6 ++++++ drivers/gpu/drm/i915/display/intel_sprite.h | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_sprite.c +6 -0
@@ -330,6 +330,12 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)return 0 ; } +bool icl_is_hdr_plane (struct drm_i915_private *dev_priv,enum plane_id plane_id) +{ +return INTEL_GEN (dev_priv) >=11 && +icl_hdr_plane_mask () &BIT (plane_id); +} + static unsigned int skl_plane_max_stride(struct intel_plane *plane, u32 pixel_format, u64 modifier,
drivers/gpu/drm/i915/display/intel_sprite.h +1 -7
@@ -8,7 +8,6 @@#include <linux/types.h> -#include "i915_drv.h" #include "intel_display.h" struct drm_device ;
@@ -49,11 +48,6 @@ static inline u8 icl_hdr_plane_mask(void) BIT(PLANE_SPRITE0) | BIT(PLANE_SPRITE1); } -static inline bool icl_is_hdr_plane (struct drm_i915_private *dev_priv, -enum plane_id plane_id) -{ -return INTEL_GEN (dev_priv) >=11 && -icl_hdr_plane_mask () &BIT (plane_id); -} +bool icl_is_hdr_plane (struct drm_i915_private *dev_priv,enum plane_id plane_id);#endif /* __INTEL_SPRITE_H__ */
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/10 drm/i915/irq: un-inline functions to avoid i915_drv.h include
In reply to Jani NikulaAvoid including the i915_drv.h mega header from other header files to make further header cleanup easier.
--- drivers/gpu/drm/i915/i915_irq.c | 19 +++++++++++++++++++ drivers/gpu/drm/i915/i915_irq.h | 30 ++++++++++-------------------- 2 files changed, 29 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +19 -0
@@ -595,6 +595,11 @@ void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv)spin_unlock_irq (&dev_priv->irq_lock); } +u32 gen6_sanitize_rps_pm_mask (const struct drm_i915_private *i915,u32 mask) +{ +return mask & ~i915->gt_pm.rps.pm_intrmsk_mbz; +} +void gen6_disable_rps_interrupts (struct drm_i915_private *dev_priv) {struct intel_rps *rps = &dev_priv->gt_pm.rps;
@@ -5196,3 +5201,17 @@ void intel_runtime_pm_enable_interrupts(struct drm_i915_private *dev_priv)intel_irq_reset (dev_priv);intel_irq_postinstall (dev_priv); } + +bool intel_irqs_enabled (struct drm_i915_private *dev_priv) +{ +/* +* We only use drm_irq_uninstall() at unload and VT switch, so +* this is the only thing we need to check. +*/ +return dev_priv->runtime_pm.irqs_enabled; +} + +void intel_synchronize_irq (struct drm_i915_private *i915) +{ +synchronize_irq (i915->drm.pdev->irq); +}
drivers/gpu/drm/i915/i915_irq.h +10 -20
@@ -6,12 +6,18 @@#ifndef __I915_IRQ_H__#define __I915_IRQ_H__ +#include <linux/ktime.h> #include <linux/types.h> -#include "i915_drv.h" +#include "display/intel_display.h" +struct drm_crtc ; +struct drm_device ; +struct drm_display_mode ;struct drm_i915_private ;struct intel_crtc ; +struct intel_crtc ; +struct intel_gt ;struct intel_guc ;void intel_irq_init (struct drm_i915_private *dev_priv);
@@ -85,28 +91,12 @@ void gen6_reset_rps_interrupts(struct drm_i915_private *dev_priv);void gen6_enable_rps_interrupts (struct drm_i915_private *dev_priv);void gen6_disable_rps_interrupts (struct drm_i915_private *dev_priv);void gen6_rps_reset_ei (struct drm_i915_private *dev_priv); - -static inline u32 gen6_sanitize_rps_pm_mask (const struct drm_i915_private *i915, -u32 mask) -{ -return mask & ~i915->gt_pm.rps.pm_intrmsk_mbz; -} +u32 gen6_sanitize_rps_pm_mask (const struct drm_i915_private *i915,u32 mask);void intel_runtime_pm_disable_interrupts (struct drm_i915_private *dev_priv);void intel_runtime_pm_enable_interrupts (struct drm_i915_private *dev_priv); -static inline bool intel_irqs_enabled (struct drm_i915_private *dev_priv) -{ -/* -* We only use drm_irq_uninstall() at unload and VT switch, so -* this is the only thing we need to check. -*/ -return dev_priv->runtime_pm.irqs_enabled; -} - -static inline void intel_synchronize_irq (struct drm_i915_private *i915) -{ -synchronize_irq (i915->drm.pdev->irq); -} +bool intel_irqs_enabled (struct drm_i915_private *dev_priv); +void intel_synchronize_irq (struct drm_i915_private *i915);int intel_get_crtc_scanline (struct intel_crtc *crtc); void gen8_irq_power_well_post_enable(struct drm_i915_private *dev_priv,
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/10 drm/i915/bw: make intel_atomic_get_bw_state() static
In reply to Jani NikulaNo need for this function to be accessible outside of intel_bw.c. Avoid including the i915_drv.h mega header from other header files to make further header cleanup easier.
--- drivers/gpu/drm/i915/display/intel_bw.c | 14 ++++++++++++++ drivers/gpu/drm/i915/display/intel_bw.h | 15 --------------- 2 files changed, 14 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.c +14 -0
@@ -322,6 +322,20 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv,return data_rate; } +static struct intel_bw_state * +intel_atomic_get_bw_state (struct intel_atomic_state *state) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +struct drm_private_state *bw_state; + + bw_state =drm_atomic_get_private_obj_state (&state->base, + &dev_priv->bw_obj); +if (IS_ERR (bw_state)) +return ERR_CAST (bw_state); + +return to_intel_bw_state (bw_state); +} +int intel_bw_atomic_check (struct intel_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev);
drivers/gpu/drm/i915/display/intel_bw.h +0 -15
@@ -8,7 +8,6 @@#include <drm/drm_atomic.h> -#include "i915_drv.h" #include "intel_display.h" struct drm_i915_private ;
@@ -24,20 +23,6 @@ struct intel_bw_state {#define to_intel_bw_state (x) container_of((x), struct intel_bw_state, base) -static inline struct intel_bw_state * -intel_atomic_get_bw_state (struct intel_atomic_state *state) -{ -struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -struct drm_private_state *bw_state; - - bw_state =drm_atomic_get_private_obj_state (&state->base, - &dev_priv->bw_obj); -if (IS_ERR (bw_state)) -return ERR_CAST (bw_state); - -return to_intel_bw_state (bw_state); -} -void intel_bw_init_hw (struct drm_i915_private *dev_priv);int intel_bw_init (struct drm_i915_private *dev_priv);int intel_bw_atomic_check (struct intel_atomic_state *state);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/10 drm/i915/mst: un-inline intel_dp_mst_encoder_active_links()
In reply to Jani NikulaAvoid including the intel_drv.h mega header from other header files to make further header cleanup easier.
--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 ++++++ drivers/gpu/drm/i915/display/intel_dp_mst.h | 9 ++------- 2 files changed, 8 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_dp_mst.c +6 -0
@@ -631,6 +631,12 @@ intel_dp_create_fake_mst_encoders(struct intel_digital_port *intel_dig_port)return true; } +int +intel_dp_mst_encoder_active_links (struct intel_digital_port *intel_dig_port) +{ +return intel_dig_port->dp.active_mst_links; +} +int intel_dp_mst_encoder_init (struct intel_digital_port *intel_dig_port,int conn_base_id) {
drivers/gpu/drm/i915/display/intel_dp_mst.h +2 -7
@@ -6,15 +6,10 @@#ifndef __INTEL_DP_MST_H__#define __INTEL_DP_MST_H__ -#include "intel_drv.h" +struct intel_digital_port ;int intel_dp_mst_encoder_init (struct intel_digital_port *intel_dig_port,int conn_id);void intel_dp_mst_encoder_cleanup (struct intel_digital_port *intel_dig_port); -static inline int -intel_dp_mst_encoder_active_links (struct intel_digital_port *intel_dig_port) -{ -return intel_dig_port->dp.active_mst_links; -} - +int intel_dp_mst_encoder_active_links (struct intel_digital_port *intel_dig_port);#endif /* __INTEL_DP_MST_H__ */
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/10 drm/i915/tc: un-inline intel_tc_port_ref_held()
In reply to Jani NikulaAvoid including the intel_drv.h mega header from other header files to make further header cleanup easier.
--- drivers/gpu/drm/i915/display/intel_tc.c | 7 +++++++ drivers/gpu/drm/i915/display/intel_tc.h | 10 ++-------- 2 files changed, 9 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_tc.c +7 -0
@@ -7,6 +7,7 @@#include "intel_display.h" #include "intel_dp_mst.h" #include "intel_tc.h" +#include "intel_drv.h" static const char *tc_port_mode_name (enum tc_port_mode mode) {
@@ -503,6 +504,12 @@ void intel_tc_port_unlock(struct intel_digital_port *dig_port) wakeref); } +bool intel_tc_port_ref_held (struct intel_digital_port *dig_port) +{ +return mutex_is_locked (&dig_port->tc_lock) || + dig_port->tc_link_refcount; +} +void intel_tc_port_get_link (struct intel_digital_port *dig_port,int required_lanes) {
drivers/gpu/drm/i915/display/intel_tc.h +2 -8
@@ -7,9 +7,8 @@#define __INTEL_TC_H__#include <linux/mutex.h> -#include <linux/types.h> -#include "intel_drv.h" +struct intel_digital_port ;bool intel_tc_port_connected (struct intel_digital_port *dig_port);u32 intel_tc_port_get_lane_mask (struct intel_digital_port *dig_port);
@@ -23,12 +22,7 @@ void intel_tc_port_unlock(struct intel_digital_port *dig_port);void intel_tc_port_get_link (struct intel_digital_port *dig_port,int required_lanes);void intel_tc_port_put_link (struct intel_digital_port *dig_port); - -static inline int intel_tc_port_ref_held (struct intel_digital_port *dig_port) -{ -return mutex_is_locked (&dig_port->tc_lock) || - dig_port->tc_link_refcount; -} +bool intel_tc_port_ref_held (struct intel_digital_port *dig_port);void intel_tc_port_init (struct intel_digital_port *dig_port,bool is_legacy);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/10 drm/i915: avoid including intel_drv.h via i915_drv.h->i915_trace.h
In reply to Jani NikulaDisentangle i915_drv.h from intel_drv.h, which gets included via i915_trace.h. This necessitates including i915_trace.h wherever it's needed.
--- drivers/gpu/drm/i915/display/intel_atomic_plane.c | 1 + drivers/gpu/drm/i915/display/intel_dp.c | 1 + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 1 + drivers/gpu/drm/i915/display/intel_sprite.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_object.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 1 + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 1 + drivers/gpu/drm/i915/gt/intel_lrc.c | 1 + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 1 + drivers/gpu/drm/i915/i915_debugfs.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 3 +-- drivers/gpu/drm/i915/i915_gem.h | 2 ++ drivers/gpu/drm/i915/i915_request.c | 1 + drivers/gpu/drm/i915/i915_vma.c | 1 + drivers/gpu/drm/i915/intel_pm.c | 1 + drivers/gpu/drm/i915/intel_runtime_pm.c | 1 + drivers/gpu/drm/i915/intel_uncore.c | 1 + 19 files changed, 20 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic_plane.c +1 -0
@@ -35,6 +35,7 @@#include <drm/drm_fourcc.h> #include <drm/drm_plane_helper.h> +#include "i915_trace.h" #include "intel_atomic_plane.h" #include "intel_drv.h" #include "intel_pm.h"
drivers/gpu/drm/i915/display/intel_dp.c +1 -0
@@ -44,6 +44,7 @@#include "i915_debugfs.h" #include "i915_drv.h" +#include "i915_trace.h" #include "intel_atomic.h" #include "intel_audio.h" #include "intel_connector.h"
drivers/gpu/drm/i915/display/intel_fifo_underrun.c +1 -0
@@ -26,6 +26,7 @@*/ #include "i915_drv.h" +#include "i915_trace.h" #include "intel_drv.h" #include "intel_fbc.h" #include "intel_fifo_underrun.h"
drivers/gpu/drm/i915/display/intel_sprite.c +1 -0
@@ -40,6 +40,7 @@#include <drm/i915_drm.h> #include "i915_drv.h" +#include "i915_trace.h" #include "intel_atomic_plane.h" #include "intel_drv.h" #include "intel_frontbuffer.h"
drivers/gpu/drm/i915/gem/i915_gem_clflush.c +1 -0
@@ -8,6 +8,7 @@#include "i915_drv.h" #include "i915_gem_clflush.h" +#include "i915_trace.h" static DEFINE_SPINLOCK (clflush_lock);
drivers/gpu/drm/i915/gem/i915_gem_mman.c +1 -0
@@ -13,6 +13,7 @@#include "i915_gem_gtt.h" #include "i915_gem_ioctls.h" #include "i915_gem_object.h" +#include "i915_trace.h" #include "i915_vma.h" #include "intel_drv.h"
drivers/gpu/drm/i915/gem/i915_gem_object.c +1 -0
@@ -29,6 +29,7 @@#include "i915_gem_context.h" #include "i915_gem_object.h" #include "i915_globals.h" +#include "i915_trace.h" static struct i915_global_object { struct i915_global base;
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +1 -0
@@ -10,6 +10,7 @@#include "i915_drv.h" #include "i915_gem_object.h" #include "i915_scatterlist.h" +#include "i915_trace.h" /* * Move pages to appropriate lru and release the pagevec, decrementing the
drivers/gpu/drm/i915/gt/intel_breadcrumbs.c +1 -0
@@ -27,6 +27,7 @@#include <uapi/linux/sched/types.h> #include "i915_drv.h" +#include "i915_trace.h" static void irq_enable (struct intel_engine_cs *engine) {
drivers/gpu/drm/i915/gt/intel_lrc.c +1 -0
@@ -136,6 +136,7 @@#include "gem/i915_gem_context.h" #include "i915_drv.h" +#include "i915_trace.h" #include "i915_vgpu.h" #include "intel_engine_pm.h" #include "intel_gt.h"
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1 -0
@@ -33,6 +33,7 @@#include "intel_guc_submission.h" #include "i915_drv.h" +#include "i915_trace.h" enum {GUC_PREEMPT_NONE =0 ,
drivers/gpu/drm/i915/i915_debugfs.c +1 -0
@@ -44,6 +44,7 @@#include "i915_debugfs.h" #include "i915_irq.h" +#include "i915_trace.h" #include "intel_csr.h" #include "intel_drv.h" #include "intel_pm.h"
drivers/gpu/drm/i915/i915_drv.h +1 -2
@@ -91,6 +91,7 @@#include "i915_scheduler.h" #include "gt/intel_timeline.h" #include "i915_vma.h" +#include "i915_irq.h" #include "intel_gvt.h"
@@ -2338,8 +2339,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_DISPLAY (dev_priv) (INTEL_INFO(dev_priv)->num_pipes > 0) -#include "i915_trace.h" -static inline bool intel_vtd_active (void ) {#ifdef CONFIG_INTEL_IOMMU
drivers/gpu/drm/i915/i915_gem.h +2 -0
@@ -28,6 +28,8 @@#include <linux/bug.h> #include <linux/interrupt.h> +#include <drm/drm_drv.h> +struct drm_i915_private ;#ifdef CONFIG_DRM_I915_DEBUG_GEM
drivers/gpu/drm/i915/i915_request.c +1 -0
@@ -35,6 +35,7 @@#include "i915_active.h" #include "i915_drv.h" #include "i915_globals.h" +#include "i915_trace.h" #include "intel_pm.h" struct execute_cb {
drivers/gpu/drm/i915/i915_vma.c +1 -0
@@ -32,6 +32,7 @@#include "i915_drv.h" #include "i915_globals.h" +#include "i915_trace.h" #include "i915_vma.h" static struct i915_global_vma {
drivers/gpu/drm/i915/intel_pm.c +1 -0
@@ -39,6 +39,7 @@#include "i915_drv.h" #include "i915_irq.h" +#include "i915_trace.h" #include "intel_drv.h" #include "intel_pm.h" #include "intel_sideband.h"
drivers/gpu/drm/i915/intel_runtime_pm.c +1 -0
@@ -32,6 +32,7 @@#include <drm/drm_print.h> #include "i915_drv.h" +#include "i915_trace.h" /** * DOC: runtime pm
drivers/gpu/drm/i915/intel_uncore.c +1 -0
@@ -25,6 +25,7 @@#include <asm/iosf_mbi.h> #include "i915_drv.h" +#include "i915_trace.h" #include "i915_vgpu.h" #include "intel_drv.h" #include "intel_pm.h"
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/10 drm/i915: rename intel_drv.h to display/intel_display_types.h
In reply to Jani NikulaEverything about the file is about display, and mostly about types related to display. Move under display/ as intel_display_types.h to reflect the facts.
There's still plenty to clean up, but start off with moving the file where it logically belongs and naming according to contents.
---
drivers/gpu/drm/i915/display/dvo_ch7017.c | 2 +-
drivers/gpu/drm/i915/display/dvo_ch7xxx.c | 2 +-
drivers/gpu/drm/i915/display/dvo_ivch.c | 2 +-
drivers/gpu/drm/i915/display/dvo_ns2501.c | 2 +-
drivers/gpu/drm/i915/display/dvo_sil164.c | 2 +-
drivers/gpu/drm/i915/display/dvo_tfp410.c | 2 +-
drivers/gpu/drm/i915/display/intel_atomic.c | 2 +-
drivers/gpu/drm/i915/display/intel_atomic_plane.c | 2 +-
drivers/gpu/drm/i915/display/intel_audio.c | 2 +-
drivers/gpu/drm/i915/display/intel_bw.c | 2 +-
drivers/gpu/drm/i915/display/intel_cdclk.c | 2 +-
drivers/gpu/drm/i915/display/intel_color.c | 2 +-
drivers/gpu/drm/i915/display/intel_combo_phy.c | 2 +-
drivers/gpu/drm/i915/display/intel_connector.c | 2 +-
drivers/gpu/drm/i915/display/intel_crt.c | 2 +-
drivers/gpu/drm/i915/display/intel_ddi.c | 2 +-
drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
drivers/gpu/drm/i915/display/intel_display_power.c | 2 +-
.../drm/i915/{intel_drv.h => display/intel_display_types.h} | 0
drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c | 2 +-
drivers/gpu/drm/i915/display/intel_dp_link_training.c | 2 +-
drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +-
drivers/gpu/drm/i915/display/intel_dpio_phy.c | 2 +-
drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +-
drivers/gpu/drm/i915/display/intel_dsi.h | 3 ++-
drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 2 +-
drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +-
drivers/gpu/drm/i915/display/intel_dvo.c | 2 +-
drivers/gpu/drm/i915/display/intel_fbc.c | 2 +-
drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +-
drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 2 +-
drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 +-
drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +-
drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +-
drivers/gpu/drm/i915/display/intel_hdmi.c | 4 ++--
drivers/gpu/drm/i915/display/intel_hotplug.c | 2 +-
drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +-
drivers/gpu/drm/i915/display/intel_lvds.c | 2 +-
drivers/gpu/drm/i915/display/intel_opregion.c | 2 +-
drivers/gpu/drm/i915/display/intel_overlay.c | 2 +-
drivers/gpu/drm/i915/display/intel_panel.c | 2 +-
drivers/gpu/drm/i915/display/intel_pipe_crc.c | 2 +-
drivers/gpu/drm/i915/display/intel_psr.c | 2 +-
drivers/gpu/drm/i915/display/intel_quirks.c | 2 +-
drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +-
drivers/gpu/drm/i915/display/intel_sprite.c | 2 +-
drivers/gpu/drm/i915/display/intel_tc.c | 2 +-
drivers/gpu/drm/i915/display/intel_tv.c | 2 +-
drivers/gpu/drm/i915/display/intel_vdsc.c | 2 +-
drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +-
drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 5 +++--
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 4 ++--
drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 3 ++-
drivers/gpu/drm/i915/gt/intel_reset.c | 1 +
drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
drivers/gpu/drm/i915/i915_drv.c | 2 +-
drivers/gpu/drm/i915/i915_gem.c | 2 +-
drivers/gpu/drm/i915/i915_gem_evict.c | 2 +-
drivers/gpu/drm/i915/i915_gem_fence_reg.c | 2 ++
drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
drivers/gpu/drm/i915/i915_irq.c | 2 +-
drivers/gpu/drm/i915/i915_suspend.c | 2 +-
drivers/gpu/drm/i915/i915_sysfs.c | 3 ++-
drivers/gpu/drm/i915/i915_trace.h | 2 +-
drivers/gpu/drm/i915/i915_vgpu.c | 2 +-
drivers/gpu/drm/i915/intel_pm.c | 2 +-
drivers/gpu/drm/i915/intel_sideband.c | 4 ++--
drivers/gpu/drm/i915/intel_uncore.c | 3 ++-
72 files changed, 82 insertions(+), 74 deletions(-)
rename drivers/gpu/drm/i915/{intel_drv.h => display/intel_display_types.h} (100%)drivers/gpu/drm/i915/display/dvo_ch7017.c +1 -1
@@ -25,7 +25,7 @@* */ -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dvo_dev.h" #define CH7017_TV_DISPLAY_MODE 0x00
drivers/gpu/drm/i915/display/dvo_ch7xxx.c +1 -1
@@ -26,7 +26,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.**************************************************************************/ -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dvo_dev.h" #define CH7xxx_REG_VID 0x4a
drivers/gpu/drm/i915/display/dvo_ivch.c +1 -1
@@ -29,7 +29,7 @@* */ -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dvo_dev.h" /*
drivers/gpu/drm/i915/display/dvo_ns2501.c +1 -1
@@ -28,7 +28,7 @@#include "i915_drv.h" #include "i915_reg.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dvo_dev.h" #define NS2501_VID 0x1305
drivers/gpu/drm/i915/display/dvo_sil164.c +1 -1
@@ -26,7 +26,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.**************************************************************************/ -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dvo_dev.h" #define SIL164_VID 0x0001
drivers/gpu/drm/i915/display/dvo_tfp410.c +1 -1
@@ -25,7 +25,7 @@* */ -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dvo_dev.h" /* register definitions according to the TFP410 data sheet */
drivers/gpu/drm/i915/display/intel_atomic.c +1 -1
@@ -35,7 +35,7 @@#include <drm/drm_plane_helper.h> #include "intel_atomic.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_hdcp.h" #include "intel_sprite.h"
drivers/gpu/drm/i915/display/intel_atomic_plane.c +1 -1
@@ -37,7 +37,7 @@#include "i915_trace.h" #include "intel_atomic_plane.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_pm.h" #include "intel_sprite.h"
drivers/gpu/drm/i915/display/intel_audio.c +1 -1
@@ -29,7 +29,7 @@#include "i915_drv.h" #include "intel_audio.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_lpe_audio.h" /**
drivers/gpu/drm/i915/display/intel_bw.c +1 -1
@@ -6,7 +6,7 @@#include <drm/drm_atomic_state_helper.h> #include "intel_bw.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_sideband.h" /* Parameters for Qclk Geyserville (QGV) */
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -1
@@ -22,7 +22,7 @@*/ #include "intel_cdclk.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_sideband.h" /**
drivers/gpu/drm/i915/display/intel_color.c +1 -1
@@ -23,7 +23,7 @@*/ #include "intel_color.h" -#include "intel_drv.h" +#include "intel_display_types.h" #define CTM_COEFF_SIGN (1ULL << 63)
drivers/gpu/drm/i915/display/intel_combo_phy.c +1 -1
@@ -4,7 +4,7 @@*/ #include "intel_combo_phy.h" -#include "intel_drv.h" +#include "intel_display_types.h" #define for_each_combo_phy (__dev_priv, __phy) \ for ((__phy) = PHY_A; (__phy) < I915_MAX_PHYS; (__phy)++) \
drivers/gpu/drm/i915/display/intel_connector.c +1 -1
@@ -33,7 +33,7 @@#include "i915_drv.h" #include "intel_connector.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_hdcp.h" int intel_connector_init (struct intel_connector *connector)
drivers/gpu/drm/i915/display/intel_crt.c +1 -1
@@ -38,7 +38,7 @@#include "intel_connector.h" #include "intel_crt.h" #include "intel_ddi.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_fifo_underrun.h" #include "intel_gmbus.h" #include "intel_hotplug.h"
drivers/gpu/drm/i915/display/intel_ddi.c +1 -1
@@ -32,10 +32,10 @@#include "intel_combo_phy.h" #include "intel_connector.h" #include "intel_ddi.h" +#include "intel_display_types.h" #include "intel_dp.h" #include "intel_dp_link_training.h" #include "intel_dpio_phy.h" -#include "intel_drv.h" #include "intel_dsi.h" #include "intel_fifo_underrun.h" #include "intel_gmbus.h"
drivers/gpu/drm/i915/display/intel_display.c +2 -2
@@ -62,9 +62,9 @@#include "intel_atomic.h" #include "intel_atomic_plane.h" #include "intel_bw.h" -#include "intel_color.h" #include "intel_cdclk.h" -#include "intel_drv.h" +#include "intel_color.h" +#include "intel_display_types.h" #include "intel_fbc.h" #include "intel_fbdev.h" #include "intel_fifo_underrun.h"
drivers/gpu/drm/i915/display/intel_display_power.c +1 -1
@@ -13,8 +13,8 @@#include "intel_cdclk.h" #include "intel_combo_phy.h" #include "intel_csr.h" +#include "intel_display_types.h" #include "intel_dpio_phy.h" -#include "intel_drv.h" #include "intel_hotplug.h" #include "intel_sideband.h" #include "intel_tc.h"
drivers/gpu/drm/i915/display/intel_display_types.h renamed from drivers/gpu/drm/i915/intel_drv.h +0 -0
drivers/gpu/drm/i915/display/intel_dp.c +1 -1
@@ -49,11 +49,11 @@#include "intel_audio.h" #include "intel_connector.h" #include "intel_ddi.h" +#include "intel_display_types.h" #include "intel_dp.h" #include "intel_dp_link_training.h" #include "intel_dp_mst.h" #include "intel_dpio_phy.h" -#include "intel_drv.h" #include "intel_fifo_underrun.h" #include "intel_hdcp.h" #include "intel_hdmi.h"
drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c +1 -1
@@ -22,8 +22,8 @@* */ +#include "intel_display_types.h" #include "intel_dp_aux_backlight.h" -#include "intel_drv.h" static void set_aux_backlight_enable (struct intel_dp *intel_dp,bool enable) {
drivers/gpu/drm/i915/display/intel_dp_link_training.c +1 -1
@@ -21,9 +21,9 @@* IN THE SOFTWARE. */ +#include "intel_display_types.h" #include "intel_dp.h" #include "intel_dp_link_training.h" -#include "intel_drv.h" static void intel_dp_dump_link_status (const u8 link_status[DP_LINK_STATUS_SIZE ])
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -1
@@ -32,10 +32,10 @@#include "intel_audio.h" #include "intel_connector.h" #include "intel_ddi.h" +#include "intel_display_types.h" #include "intel_dp.h" #include "intel_dp_mst.h" #include "intel_dpio_phy.h" -#include "intel_drv.h" static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, struct intel_crtc_state *crtc_state,
drivers/gpu/drm/i915/display/intel_dpio_phy.c +1 -1
@@ -23,8 +23,8 @@#include "display/intel_dp.h" +#include "intel_display_types.h" #include "intel_dpio_phy.h" -#include "intel_drv.h" #include "intel_sideband.h" /**
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +1 -1
@@ -21,9 +21,9 @@* DEALINGS IN THE SOFTWARE. */ +#include "intel_display_types.h" #include "intel_dpio_phy.h" #include "intel_dpll_mgr.h" -#include "intel_drv.h" /** * DOC: Display PLLs
drivers/gpu/drm/i915/display/intel_dsi.h +2 -1
@@ -26,7 +26,8 @@#include <drm/drm_crtc.h> #include <drm/drm_mipi_dsi.h> -#include "intel_drv.h" + +#include "intel_display_types.h" #define INTEL_DSI_VIDEO_MODE 0#define INTEL_DSI_COMMAND_MODE 1
drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c +1 -1
@@ -27,7 +27,7 @@#include <video/mipi_display.h> #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dsi.h" #include "intel_dsi_dcs_backlight.h"
drivers/gpu/drm/i915/display/intel_dsi_vbt.c +1 -1
@@ -38,7 +38,7 @@#include <video/mipi_display.h> #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dsi.h" #include "intel_sideband.h"
drivers/gpu/drm/i915/display/intel_dvo.c +1 -1
@@ -34,7 +34,7 @@#include "i915_drv.h" #include "intel_connector.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dvo.h" #include "intel_dvo_dev.h" #include "intel_gmbus.h"
drivers/gpu/drm/i915/display/intel_fbc.c +1 -1
@@ -41,7 +41,7 @@#include <drm/drm_fourcc.h> #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_fbc.h" #include "intel_frontbuffer.h"
drivers/gpu/drm/i915/display/intel_fbdev.c +1 -1
@@ -43,7 +43,7 @@#include <drm/i915_drm.h> #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_fbdev.h" #include "intel_frontbuffer.h"
drivers/gpu/drm/i915/display/intel_fifo_underrun.c +1 -1
@@ -27,7 +27,7 @@#include "i915_drv.h" #include "i915_trace.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_fbc.h" #include "intel_fifo_underrun.h"
drivers/gpu/drm/i915/display/intel_frontbuffer.c +1 -1
@@ -58,7 +58,7 @@#include "display/intel_dp.h" #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_fbc.h" #include "intel_frontbuffer.h" #include "intel_psr.h"
drivers/gpu/drm/i915/display/intel_gmbus.c +1 -1
@@ -35,7 +35,7 @@#include <drm/i915_drm.h> #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_gmbus.h" struct gmbus_pin {
drivers/gpu/drm/i915/display/intel_hdcp.c +1 -1
@@ -14,7 +14,7 @@#include <drm/i915_component.h> #include "i915_reg.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_hdcp.h" #include "intel_sideband.h"
drivers/gpu/drm/i915/display/intel_hdmi.c +2 -2
@@ -45,17 +45,17 @@#include "intel_audio.h" #include "intel_connector.h" #include "intel_ddi.h" +#include "intel_display_types.h" #include "intel_dp.h" #include "intel_dpio_phy.h" -#include "intel_drv.h" #include "intel_fifo_underrun.h" #include "intel_gmbus.h" #include "intel_hdcp.h" #include "intel_hdmi.h" #include "intel_hotplug.h" #include "intel_lspcon.h" -#include "intel_sdvo.h" #include "intel_panel.h" +#include "intel_sdvo.h" #include "intel_sideband.h" static struct drm_device *intel_hdmi_to_dev (struct intel_hdmi *intel_hdmi)
drivers/gpu/drm/i915/display/intel_hotplug.c +1 -1
@@ -26,7 +26,7 @@#include <drm/i915_drm.h> #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_hotplug.h" /**
drivers/gpu/drm/i915/display/intel_lspcon.c +1 -1
@@ -27,8 +27,8 @@#include <drm/drm_dp_dual_mode_helper.h> #include <drm/drm_edid.h> +#include "intel_display_types.h" #include "intel_dp.h" -#include "intel_drv.h" #include "intel_lspcon.h" /* LSPCON OUI Vendor ID(signatures) */
drivers/gpu/drm/i915/display/intel_lvds.c +1 -1
@@ -42,7 +42,7 @@#include "i915_drv.h" #include "intel_atomic.h" #include "intel_connector.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_gmbus.h" #include "intel_lvds.h" #include "intel_panel.h"
drivers/gpu/drm/i915/display/intel_opregion.c +1 -1
@@ -35,7 +35,7 @@#include "display/intel_panel.h" #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_opregion.h" #define OPREGION_HEADER_OFFSET 0
drivers/gpu/drm/i915/display/intel_overlay.c +1 -1
@@ -33,7 +33,7 @@#include "i915_drv.h" #include "i915_reg.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_frontbuffer.h" #include "intel_overlay.h"
drivers/gpu/drm/i915/display/intel_panel.c +1 -1
@@ -35,8 +35,8 @@#include <linux/pwm.h> #include "intel_connector.h" +#include "intel_display_types.h" #include "intel_dp_aux_backlight.h" -#include "intel_drv.h" #include "intel_dsi_dcs_backlight.h" #include "intel_panel.h"
drivers/gpu/drm/i915/display/intel_pipe_crc.c +1 -1
@@ -30,7 +30,7 @@#include <linux/seq_file.h> #include "intel_atomic.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_pipe_crc.h" static const char *const pipe_crc_sources[] = {
drivers/gpu/drm/i915/display/intel_psr.c +1 -1
@@ -26,7 +26,7 @@#include "display/intel_dp.h" #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_psr.h" #include "intel_sprite.h"
drivers/gpu/drm/i915/display/intel_quirks.c +1 -1
@@ -5,7 +5,7 @@#include <linux/dmi.h> -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_quirks.h" /*
drivers/gpu/drm/i915/display/intel_sdvo.c +1 -1
@@ -39,7 +39,7 @@#include "i915_drv.h" #include "intel_atomic.h" #include "intel_connector.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_fifo_underrun.h" #include "intel_gmbus.h" #include "intel_hdmi.h"
drivers/gpu/drm/i915/display/intel_sprite.c +1 -1
@@ -42,7 +42,7 @@#include "i915_drv.h" #include "i915_trace.h" #include "intel_atomic_plane.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_frontbuffer.h" #include "intel_pm.h" #include "intel_psr.h"
drivers/gpu/drm/i915/display/intel_tc.c +1 -1
@@ -5,9 +5,9 @@#include "i915_drv.h" #include "intel_display.h" +#include "intel_display_types.h" #include "intel_dp_mst.h" #include "intel_tc.h" -#include "intel_drv.h" static const char *tc_port_mode_name (enum tc_port_mode mode) {
drivers/gpu/drm/i915/display/intel_tv.c +1 -1
@@ -37,7 +37,7 @@#include "i915_drv.h" #include "intel_connector.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_hotplug.h" #include "intel_tv.h"
drivers/gpu/drm/i915/display/intel_vdsc.c +1 -1
@@ -9,7 +9,7 @@#include <drm/i915_drm.h> #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_vdsc.h" enum ROW_INDEX_BPP {
drivers/gpu/drm/i915/display/vlv_dsi.c +1 -1
@@ -34,7 +34,7 @@#include "i915_drv.h" #include "intel_atomic.h" #include "intel_connector.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dsi.h" #include "intel_fifo_underrun.h" #include "intel_panel.h"
drivers/gpu/drm/i915/display/vlv_dsi_pll.c +1 -1
@@ -28,7 +28,7 @@#include <linux/kernel.h> #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dsi.h" #include "intel_sideband.h"
drivers/gpu/drm/i915/gem/i915_gem_client_blt.c +3 -2
@@ -2,10 +2,11 @@/* * Copyright © 2019 Intel Corporation */ -#include "i915_gem_client_blt.h" +#include "display/intel_display_types.h" + +#include "i915_gem_client_blt.h" #include "i915_gem_object_blt.h" -#include "intel_drv.h" struct i915_sleeve {struct i915_vma *vma;
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +1 -1
@@ -12,6 +12,7 @@#include <drm/drm_syncobj.h> #include <drm/i915_drm.h> +#include "display/intel_display_types.h" #include "display/intel_frontbuffer.h" #include "gem/i915_gem_ioctls.h"
@@ -24,7 +25,6 @@#include "i915_gem_clflush.h" #include "i915_gem_context.h" #include "i915_trace.h" -#include "intel_drv.h" enum {FORCE_CPU_RELOC =1 ,
drivers/gpu/drm/i915/gem/i915_gem_mman.c +1 -1
@@ -7,6 +7,7 @@#include <linux/mman.h> #include <linux/sizes.h> +#include "display/intel_display_types.h" #include "gt/intel_gt.h" #include "i915_drv.h"
@@ -15,7 +16,6 @@#include "i915_gem_object.h" #include "i915_trace.h" #include "i915_vma.h" -#include "intel_drv.h" static inline bool __vma_matches(struct vm_area_struct *vma, struct file *filp,
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c +2 -2
@@ -3,10 +3,10 @@* Copyright © 2019 Intel Corporation */ -#include "i915_gem_object_blt.h" +#include "display/intel_display_types.h" +#include "i915_gem_object_blt.h" #include "i915_gem_clflush.h" -#include "intel_drv.h" int intel_emit_vma_fill_blt(struct i915_request *rq, struct i915_vma *vma,
drivers/gpu/drm/i915/gem/i915_gem_userptr.c +2 -1
@@ -12,11 +12,12 @@#include <drm/i915_drm.h> +#include "display/intel_display_types.h" +#include "i915_gem_ioctls.h" #include "i915_gem_object.h" #include "i915_scatterlist.h" #include "i915_trace.h" -#include "intel_drv.h" struct i915_mm_struct {struct mm_struct *mm;
drivers/gpu/drm/i915/gt/intel_reset.c +1 -0
@@ -7,6 +7,7 @@#include <linux/sched/mm.h> #include <linux/stop_machine.h> +#include "display/intel_display_types.h" #include "display/intel_overlay.h" #include "gem/i915_gem_context.h"
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -32,6 +32,7 @@#include <drm/drm_debugfs.h> #include <drm/drm_fourcc.h> +#include "display/intel_display_types.h" #include "display/intel_dp.h" #include "display/intel_fbc.h" #include "display/intel_hdcp.h"
@@ -46,7 +47,6 @@#include "i915_irq.h" #include "i915_trace.h" #include "intel_csr.h" -#include "intel_drv.h" #include "intel_pm.h" #include "intel_sideband.h"
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -51,6 +51,7 @@#include "display/intel_audio.h" #include "display/intel_bw.h" #include "display/intel_cdclk.h" +#include "display/intel_display_types.h" #include "display/intel_dp.h" #include "display/intel_fbdev.h" #include "display/intel_gmbus.h"
@@ -75,7 +76,6 @@#include "i915_trace.h" #include "i915_vgpu.h" #include "intel_csr.h" -#include "intel_drv.h" #include "intel_pm.h" static struct drm_driver driver;
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -39,6 +39,7 @@#include <linux/mman.h> #include "display/intel_display.h" +#include "display/intel_display_types.h" #include "display/intel_frontbuffer.h" #include "gem/i915_gem_clflush.h"
@@ -58,7 +59,6 @@#include "i915_trace.h" #include "i915_vgpu.h" -#include "intel_drv.h" #include "intel_pm.h" static int
drivers/gpu/drm/i915/i915_gem_evict.c +1 -1
@@ -28,10 +28,10 @@#include <drm/i915_drm.h> +#include "display/intel_display_types.h" #include "gem/i915_gem_context.h" #include "i915_drv.h" -#include "intel_drv.h" #include "i915_trace.h" I915_SELFTEST_DECLARE(static struct igt_evict_ctl {
drivers/gpu/drm/i915/i915_gem_fence_reg.c +2 -0
@@ -23,6 +23,8 @@#include <drm/i915_drm.h> +#include "display/intel_display_types.h" +#include "i915_drv.h" #include "i915_scatterlist.h" #include "i915_vgpu.h"
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
@@ -35,6 +35,7 @@#include <drm/i915_drm.h> +#include "display/intel_display_types.h" #include "display/intel_frontbuffer.h" #include "gt/intel_gt.h"
@@ -42,7 +43,6 @@#include "i915_scatterlist.h" #include "i915_trace.h" #include "i915_vgpu.h" -#include "intel_drv.h" #define I915_GFP_ALLOW_FAIL (GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN)
drivers/gpu/drm/i915/i915_irq.c +1 -1
@@ -37,6 +37,7 @@#include <drm/drm_irq.h> #include <drm/i915_drm.h> +#include "display/intel_display_types.h" #include "display/intel_fifo_underrun.h" #include "display/intel_hotplug.h" #include "display/intel_lpe_audio.h"
@@ -47,7 +48,6 @@#include "i915_drv.h" #include "i915_irq.h" #include "i915_trace.h" -#include "intel_drv.h" #include "intel_pm.h" /**
drivers/gpu/drm/i915/i915_suspend.c +1 -1
@@ -26,11 +26,11 @@#include <drm/i915_drm.h> +#include "display/intel_display_types.h" #include "display/intel_fbc.h" #include "display/intel_gmbus.h" #include "i915_reg.h" -#include "intel_drv.h" static void i915_save_display (struct drm_i915_private *dev_priv) {
drivers/gpu/drm/i915/i915_sysfs.c +2 -1
@@ -30,8 +30,9 @@#include <linux/stat.h> #include <linux/sysfs.h> +#include "display/intel_display_types.h" +#include "i915_drv.h" -#include "intel_drv.h" #include "intel_pm.h" #include "intel_sideband.h"
drivers/gpu/drm/i915/i915_trace.h +1 -1
@@ -8,11 +8,11 @@#include <drm/drm_drv.h> +#include "display/intel_display_types.h" #include "gt/intel_engine.h" #include "i915_drv.h" #include "i915_irq.h" -#include "intel_drv.h" #undef TRACE_SYSTEM#define TRACE_SYSTEM i915
drivers/gpu/drm/i915/i915_vgpu.c +1 -1
@@ -21,7 +21,7 @@* SOFTWARE. */ -#include "intel_drv.h" +#include "display/intel_display_types.h" #include "i915_vgpu.h" /**
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -34,13 +34,13 @@#include <drm/drm_plane_helper.h> #include "display/intel_atomic.h" +#include "display/intel_display_types.h" #include "display/intel_fbc.h" #include "display/intel_sprite.h" #include "i915_drv.h" #include "i915_irq.h" #include "i915_trace.h" -#include "intel_drv.h" #include "intel_pm.h" #include "intel_sideband.h" #include "../../../platform/x86/intel_ips.h"
drivers/gpu/drm/i915/intel_sideband.c +2 -2
@@ -24,10 +24,10 @@#include <asm/iosf_mbi.h> -#include "intel_sideband.h" +#include "display/intel_display_types.h" #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_sideband.h" /* * IOSF sideband, see VLV2_SidebandMsg_HAS.docx and
drivers/gpu/drm/i915/intel_uncore.c +2 -1
@@ -24,10 +24,11 @@#include <linux/pm_runtime.h> #include <asm/iosf_mbi.h> +#include "display/intel_display_types.h" +#include "i915_drv.h" #include "i915_trace.h" #include "i915_vgpu.h" -#include "intel_drv.h" #include "intel_pm.h" #define FORCEWAKE_ACK_TIMEOUT_MS 50
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/10 drm/i915: remove unnecessary includes of intel_display_types.h header
In reply to Jani NikulaWith its original name intel_drv.h the intel_display_types.h header was superfluously cargo-cult included all over the place, while it's really mostly about display internals. Remove the unnecessary includes.
--- drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 4 ++-- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 1 - drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 5 ++--- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 4 +--- drivers/gpu/drm/i915/i915_gem.c | 1 - drivers/gpu/drm/i915/i915_gem_evict.c | 1 - drivers/gpu/drm/i915/i915_gem_fence_reg.c | 2 -- drivers/gpu/drm/i915/i915_gem_gtt.c | 1 - drivers/gpu/drm/i915/i915_suspend.c | 2 +- drivers/gpu/drm/i915/i915_sysfs.c | 2 -- drivers/gpu/drm/i915/i915_vgpu.c | 1 - drivers/gpu/drm/i915/intel_sideband.c | 2 -- drivers/gpu/drm/i915/intel_uncore.c | 2 -- 14 files changed, 7 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_client_blt.c +1 -2
@@ -3,8 +3,7 @@* Copyright © 2019 Intel Corporation */ -#include "display/intel_display_types.h" - +#include "i915_drv.h" #include "i915_gem_client_blt.h" #include "i915_gem_object_blt.h"
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +2 -2
@@ -12,7 +12,6 @@#include <drm/drm_syncobj.h> #include <drm/i915_drm.h> -#include "display/intel_display_types.h" #include "display/intel_frontbuffer.h" #include "gem/i915_gem_ioctls.h"
@@ -21,9 +20,10 @@#include "gt/intel_gt.h" #include "gt/intel_gt_pm.h" -#include "i915_gem_ioctls.h" +#include "i915_drv.h" #include "i915_gem_clflush.h" #include "i915_gem_context.h" +#include "i915_gem_ioctls.h" #include "i915_trace.h" enum {
drivers/gpu/drm/i915/gem/i915_gem_mman.c +0 -1
@@ -7,7 +7,6 @@#include <linux/mman.h> #include <linux/sizes.h> -#include "display/intel_display_types.h" #include "gt/intel_gt.h" #include "i915_drv.h"
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c +2 -3
@@ -3,10 +3,9 @@* Copyright © 2019 Intel Corporation */ -#include "display/intel_display_types.h" - -#include "i915_gem_object_blt.h" +#include "i915_drv.h" #include "i915_gem_clflush.h" +#include "i915_gem_object_blt.h" int intel_emit_vma_fill_blt(struct i915_request *rq, struct i915_vma *vma,
drivers/gpu/drm/i915/gem/i915_gem_userptr.c +1 -3
@@ -12,12 +12,10 @@#include <drm/i915_drm.h> -#include "display/intel_display_types.h" - +#include "i915_drv.h" #include "i915_gem_ioctls.h" #include "i915_gem_object.h" #include "i915_scatterlist.h" -#include "i915_trace.h" struct i915_mm_struct {struct mm_struct *mm;
drivers/gpu/drm/i915/i915_gem.c +0 -1
@@ -39,7 +39,6 @@#include <linux/mman.h> #include "display/intel_display.h" -#include "display/intel_display_types.h" #include "display/intel_frontbuffer.h" #include "gem/i915_gem_clflush.h"
drivers/gpu/drm/i915/i915_gem_evict.c +0 -1
@@ -28,7 +28,6 @@#include <drm/i915_drm.h> -#include "display/intel_display_types.h" #include "gem/i915_gem_context.h" #include "i915_drv.h"
drivers/gpu/drm/i915/i915_gem_fence_reg.c +0 -2
@@ -23,8 +23,6 @@#include <drm/i915_drm.h> -#include "display/intel_display_types.h" -#include "i915_drv.h" #include "i915_scatterlist.h" #include "i915_vgpu.h"
drivers/gpu/drm/i915/i915_gem_gtt.c +0 -1
@@ -35,7 +35,6 @@#include <drm/i915_drm.h> -#include "display/intel_display_types.h" #include "display/intel_frontbuffer.h" #include "gt/intel_gt.h"
drivers/gpu/drm/i915/i915_suspend.c +1 -1
@@ -26,10 +26,10 @@#include <drm/i915_drm.h> -#include "display/intel_display_types.h" #include "display/intel_fbc.h" #include "display/intel_gmbus.h" +#include "i915_drv.h" #include "i915_reg.h" static void i915_save_display (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_sysfs.c +0 -2
@@ -30,8 +30,6 @@#include <linux/stat.h> #include <linux/sysfs.h> -#include "display/intel_display_types.h" -#include "i915_drv.h" #include "intel_pm.h" #include "intel_sideband.h"
drivers/gpu/drm/i915/i915_vgpu.c +0 -1
@@ -21,7 +21,6 @@* SOFTWARE. */ -#include "display/intel_display_types.h" #include "i915_vgpu.h" /**
drivers/gpu/drm/i915/intel_sideband.c +0 -2
@@ -24,8 +24,6 @@#include <asm/iosf_mbi.h> -#include "display/intel_display_types.h" -#include "i915_drv.h" #include "intel_sideband.h"
drivers/gpu/drm/i915/intel_uncore.c +0 -2
@@ -24,8 +24,6 @@#include <linux/pm_runtime.h> #include <asm/iosf_mbi.h> -#include "display/intel_display_types.h" -#include "i915_drv.h" #include "i915_trace.h" #include "i915_vgpu.h"
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/10 drm/i915: move property enums to intel_display_types.h
In reply to Jani NikulaMove the property enums closer to home. Acually make the broadcast macros an enum while at it.
--- drivers/gpu/drm/i915/display/intel_display_types.h | 14 ++++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 12 ------------ 2 files changed, 14 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_display_types.h +14 -0
@@ -67,6 +67,20 @@ enum intel_output_type { INTEL_OUTPUT_DP_MST = 11, }; +enum hdmi_force_audio { +HDMI_AUDIO_OFF_DVI =-2 ,/* no aux data for HDMI-DVI converter */ +HDMI_AUDIO_OFF ,/* force turn off HDMI audio */ +HDMI_AUDIO_AUTO ,/* trust EDID */ +HDMI_AUDIO_ON ,/* force turn on HDMI audio */ +}; + +/* "Broadcast RGB" property */ +enum intel_broadcast_rgb { +INTEL_BROADCAST_RGB_AUTO , +INTEL_BROADCAST_RGB_FULL , +INTEL_BROADCAST_RGB_LIMITED , +}; +struct intel_framebuffer {struct drm_framebuffer base;struct intel_rotation_info rot_info;
drivers/gpu/drm/i915/i915_drv.h +0 -12
@@ -1920,13 +1920,6 @@ static inline struct drm_i915_private *wopcm_to_i915(struct intel_wopcm *wopcm) ((engine__) = (dev_priv__)->engine[__mask_next_bit(tmp__)]), 1 : \ 0;) -enum hdmi_force_audio { -HDMI_AUDIO_OFF_DVI =-2 ,/* no aux data for HDMI-DVI converter */ -HDMI_AUDIO_OFF ,/* force turn off HDMI audio */ -HDMI_AUDIO_AUTO ,/* trust EDID */ -HDMI_AUDIO_ON ,/* force turn on HDMI audio */ -}; -#define I915_GTT_OFFSET_NONE ((u32)-1)/*
@@ -2674,11 +2667,6 @@ int i915_reg_read_ioctl(struct drm_device *dev, void *data,#define I915_READ_FW (reg__) __I915_REG_OP(read_fw, dev_priv, (reg__))#define I915_WRITE_FW (reg__, val__) __I915_REG_OP(write_fw, dev_priv, (reg__), (val__)) -/* "Broadcast RGB" property */ -#define INTEL_BROADCAST_RGB_AUTO 0 -#define INTEL_BROADCAST_RGB_FULL 1 -#define INTEL_BROADCAST_RGB_LIMITED 2 -void i915_memcpy_init_early (struct drm_i915_private *dev_priv);bool i915_memcpy_from_wc (void *dst,const void *src,unsigned long len);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Jani Nikula (2019-08-06 11:07:21)
Quoted 9 lines
The big theme here is to emphasize that
intel_drv.his a display header, so rename itdisplay/intel_display_types.hand reduce its use in non-display code. Also reduce the inclusion of that and the other mega headeri915_drv.hfrom other headers.BR,
Jani.
Quoted 11 lines
Jani Nikula (10):
drm/i915: moveintel_display.cfunction declarations drm/i915/sprite: un-inlineicl_is_hdr_plane()drm/i915/irq: un-inline functions to avoidi915_drv.hinclude drm/i915/bw: makeintel_atomic_get_bw_state()static drm/i915/mst: un-inlineintel_dp_mst_encoder_active_links()drm/i915/tc: un-inlineintel_tc_port_ref_held()
drm/i915: avoid includingintel_drv.hviai915_drv.h->i915_trace.hdrm/i915: renameintel_drv.htodisplay/intel_display_types.hdrm/i915: remove unnecessary includes ofintel_display_types.hheader drm/i915: move property enums tointel_display_types.h
A few moments of exasperation of "we use that there!?", but looks all dandy. I didn't spot anything other than mechanical translations and I agree with the direction,
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915: some more header juggling
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: some more header juggling
URL : https://patchwork.freedesktop.org/series/64764/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip a6b92421ae00 drm/i915: move intel_display.c function declarations 5a0cc84ae9c6 drm/i915/sprite: un-inline icl_is_hdr_plane() aeabee83549f drm/i915/irq: un-inline functions to avoid i915_drv.h include 7ea4145ac429 drm/i915/bw: make intel_atomic_get_bw_state() static 09e087d16fdc drm/i915/mst: un-inline intel_dp_mst_encoder_active_links() 46a9855a4d8a drm/i915/tc: un-inline intel_tc_port_ref_held() a4ea6b44f440 drm/i915: avoid including intel_drv.h via i915_drv.h->i915_trace.h 0db7bec61208 drm/i915: rename intel_drv.h to display/intel_display_types.h -:258: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #258: rename from drivers/gpu/drm/i915/intel_drv.h
total: 0 errors, 1 warnings, 0 checks, 686 lines checked4e61339fab24 drm/i915: remove unnecessary includes of intel_display_types.h header 5bd2fe576f94 drm/i915: move property enums to intel_display_types.h
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for drm/i915: some more header juggling
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: some more header juggling
URL : https://patchwork.freedesktop.org/series/64764/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm/i915: move intel_display.c function declarations Okay!
Commit: drm/i915/sprite: un-inline icl_is_hdr_plane() -./drivers/gpu/drm/i915/i915_fixed.h:47:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:47:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:47:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:47:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void)
Commit: drm/i915/irq: un-inline functions to avoid i915_drv.h include Okay!
Commit: drm/i915/bw: make intel_atomic_get_bw_state() static Okay!
Commit: drm/i915/mst: un-inline intel_dp_mst_encoder_active_links() Okay!
Commit: drm/i915/tc: un-inline intel_tc_port_ref_held() Okay!
Commit: drm/i915: avoid including intel_drv.h via i915_drv.h->i915_trace.h Okay!
Commit: drm/i915: rename intel_drv.h to display/intel_display_types.h -drivers/gpu/drm/i915/i915_fixed.h:47:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:47:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:47:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:47:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void)
Commit: drm/i915: remove unnecessary includes of intel_display_types.h header Okay!
Commit: drm/i915: move property enums to intel_display_types.h Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915/tc: un-inline intel_tc_port_ref_held()
In reply to Jani NikulaAvoid including the intel_drv.h mega header from other header files to make further header cleanup easier.
v2: restore the over-eagerly dropped <linux/types.h> (Imre)
--- drivers/gpu/drm/i915/display/intel_tc.c | 7 +++++++ drivers/gpu/drm/i915/display/intel_tc.h | 9 ++------- 2 files changed, 9 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_tc.c +7 -0
@@ -7,6 +7,7 @@#include "intel_display.h" #include "intel_dp_mst.h" #include "intel_tc.h" +#include "intel_drv.h" static const char *tc_port_mode_name (enum tc_port_mode mode) {
@@ -503,6 +504,12 @@ void intel_tc_port_unlock(struct intel_digital_port *dig_port) wakeref); } +bool intel_tc_port_ref_held (struct intel_digital_port *dig_port) +{ +return mutex_is_locked (&dig_port->tc_lock) || + dig_port->tc_link_refcount; +} +void intel_tc_port_get_link (struct intel_digital_port *dig_port,int required_lanes) {
drivers/gpu/drm/i915/display/intel_tc.h +2 -7
@@ -9,7 +9,7 @@#include <linux/mutex.h> #include <linux/types.h> -#include "intel_drv.h" +struct intel_digital_port ;bool intel_tc_port_connected (struct intel_digital_port *dig_port);u32 intel_tc_port_get_lane_mask (struct intel_digital_port *dig_port);
@@ -23,12 +23,7 @@ void intel_tc_port_unlock(struct intel_digital_port *dig_port);void intel_tc_port_get_link (struct intel_digital_port *dig_port,int required_lanes);void intel_tc_port_put_link (struct intel_digital_port *dig_port); - -static inline int intel_tc_port_ref_held (struct intel_digital_port *dig_port) -{ -return mutex_is_locked (&dig_port->tc_lock) || - dig_port->tc_link_refcount; -} +bool intel_tc_port_ref_held (struct intel_digital_port *dig_port);void intel_tc_port_init (struct intel_digital_port *dig_port,bool is_legacy);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: some more header juggling
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: some more header juggling
URL : https://patchwork.freedesktop.org/series/64764/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6639 -> Patchwork_13883
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13883/
Known issues
------------
Here are the changes found in Patchwork_13883 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_pm_rpm@module-reload:
- fi-skl-6770hq: [PASS][1] -> [FAIL][2] ([fdo#108511])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-skl-6770hq/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13883/fi-skl-6770hq/igt@[email protected]
- fi-cfl-8109u: [PASS][3] -> [INCOMPLETE][4] ([fdo#107802])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-cfl-8109u/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13883/fi-cfl-8109u/igt@[email protected]
* igt@kms_addfb_basic@small-bo:
- fi-icl-u3: [PASS][5] -> [DMESG-WARN][6] ([fdo#107724]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-icl-u3/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13883/fi-icl-u3/igt@[email protected]
* igt@kms_busy@basic-flip-a:
- fi-kbl-7567u: [PASS][7] -> [SKIP][8] ([fdo#109271] / [fdo#109278]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-kbl-7567u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13883/fi-kbl-7567u/igt@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7567u: [PASS][9] -> [WARN][10] ([fdo#109380])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-kbl-7567u/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13883/fi-kbl-7567u/igt@[email protected]
* igt@kms_pipe_crc_basic@read-crc-pipe-c:
- fi-kbl-7567u: [PASS][11] -> [SKIP][12] ([fdo#109271]) +23 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-kbl-7567u/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13883/fi-kbl-7567u/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-blb-e6850: [INCOMPLETE][13] ([fdo#107718]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-blb-e6850/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13883/fi-blb-e6850/igt@[email protected]
* igt@kms_busy@basic-flip-c:
- fi-kbl-7500u: [SKIP][15] ([fdo#109271] / [fdo#109278]) -> [PASS][16] +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-kbl-7500u/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13883/fi-kbl-7500u/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][17] ([fdo#109485]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-kbl-7500u/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13883/fi-kbl-7500u/igt@[email protected]
* igt@prime_vgem@basic-fence-flip:
- fi-kbl-7500u: [SKIP][19] ([fdo#109271]) -> [PASS][20] +23 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-kbl-7500u/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13883/fi-kbl-7500u/igt@[email protected]
* igt@vgem_basic@sysfs:
- fi-icl-u3: [DMESG-WARN][21] ([fdo#107724]) -> [PASS][22] +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-icl-u3/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13883/fi-icl-u3/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#107802]: https://bugs.freedesktop.org/show_bug.cgi?id=107802
[fdo#108511]: https://bugs.freedesktop.org/show_bug.cgi?id=108511
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109380]: https://bugs.freedesktop.org/show_bug.cgi?id=109380
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
Participating hosts (54 -> 45)
------------------------------
Missing (9): fi-kbl-soraka fi-ilk-m540 fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-cfl-guc fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6639 -> Patchwork_13883
CI-20190529: 20190529
CI_DRM_6639: 474a7391a134134b2ddba7c7e89fb3bfa7b5a068 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5121: 242cb6f2149cb9699ba9b316e5f60b756260e829 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13883: 5bd2fe576f9429034584dbeaf289572cb9320dcd @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
5bd2fe576f94 drm/i915: move property enums to intel_display_types.h 4e61339fab24 drm/i915: remove unnecessary includes of intel_display_types.h header 0db7bec61208 drm/i915: rename intel_drv.h to display/intel_display_types.h a4ea6b44f440 drm/i915: avoid including intel_drv.h via i915_drv.h->i915_trace.h 46a9855a4d8a drm/i915/tc: un-inline intel_tc_port_ref_held() 09e087d16fdc drm/i915/mst: un-inline intel_dp_mst_encoder_active_links() 7ea4145ac429 drm/i915/bw: make intel_atomic_get_bw_state() static aeabee83549f drm/i915/irq: un-inline functions to avoid i915_drv.h include 5a0cc84ae9c6 drm/i915/sprite: un-inline icl_is_hdr_plane() a6b92421ae00 drm/i915: move intel_display.c function declarations
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13883/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915: rename intel_drv.h to display/intel_display_types.h
In reply to Jani NikulaEverything about the file is about display, and mostly about types related to display. Move under display/ as intel_display_types.h to reflect the facts.
There's still plenty to clean up, but start off with moving the file where it logically belongs and naming according to contents.
v2: fix the include guard name in the renamed file
---
drivers/gpu/drm/i915/display/dvo_ch7017.c | 2 +-
drivers/gpu/drm/i915/display/dvo_ch7xxx.c | 2 +-
drivers/gpu/drm/i915/display/dvo_ivch.c | 2 +-
drivers/gpu/drm/i915/display/dvo_ns2501.c | 2 +-
drivers/gpu/drm/i915/display/dvo_sil164.c | 2 +-
drivers/gpu/drm/i915/display/dvo_tfp410.c | 2 +-
drivers/gpu/drm/i915/display/intel_atomic.c | 2 +-
drivers/gpu/drm/i915/display/intel_atomic_plane.c | 2 +-
drivers/gpu/drm/i915/display/intel_audio.c | 2 +-
drivers/gpu/drm/i915/display/intel_bw.c | 2 +-
drivers/gpu/drm/i915/display/intel_cdclk.c | 2 +-
drivers/gpu/drm/i915/display/intel_color.c | 2 +-
drivers/gpu/drm/i915/display/intel_combo_phy.c | 2 +-
drivers/gpu/drm/i915/display/intel_connector.c | 2 +-
drivers/gpu/drm/i915/display/intel_crt.c | 2 +-
drivers/gpu/drm/i915/display/intel_ddi.c | 2 +-
drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
drivers/gpu/drm/i915/display/intel_display_power.c | 2 +-
.../i915/{intel_drv.h => display/intel_display_types.h} | 7 ++++---
drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c | 2 +-
drivers/gpu/drm/i915/display/intel_dp_link_training.c | 2 +-
drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +-
drivers/gpu/drm/i915/display/intel_dpio_phy.c | 2 +-
drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +-
drivers/gpu/drm/i915/display/intel_dsi.h | 3 ++-
drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 2 +-
drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +-
drivers/gpu/drm/i915/display/intel_dvo.c | 2 +-
drivers/gpu/drm/i915/display/intel_fbc.c | 2 +-
drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +-
drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 2 +-
drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 +-
drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +-
drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +-
drivers/gpu/drm/i915/display/intel_hdmi.c | 4 ++--
drivers/gpu/drm/i915/display/intel_hotplug.c | 2 +-
drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +-
drivers/gpu/drm/i915/display/intel_lvds.c | 2 +-
drivers/gpu/drm/i915/display/intel_opregion.c | 2 +-
drivers/gpu/drm/i915/display/intel_overlay.c | 2 +-
drivers/gpu/drm/i915/display/intel_panel.c | 2 +-
drivers/gpu/drm/i915/display/intel_pipe_crc.c | 2 +-
drivers/gpu/drm/i915/display/intel_psr.c | 2 +-
drivers/gpu/drm/i915/display/intel_quirks.c | 2 +-
drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +-
drivers/gpu/drm/i915/display/intel_sprite.c | 2 +-
drivers/gpu/drm/i915/display/intel_tc.c | 2 +-
drivers/gpu/drm/i915/display/intel_tv.c | 2 +-
drivers/gpu/drm/i915/display/intel_vdsc.c | 2 +-
drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +-
drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 5 +++--
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 4 ++--
drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 3 ++-
drivers/gpu/drm/i915/gt/intel_reset.c | 1 +
drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
drivers/gpu/drm/i915/i915_drv.c | 2 +-
drivers/gpu/drm/i915/i915_gem.c | 2 +-
drivers/gpu/drm/i915/i915_gem_evict.c | 2 +-
drivers/gpu/drm/i915/i915_gem_fence_reg.c | 2 ++
drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
drivers/gpu/drm/i915/i915_irq.c | 2 +-
drivers/gpu/drm/i915/i915_suspend.c | 2 +-
drivers/gpu/drm/i915/i915_sysfs.c | 3 ++-
drivers/gpu/drm/i915/i915_trace.h | 2 +-
drivers/gpu/drm/i915/i915_vgpu.c | 2 +-
drivers/gpu/drm/i915/intel_pm.c | 2 +-
drivers/gpu/drm/i915/intel_sideband.c | 4 ++--
drivers/gpu/drm/i915/intel_uncore.c | 3 ++-
72 files changed, 86 insertions(+), 77 deletions(-)
rename drivers/gpu/drm/i915/{intel_drv.h => display/intel_display_types.h} (99%)drivers/gpu/drm/i915/display/dvo_ch7017.c +1 -1
@@ -25,7 +25,7 @@* */ -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dvo_dev.h" #define CH7017_TV_DISPLAY_MODE 0x00
drivers/gpu/drm/i915/display/dvo_ch7xxx.c +1 -1
@@ -26,7 +26,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.**************************************************************************/ -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dvo_dev.h" #define CH7xxx_REG_VID 0x4a
drivers/gpu/drm/i915/display/dvo_ivch.c +1 -1
@@ -29,7 +29,7 @@* */ -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dvo_dev.h" /*
drivers/gpu/drm/i915/display/dvo_ns2501.c +1 -1
@@ -28,7 +28,7 @@#include "i915_drv.h" #include "i915_reg.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dvo_dev.h" #define NS2501_VID 0x1305
drivers/gpu/drm/i915/display/dvo_sil164.c +1 -1
@@ -26,7 +26,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.**************************************************************************/ -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dvo_dev.h" #define SIL164_VID 0x0001
drivers/gpu/drm/i915/display/dvo_tfp410.c +1 -1
@@ -25,7 +25,7 @@* */ -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dvo_dev.h" /* register definitions according to the TFP410 data sheet */
drivers/gpu/drm/i915/display/intel_atomic.c +1 -1
@@ -35,7 +35,7 @@#include <drm/drm_plane_helper.h> #include "intel_atomic.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_hdcp.h" #include "intel_sprite.h"
drivers/gpu/drm/i915/display/intel_atomic_plane.c +1 -1
@@ -37,7 +37,7 @@#include "i915_trace.h" #include "intel_atomic_plane.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_pm.h" #include "intel_sprite.h"
drivers/gpu/drm/i915/display/intel_audio.c +1 -1
@@ -29,7 +29,7 @@#include "i915_drv.h" #include "intel_audio.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_lpe_audio.h" /**
drivers/gpu/drm/i915/display/intel_bw.c +1 -1
@@ -6,7 +6,7 @@#include <drm/drm_atomic_state_helper.h> #include "intel_bw.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_sideband.h" /* Parameters for Qclk Geyserville (QGV) */
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -1
@@ -22,7 +22,7 @@*/ #include "intel_cdclk.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_sideband.h" /**
drivers/gpu/drm/i915/display/intel_color.c +1 -1
@@ -23,7 +23,7 @@*/ #include "intel_color.h" -#include "intel_drv.h" +#include "intel_display_types.h" #define CTM_COEFF_SIGN (1ULL << 63)
drivers/gpu/drm/i915/display/intel_combo_phy.c +1 -1
@@ -4,7 +4,7 @@*/ #include "intel_combo_phy.h" -#include "intel_drv.h" +#include "intel_display_types.h" #define for_each_combo_phy (__dev_priv, __phy) \ for ((__phy) = PHY_A; (__phy) < I915_MAX_PHYS; (__phy)++) \
drivers/gpu/drm/i915/display/intel_connector.c +1 -1
@@ -33,7 +33,7 @@#include "i915_drv.h" #include "intel_connector.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_hdcp.h" int intel_connector_init (struct intel_connector *connector)
drivers/gpu/drm/i915/display/intel_crt.c +1 -1
@@ -38,7 +38,7 @@#include "intel_connector.h" #include "intel_crt.h" #include "intel_ddi.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_fifo_underrun.h" #include "intel_gmbus.h" #include "intel_hotplug.h"
drivers/gpu/drm/i915/display/intel_ddi.c +1 -1
@@ -32,10 +32,10 @@#include "intel_combo_phy.h" #include "intel_connector.h" #include "intel_ddi.h" +#include "intel_display_types.h" #include "intel_dp.h" #include "intel_dp_link_training.h" #include "intel_dpio_phy.h" -#include "intel_drv.h" #include "intel_dsi.h" #include "intel_fifo_underrun.h" #include "intel_gmbus.h"
drivers/gpu/drm/i915/display/intel_display.c +2 -2
@@ -62,9 +62,9 @@#include "intel_atomic.h" #include "intel_atomic_plane.h" #include "intel_bw.h" -#include "intel_color.h" #include "intel_cdclk.h" -#include "intel_drv.h" +#include "intel_color.h" +#include "intel_display_types.h" #include "intel_fbc.h" #include "intel_fbdev.h" #include "intel_fifo_underrun.h"
drivers/gpu/drm/i915/display/intel_display_power.c +1 -1
@@ -13,8 +13,8 @@#include "intel_cdclk.h" #include "intel_combo_phy.h" #include "intel_csr.h" +#include "intel_display_types.h" #include "intel_dpio_phy.h" -#include "intel_drv.h" #include "intel_hotplug.h" #include "intel_sideband.h" #include "intel_tc.h"
drivers/gpu/drm/i915/display/intel_display_types.h renamed from drivers/gpu/drm/i915/intel_drv.h +4 -3
@@ -22,8 +22,9 @@* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#ifndef __INTEL_DRV_H__ -#define __INTEL_DRV_H__ + +#ifndef __INTEL_DISPLAY_TYPES_H__ +#define __INTEL_DISPLAY_TYPES_H__#include <linux/async.h> #include <linux/i2c.h>
@@ -1506,4 +1507,4 @@ static inline u32 intel_plane_ggtt_offset(const struct intel_plane_state *state) return i915_ggtt_offset(state->vma); } -#endif /* __INTEL_DRV_H__ */ +#endif /* __INTEL_DISPLAY_TYPES_H__ */
drivers/gpu/drm/i915/display/intel_dp.c +1 -1
@@ -49,11 +49,11 @@#include "intel_audio.h" #include "intel_connector.h" #include "intel_ddi.h" +#include "intel_display_types.h" #include "intel_dp.h" #include "intel_dp_link_training.h" #include "intel_dp_mst.h" #include "intel_dpio_phy.h" -#include "intel_drv.h" #include "intel_fifo_underrun.h" #include "intel_hdcp.h" #include "intel_hdmi.h"
drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c +1 -1
@@ -22,8 +22,8 @@* */ +#include "intel_display_types.h" #include "intel_dp_aux_backlight.h" -#include "intel_drv.h" static void set_aux_backlight_enable (struct intel_dp *intel_dp,bool enable) {
drivers/gpu/drm/i915/display/intel_dp_link_training.c +1 -1
@@ -21,9 +21,9 @@* IN THE SOFTWARE. */ +#include "intel_display_types.h" #include "intel_dp.h" #include "intel_dp_link_training.h" -#include "intel_drv.h" static void intel_dp_dump_link_status (const u8 link_status[DP_LINK_STATUS_SIZE ])
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -1
@@ -32,10 +32,10 @@#include "intel_audio.h" #include "intel_connector.h" #include "intel_ddi.h" +#include "intel_display_types.h" #include "intel_dp.h" #include "intel_dp_mst.h" #include "intel_dpio_phy.h" -#include "intel_drv.h" static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, struct intel_crtc_state *crtc_state,
drivers/gpu/drm/i915/display/intel_dpio_phy.c +1 -1
@@ -23,8 +23,8 @@#include "display/intel_dp.h" +#include "intel_display_types.h" #include "intel_dpio_phy.h" -#include "intel_drv.h" #include "intel_sideband.h" /**
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +1 -1
@@ -21,9 +21,9 @@* DEALINGS IN THE SOFTWARE. */ +#include "intel_display_types.h" #include "intel_dpio_phy.h" #include "intel_dpll_mgr.h" -#include "intel_drv.h" /** * DOC: Display PLLs
drivers/gpu/drm/i915/display/intel_dsi.h +2 -1
@@ -26,7 +26,8 @@#include <drm/drm_crtc.h> #include <drm/drm_mipi_dsi.h> -#include "intel_drv.h" + +#include "intel_display_types.h" #define INTEL_DSI_VIDEO_MODE 0#define INTEL_DSI_COMMAND_MODE 1
drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c +1 -1
@@ -27,7 +27,7 @@#include <video/mipi_display.h> #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dsi.h" #include "intel_dsi_dcs_backlight.h"
drivers/gpu/drm/i915/display/intel_dsi_vbt.c +1 -1
@@ -38,7 +38,7 @@#include <video/mipi_display.h> #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dsi.h" #include "intel_sideband.h"
drivers/gpu/drm/i915/display/intel_dvo.c +1 -1
@@ -34,7 +34,7 @@#include "i915_drv.h" #include "intel_connector.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dvo.h" #include "intel_dvo_dev.h" #include "intel_gmbus.h"
drivers/gpu/drm/i915/display/intel_fbc.c +1 -1
@@ -41,7 +41,7 @@#include <drm/drm_fourcc.h> #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_fbc.h" #include "intel_frontbuffer.h"
drivers/gpu/drm/i915/display/intel_fbdev.c +1 -1
@@ -43,7 +43,7 @@#include <drm/i915_drm.h> #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_fbdev.h" #include "intel_frontbuffer.h"
drivers/gpu/drm/i915/display/intel_fifo_underrun.c +1 -1
@@ -27,7 +27,7 @@#include "i915_drv.h" #include "i915_trace.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_fbc.h" #include "intel_fifo_underrun.h"
drivers/gpu/drm/i915/display/intel_frontbuffer.c +1 -1
@@ -58,7 +58,7 @@#include "display/intel_dp.h" #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_fbc.h" #include "intel_frontbuffer.h" #include "intel_psr.h"
drivers/gpu/drm/i915/display/intel_gmbus.c +1 -1
@@ -35,7 +35,7 @@#include <drm/i915_drm.h> #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_gmbus.h" struct gmbus_pin {
drivers/gpu/drm/i915/display/intel_hdcp.c +1 -1
@@ -14,7 +14,7 @@#include <drm/i915_component.h> #include "i915_reg.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_hdcp.h" #include "intel_sideband.h"
drivers/gpu/drm/i915/display/intel_hdmi.c +2 -2
@@ -45,17 +45,17 @@#include "intel_audio.h" #include "intel_connector.h" #include "intel_ddi.h" +#include "intel_display_types.h" #include "intel_dp.h" #include "intel_dpio_phy.h" -#include "intel_drv.h" #include "intel_fifo_underrun.h" #include "intel_gmbus.h" #include "intel_hdcp.h" #include "intel_hdmi.h" #include "intel_hotplug.h" #include "intel_lspcon.h" -#include "intel_sdvo.h" #include "intel_panel.h" +#include "intel_sdvo.h" #include "intel_sideband.h" static struct drm_device *intel_hdmi_to_dev (struct intel_hdmi *intel_hdmi)
drivers/gpu/drm/i915/display/intel_hotplug.c +1 -1
@@ -26,7 +26,7 @@#include <drm/i915_drm.h> #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_hotplug.h" /**
drivers/gpu/drm/i915/display/intel_lspcon.c +1 -1
@@ -27,8 +27,8 @@#include <drm/drm_dp_dual_mode_helper.h> #include <drm/drm_edid.h> +#include "intel_display_types.h" #include "intel_dp.h" -#include "intel_drv.h" #include "intel_lspcon.h" /* LSPCON OUI Vendor ID(signatures) */
drivers/gpu/drm/i915/display/intel_lvds.c +1 -1
@@ -42,7 +42,7 @@#include "i915_drv.h" #include "intel_atomic.h" #include "intel_connector.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_gmbus.h" #include "intel_lvds.h" #include "intel_panel.h"
drivers/gpu/drm/i915/display/intel_opregion.c +1 -1
@@ -35,7 +35,7 @@#include "display/intel_panel.h" #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_opregion.h" #define OPREGION_HEADER_OFFSET 0
drivers/gpu/drm/i915/display/intel_overlay.c +1 -1
@@ -33,7 +33,7 @@#include "i915_drv.h" #include "i915_reg.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_frontbuffer.h" #include "intel_overlay.h"
drivers/gpu/drm/i915/display/intel_panel.c +1 -1
@@ -35,8 +35,8 @@#include <linux/pwm.h> #include "intel_connector.h" +#include "intel_display_types.h" #include "intel_dp_aux_backlight.h" -#include "intel_drv.h" #include "intel_dsi_dcs_backlight.h" #include "intel_panel.h"
drivers/gpu/drm/i915/display/intel_pipe_crc.c +1 -1
@@ -30,7 +30,7 @@#include <linux/seq_file.h> #include "intel_atomic.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_pipe_crc.h" static const char *const pipe_crc_sources[] = {
drivers/gpu/drm/i915/display/intel_psr.c +1 -1
@@ -26,7 +26,7 @@#include "display/intel_dp.h" #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_psr.h" #include "intel_sprite.h"
drivers/gpu/drm/i915/display/intel_quirks.c +1 -1
@@ -5,7 +5,7 @@#include <linux/dmi.h> -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_quirks.h" /*
drivers/gpu/drm/i915/display/intel_sdvo.c +1 -1
@@ -39,7 +39,7 @@#include "i915_drv.h" #include "intel_atomic.h" #include "intel_connector.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_fifo_underrun.h" #include "intel_gmbus.h" #include "intel_hdmi.h"
drivers/gpu/drm/i915/display/intel_sprite.c +1 -1
@@ -42,7 +42,7 @@#include "i915_drv.h" #include "i915_trace.h" #include "intel_atomic_plane.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_frontbuffer.h" #include "intel_pm.h" #include "intel_psr.h"
drivers/gpu/drm/i915/display/intel_tc.c +1 -1
@@ -5,9 +5,9 @@#include "i915_drv.h" #include "intel_display.h" +#include "intel_display_types.h" #include "intel_dp_mst.h" #include "intel_tc.h" -#include "intel_drv.h" static const char *tc_port_mode_name (enum tc_port_mode mode) {
drivers/gpu/drm/i915/display/intel_tv.c +1 -1
@@ -37,7 +37,7 @@#include "i915_drv.h" #include "intel_connector.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_hotplug.h" #include "intel_tv.h"
drivers/gpu/drm/i915/display/intel_vdsc.c +1 -1
@@ -9,7 +9,7 @@#include <drm/i915_drm.h> #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_vdsc.h" enum ROW_INDEX_BPP {
drivers/gpu/drm/i915/display/vlv_dsi.c +1 -1
@@ -34,7 +34,7 @@#include "i915_drv.h" #include "intel_atomic.h" #include "intel_connector.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dsi.h" #include "intel_fifo_underrun.h" #include "intel_panel.h"
drivers/gpu/drm/i915/display/vlv_dsi_pll.c +1 -1
@@ -28,7 +28,7 @@#include <linux/kernel.h> #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_display_types.h" #include "intel_dsi.h" #include "intel_sideband.h"
drivers/gpu/drm/i915/gem/i915_gem_client_blt.c +3 -2
@@ -2,10 +2,11 @@/* * Copyright © 2019 Intel Corporation */ -#include "i915_gem_client_blt.h" +#include "display/intel_display_types.h" + +#include "i915_gem_client_blt.h" #include "i915_gem_object_blt.h" -#include "intel_drv.h" struct i915_sleeve {struct i915_vma *vma;
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +1 -1
@@ -12,6 +12,7 @@#include <drm/drm_syncobj.h> #include <drm/i915_drm.h> +#include "display/intel_display_types.h" #include "display/intel_frontbuffer.h" #include "gem/i915_gem_ioctls.h"
@@ -24,7 +25,6 @@#include "i915_gem_clflush.h" #include "i915_gem_context.h" #include "i915_trace.h" -#include "intel_drv.h" enum {FORCE_CPU_RELOC =1 ,
drivers/gpu/drm/i915/gem/i915_gem_mman.c +1 -1
@@ -7,6 +7,7 @@#include <linux/mman.h> #include <linux/sizes.h> +#include "display/intel_display_types.h" #include "gt/intel_gt.h" #include "i915_drv.h"
@@ -15,7 +16,6 @@#include "i915_gem_object.h" #include "i915_trace.h" #include "i915_vma.h" -#include "intel_drv.h" static inline bool __vma_matches(struct vm_area_struct *vma, struct file *filp,
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c +2 -2
@@ -3,10 +3,10 @@* Copyright © 2019 Intel Corporation */ -#include "i915_gem_object_blt.h" +#include "display/intel_display_types.h" +#include "i915_gem_object_blt.h" #include "i915_gem_clflush.h" -#include "intel_drv.h" int intel_emit_vma_fill_blt(struct i915_request *rq, struct i915_vma *vma,
drivers/gpu/drm/i915/gem/i915_gem_userptr.c +2 -1
@@ -12,11 +12,12 @@#include <drm/i915_drm.h> +#include "display/intel_display_types.h" +#include "i915_gem_ioctls.h" #include "i915_gem_object.h" #include "i915_scatterlist.h" #include "i915_trace.h" -#include "intel_drv.h" struct i915_mm_struct {struct mm_struct *mm;
drivers/gpu/drm/i915/gt/intel_reset.c +1 -0
@@ -7,6 +7,7 @@#include <linux/sched/mm.h> #include <linux/stop_machine.h> +#include "display/intel_display_types.h" #include "display/intel_overlay.h" #include "gem/i915_gem_context.h"
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -32,6 +32,7 @@#include <drm/drm_debugfs.h> #include <drm/drm_fourcc.h> +#include "display/intel_display_types.h" #include "display/intel_dp.h" #include "display/intel_fbc.h" #include "display/intel_hdcp.h"
@@ -46,7 +47,6 @@#include "i915_irq.h" #include "i915_trace.h" #include "intel_csr.h" -#include "intel_drv.h" #include "intel_pm.h" #include "intel_sideband.h"
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -51,6 +51,7 @@#include "display/intel_audio.h" #include "display/intel_bw.h" #include "display/intel_cdclk.h" +#include "display/intel_display_types.h" #include "display/intel_dp.h" #include "display/intel_fbdev.h" #include "display/intel_gmbus.h"
@@ -75,7 +76,6 @@#include "i915_trace.h" #include "i915_vgpu.h" #include "intel_csr.h" -#include "intel_drv.h" #include "intel_pm.h" static struct drm_driver driver;
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -39,6 +39,7 @@#include <linux/mman.h> #include "display/intel_display.h" +#include "display/intel_display_types.h" #include "display/intel_frontbuffer.h" #include "gem/i915_gem_clflush.h"
@@ -58,7 +59,6 @@#include "i915_trace.h" #include "i915_vgpu.h" -#include "intel_drv.h" #include "intel_pm.h" static int
drivers/gpu/drm/i915/i915_gem_evict.c +1 -1
@@ -28,10 +28,10 @@#include <drm/i915_drm.h> +#include "display/intel_display_types.h" #include "gem/i915_gem_context.h" #include "i915_drv.h" -#include "intel_drv.h" #include "i915_trace.h" I915_SELFTEST_DECLARE(static struct igt_evict_ctl {
drivers/gpu/drm/i915/i915_gem_fence_reg.c +2 -0
@@ -23,6 +23,8 @@#include <drm/i915_drm.h> +#include "display/intel_display_types.h" +#include "i915_drv.h" #include "i915_scatterlist.h" #include "i915_vgpu.h"
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
@@ -35,6 +35,7 @@#include <drm/i915_drm.h> +#include "display/intel_display_types.h" #include "display/intel_frontbuffer.h" #include "gt/intel_gt.h"
@@ -42,7 +43,6 @@#include "i915_scatterlist.h" #include "i915_trace.h" #include "i915_vgpu.h" -#include "intel_drv.h" #define I915_GFP_ALLOW_FAIL (GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN)
drivers/gpu/drm/i915/i915_irq.c +1 -1
@@ -37,6 +37,7 @@#include <drm/drm_irq.h> #include <drm/i915_drm.h> +#include "display/intel_display_types.h" #include "display/intel_fifo_underrun.h" #include "display/intel_hotplug.h" #include "display/intel_lpe_audio.h"
@@ -47,7 +48,6 @@#include "i915_drv.h" #include "i915_irq.h" #include "i915_trace.h" -#include "intel_drv.h" #include "intel_pm.h" /**
drivers/gpu/drm/i915/i915_suspend.c +1 -1
@@ -26,11 +26,11 @@#include <drm/i915_drm.h> +#include "display/intel_display_types.h" #include "display/intel_fbc.h" #include "display/intel_gmbus.h" #include "i915_reg.h" -#include "intel_drv.h" static void i915_save_display (struct drm_i915_private *dev_priv) {
drivers/gpu/drm/i915/i915_sysfs.c +2 -1
@@ -30,8 +30,9 @@#include <linux/stat.h> #include <linux/sysfs.h> +#include "display/intel_display_types.h" +#include "i915_drv.h" -#include "intel_drv.h" #include "intel_pm.h" #include "intel_sideband.h"
drivers/gpu/drm/i915/i915_trace.h +1 -1
@@ -8,11 +8,11 @@#include <drm/drm_drv.h> +#include "display/intel_display_types.h" #include "gt/intel_engine.h" #include "i915_drv.h" #include "i915_irq.h" -#include "intel_drv.h" #undef TRACE_SYSTEM#define TRACE_SYSTEM i915
drivers/gpu/drm/i915/i915_vgpu.c +1 -1
@@ -21,7 +21,7 @@* SOFTWARE. */ -#include "intel_drv.h" +#include "display/intel_display_types.h" #include "i915_vgpu.h" /**
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -34,13 +34,13 @@#include <drm/drm_plane_helper.h> #include "display/intel_atomic.h" +#include "display/intel_display_types.h" #include "display/intel_fbc.h" #include "display/intel_sprite.h" #include "i915_drv.h" #include "i915_irq.h" #include "i915_trace.h" -#include "intel_drv.h" #include "intel_pm.h" #include "intel_sideband.h" #include "../../../platform/x86/intel_ips.h"
drivers/gpu/drm/i915/intel_sideband.c +2 -2
@@ -24,10 +24,10 @@#include <asm/iosf_mbi.h> -#include "intel_sideband.h" +#include "display/intel_display_types.h" #include "i915_drv.h" -#include "intel_drv.h" +#include "intel_sideband.h" /* * IOSF sideband, see VLV2_SidebandMsg_HAS.docx and
drivers/gpu/drm/i915/intel_uncore.c +2 -1
@@ -24,10 +24,11 @@#include <linux/pm_runtime.h> #include <asm/iosf_mbi.h> +#include "display/intel_display_types.h" +#include "i915_drv.h" #include "i915_trace.h" #include "i915_vgpu.h" -#include "intel_drv.h" #include "intel_pm.h" #define FORCEWAKE_ACK_TIMEOUT_MS 50
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915: some more header juggling (rev3)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: some more header juggling (rev3)
URL : https://patchwork.freedesktop.org/series/64764/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 38e320bf9576 drm/i915: move intel_display.c function declarations e336fea484dd drm/i915/sprite: un-inline icl_is_hdr_plane() cd9318f68c3f drm/i915/irq: un-inline functions to avoid i915_drv.h include e4056cd2e64d drm/i915/bw: make intel_atomic_get_bw_state() static be7a707e1a59 drm/i915/mst: un-inline intel_dp_mst_encoder_active_links() 4a1bca19659f drm/i915/tc: un-inline intel_tc_port_ref_held() 72cb32d38802 drm/i915: avoid including intel_drv.h via i915_drv.h->i915_trace.h ad85c8ba7857 drm/i915: rename intel_drv.h to display/intel_display_types.h -:260: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #260: rename from drivers/gpu/drm/i915/intel_drv.h
total: 0 errors, 1 warnings, 0 checks, 702 lines checked0888f784158f drm/i915: remove unnecessary includes of intel_display_types.h header fc80cc8489bd drm/i915: move property enums to intel_display_types.h
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for drm/i915: some more header juggling (rev3)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: some more header juggling (rev3)
URL : https://patchwork.freedesktop.org/series/64764/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm/i915: move intel_display.c function declarations Okay!
Commit: drm/i915/sprite: un-inline icl_is_hdr_plane() -./drivers/gpu/drm/i915/i915_fixed.h:47:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:47:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:47:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:47:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void)
Commit: drm/i915/irq: un-inline functions to avoid i915_drv.h include Okay!
Commit: drm/i915/bw: make intel_atomic_get_bw_state() static Okay!
Commit: drm/i915/mst: un-inline intel_dp_mst_encoder_active_links() Okay!
Commit: drm/i915/tc: un-inline intel_tc_port_ref_held() Okay!
Commit: drm/i915: avoid including intel_drv.h via i915_drv.h->i915_trace.h Okay!
Commit: drm/i915: rename intel_drv.h to display/intel_display_types.h -drivers/gpu/drm/i915/i915_fixed.h:47:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:47:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:47:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:47:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_fixed.h:55:43: warning: expression using sizeof(void)
Commit: drm/i915: remove unnecessary includes of intel_display_types.h header Okay!
Commit: drm/i915: move property enums to intel_display_types.h Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: some more header juggling (rev3)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: some more header juggling (rev3)
URL : https://patchwork.freedesktop.org/series/64764/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6639 -> Patchwork_13885
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/
Known issues
------------
Here are the changes found in Patchwork_13885 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fence@basic-wait-default:
- fi-icl-u3: [PASS][1] -> [DMESG-WARN][2] ([fdo#107724]) +2 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-icl-u3/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/fi-icl-u3/igt@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7567u: [PASS][3] -> [WARN][4] ([fdo#109380])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-kbl-7567u/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/fi-kbl-7567u/igt@[email protected]
* igt@kms_pipe_crc_basic@read-crc-pipe-c:
- fi-kbl-7567u: [PASS][5] -> [SKIP][6] ([fdo#109271]) +23 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-kbl-7567u/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/fi-kbl-7567u/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-blb-e6850: [INCOMPLETE][7] ([fdo#107718]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-blb-e6850/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/fi-blb-e6850/igt@[email protected]
* igt@kms_busy@basic-flip-c:
- fi-kbl-7500u: [SKIP][9] ([fdo#109271] / [fdo#109278]) -> [PASS][10] +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-kbl-7500u/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/fi-kbl-7500u/igt@[email protected]
* igt@prime_vgem@basic-fence-flip:
- fi-kbl-7500u: [SKIP][11] ([fdo#109271]) -> [PASS][12] +23 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-kbl-7500u/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/fi-kbl-7500u/igt@[email protected]
* igt@vgem_basic@sysfs:
- fi-icl-u3: [DMESG-WARN][13] ([fdo#107724]) -> [PASS][14] +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/fi-icl-u3/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/fi-icl-u3/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109380]: https://bugs.freedesktop.org/show_bug.cgi?id=109380
Participating hosts (54 -> 45)
------------------------------
Missing (9): fi-kbl-soraka fi-ilk-m540 fi-skl-guc fi-byt-squawks fi-bsw-cyan fi-cfl-guc fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6639 -> Patchwork_13885
CI-20190529: 20190529
CI_DRM_6639: 474a7391a134134b2ddba7c7e89fb3bfa7b5a068 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5121: 242cb6f2149cb9699ba9b316e5f60b756260e829 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13885: fc80cc8489bd79716fbb673c513438f63942818b @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
fc80cc8489bd drm/i915: move property enums to intel_display_types.h 0888f784158f drm/i915: remove unnecessary includes of intel_display_types.h header ad85c8ba7857 drm/i915: rename intel_drv.h to display/intel_display_types.h 72cb32d38802 drm/i915: avoid including intel_drv.h via i915_drv.h->i915_trace.h 4a1bca19659f drm/i915/tc: un-inline intel_tc_port_ref_held() be7a707e1a59 drm/i915/mst: un-inline intel_dp_mst_encoder_active_links() e4056cd2e64d drm/i915/bw: make intel_atomic_get_bw_state() static cd9318f68c3f drm/i915/irq: un-inline functions to avoid i915_drv.h include e336fea484dd drm/i915/sprite: un-inline icl_is_hdr_plane() 38e320bf9576 drm/i915: move intel_display.c function declarations
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915: some more header juggling (rev3)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: some more header juggling (rev3)
URL : https://patchwork.freedesktop.org/series/64764/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6639_full -> Patchwork_13885_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_13885_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3:
- shard-kbl: [PASS][1] -> [DMESG-WARN][2] ([fdo#108566]) +4 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-kbl7/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-kbl4/igt@[email protected]
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [PASS][3] -> [DMESG-WARN][4] ([fdo#108566]) +5 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-apl8/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-apl5/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-128x42-random:
- shard-skl: [PASS][5] -> [FAIL][6] ([fdo#103232])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-skl4/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-skl2/igt@[email protected]
* igt@kms_flip@2x-flip-vs-expired-vblank:
- shard-glk: [PASS][7] -> [FAIL][8] ([fdo#105363])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-glk1/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-glk2/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
- shard-iclb: [PASS][9] -> [FAIL][10] ([fdo#103167]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
* igt@kms_plane@pixel-format-pipe-c-planes-source-clamping:
- shard-iclb: [PASS][11] -> [INCOMPLETE][12] ([fdo#107713] / [fdo#110036 ])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-iclb1/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-iclb3/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][13] -> [FAIL][14] ([fdo#108145] / [fdo#110403])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-skl4/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-skl2/igt@[email protected]
* igt@kms_psr@psr2_cursor_blt:
- shard-iclb: [PASS][15] -> [SKIP][16] ([fdo#109441]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-iclb2/igt@kms_psr@psr2_cursor_blt.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-iclb1/igt@kms_psr@psr2_cursor_blt.html
* igt@kms_setmode@basic:
- shard-apl: [PASS][17] -> [FAIL][18] ([fdo#99912])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-apl4/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-apl4/igt@[email protected]
#### Possible fixes ####
* igt@i915_suspend@sysfs-reader:
- shard-apl: [DMESG-WARN][19] ([fdo#108566]) -> [PASS][20] +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-apl4/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-apl4/igt@[email protected]
* igt@kms_flip@flip-vs-dpms-off-vs-modeset:
- shard-hsw: [INCOMPLETE][21] ([fdo#103540]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-hsw8/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-hsw4/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [FAIL][23] ([fdo#105363]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-skl6/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-skl10/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-kbl: [DMESG-WARN][25] ([fdo#108566]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-kbl4/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-kbl7/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move:
- shard-iclb: [FAIL][27] ([fdo#103167]) -> [PASS][28] +2 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-iclb7/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-iclb5/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-indfb-pgflip-blt:
- shard-iclb: [INCOMPLETE][29] ([fdo#106978] / [fdo#107713]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-iclb7/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-iclb8/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- shard-kbl: [INCOMPLETE][31] ([fdo#103665]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-kbl3/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-kbl1/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [FAIL][33] ([fdo#108145]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-skl6/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-skl10/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [FAIL][35] ([fdo#103166]) -> [PASS][36] +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-iclb5/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-iclb8/igt@[email protected]
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][37] ([fdo#109441]) -> [PASS][38] +1 similar issue
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-iclb6/igt@kms_psr@psr2_primary_mmap_cpu.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@perf@blocking:
- shard-skl: [FAIL][39] ([fdo#110728]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-skl4/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-skl1/igt@[email protected]
* igt@tools_test@tools_test:
- shard-skl: [SKIP][41] ([fdo#109271]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6639/shard-skl2/igt@tools_test@tools_test.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/shard-skl8/igt@tools_test@tools_test.html
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110036 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110036
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6639 -> Patchwork_13885
CI-20190529: 20190529
CI_DRM_6639: 474a7391a134134b2ddba7c7e89fb3bfa7b5a068 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5121: 242cb6f2149cb9699ba9b316e5f60b756260e829 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13885: fc80cc8489bd79716fbb673c513438f63942818b @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13885/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 22 lines · Chris Wilson
Quoting Jani Nikula (2019-08-06 11:07:21)
Quoted 9 lines
The big theme here is to emphasize that
intel_drv.his a display header, so rename itdisplay/intel_display_types.hand reduce its use in non-display code. Also reduce the inclusion of that and the other mega headeri915_drv.hfrom other headers.BR,
Jani.Quoted 11 lines
Jani Nikula (10):
drm/i915: moveintel_display.cfunction declarations drm/i915/sprite: un-inlineicl_is_hdr_plane()drm/i915/irq: un-inline functions to avoidi915_drv.hinclude drm/i915/bw: makeintel_atomic_get_bw_state()static drm/i915/mst: un-inlineintel_dp_mst_encoder_active_links()drm/i915/tc: un-inlineintel_tc_port_ref_held()
drm/i915: avoid includingintel_drv.hviai915_drv.h->i915_trace.hdrm/i915: renameintel_drv.htodisplay/intel_display_types.hdrm/i915: remove unnecessary includes ofintel_display_types.hheader drm/i915: move property enums tointel_display_types.h
Quoted 5 lines
A few moments of exasperation of "we use that there!?", but looks all dandy. I didn't spot anything other than mechanical translations and I agree with the direction,
Reviewed-by Chris Wilson <[email protected]>
Pushed the lot, many thanks for reviewing these tedious patches!
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx