Misc i915_drv.h cleanups
Subsystems (2)
cover Misc i915_drv.h cleanups
Our main header is huge. Lets try to make some cleanup.
v2: fixed16 changes moved to other series
Michal Wajdeczko (7):
drm/i915: Move some utility functions to i915_util.h drm/i915: Move display related definitions to dedicated header drm/i915: Move opregion definitions to dedicated intel_opregion.h drm/i915: Move intel_device_info definitions to its own header drm/i915: Update intel_device_info_runtime_init() parameter drm/i915: Add pretty printer for runtime part of intel_device_info drm/i915: Dump device info at once
drivers/gpu/drm/i915/i915_debugfs.c | 1 + drivers/gpu/drm/i915/i915_drv.c | 30 +- drivers/gpu/drm/i915/i915_drv.h | 498 +------------------------------ drivers/gpu/drm/i915/i915_utils.h | 15 + drivers/gpu/drm/i915/intel_device_info.c | 55 ++-- drivers/gpu/drm/i915/intel_device_info.h | 183 ++++++++++++ drivers/gpu/drm/i915/intel_display.h | 312 +++++++++++++++++++ drivers/gpu/drm/i915/intel_opregion.c | 2 + drivers/gpu/drm/i915/intel_opregion.h | 99 ++++++ 9 files changed, 669 insertions(+), 526 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_device_info.h create mode 100644 drivers/gpu/drm/i915/intel_display.h create mode 100644 drivers/gpu/drm/i915/intel_opregion.h
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/7 drm/i915: Move some utility functions to i915_util.h
We have dedicated header file for utility functions and macros.
--- drivers/gpu/drm/i915/i915_drv.h | 15 --------------- drivers/gpu/drm/i915/i915_utils.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -15
@@ -243,21 +243,6 @@ static inline uint_fixed_16_16_t add_fixed16_u32(uint_fixed_16_16_t add1,return clamp_u64_to_fixed16 (interm_sum); } -static inline const char *yesno (bool v) -{ -return v ?"yes" :"no" ; -} - -static inline const char *onoff (bool v) -{ -return v ?"on" :"off" ; -} - -static inline const char *enableddisabled (bool v) -{ -return v ?"enabled" :"disabled" ; -} -enum pipe {INVALID_PIPE =-1 ,PIPE_A =0 ,
drivers/gpu/drm/i915/i915_utils.h +15 -0
@@ -140,4 +140,19 @@ static inline void drain_delayed_work(struct delayed_work *dw) } while (delayed_work_pending(dw)); } +static inline const char *yesno (bool v) +{ +return v ?"yes" :"no" ; +} + +static inline const char *onoff (bool v) +{ +return v ?"on" :"off" ; +} + +static inline const char *enableddisabled (bool v) +{ +return v ?"enabled" :"disabled" ; +} +#endif /* !__I915_UTILS_H */
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/7 drm/i915: Move display related definitions to dedicated header
In reply to Michal WajdeczkoWe already have separate files for display related code, there is no reason to keep all display definitions in master header.
--- drivers/gpu/drm/i915/i915_drv.h | 283 +------------------------------ drivers/gpu/drm/i915/intel_display.h | 312 +++++++++++++++++++++++++++++++++++ 2 files changed, 313 insertions(+), 282 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_display.h
drivers/gpu/drm/i915/i915_drv.h +1 -282
@@ -62,6 +62,7 @@#include "intel_uc.h" #include "intel_lrc.h" #include "intel_ringbuffer.h" +#include "intel_display.h" #include "i915_gem.h" #include "i915_gem_context.h"
@@ -243,159 +244,6 @@ static inline uint_fixed_16_16_t add_fixed16_u32(uint_fixed_16_16_t add1,return clamp_u64_to_fixed16 (interm_sum); } -enum pipe { -INVALID_PIPE =-1 , -PIPE_A =0 , -PIPE_B , -PIPE_C , - _PIPE_EDP, -I915_MAX_PIPES = _PIPE_EDP -}; -#define pipe_name (p) ((p) + 'A') - -enum transcoder { -TRANSCODER_A =0 , -TRANSCODER_B , -TRANSCODER_C , -TRANSCODER_EDP , -TRANSCODER_DSI_A , -TRANSCODER_DSI_C , -I915_MAX_TRANSCODERS -}; - -static inline const char *transcoder_name (enum transcoder transcoder) -{ -switch (transcoder) { -case TRANSCODER_A : -return "A" ; -case TRANSCODER_B : -return "B" ; -case TRANSCODER_C : -return "C" ; -case TRANSCODER_EDP : -return "EDP" ; -case TRANSCODER_DSI_A : -return "DSI A" ; -case TRANSCODER_DSI_C : -return "DSI C" ; -default : -return "<invalid>" ; - } -} - -static inline bool transcoder_is_dsi (enum transcoder transcoder) -{ -return transcoder ==TRANSCODER_DSI_A || transcoder ==TRANSCODER_DSI_C ; -} - -/* -* Global legacy plane identifier. Valid only for primary/sprite -* planes on pre-g4x, and only for primary planes on g4x-bdw. -*/ -enum i9xx_plane_id { -PLANE_A , -PLANE_B , -PLANE_C , -}; -#define plane_name (p) ((p) + 'A') - -#define sprite_name (p, s) ((p) * INTEL_INFO(dev_priv)->num_sprites[(p)] + (s) + 'A') - -/* -* Per-pipe plane identifier. -* I915_MAX_PLANES in the enum below is the maximum (across all platforms) -* number of planes per CRTC. Not all platforms really have this many planes, -* which means some arrays of size I915_MAX_PLANES may have unused entries -* between the topmost sprite plane and the cursor plane. -* -* This is expected to be passed to various register macros -* (eg. PLANE_CTL(), PS_PLANE_SEL(), etc.) so adjust with care. -*/ -enum plane_id { -PLANE_PRIMARY , -PLANE_SPRITE0 , -PLANE_SPRITE1 , -PLANE_SPRITE2 , -PLANE_CURSOR , -I915_MAX_PLANES , -}; - -#define for_each_plane_id_on_crtc (__crtc, __p) \ - for ((__p) = PLANE_PRIMARY; (__p) < I915_MAX_PLANES; (__p)++) \ - for_each_if ((__crtc)->plane_ids_mask & BIT(__p)) - -enum port { -PORT_NONE =-1 , -PORT_A =0 , -PORT_B , -PORT_C , -PORT_D , -PORT_E , -I915_MAX_PORTS -}; -#define port_name (p) ((p) + 'A') - -#define I915_NUM_PHYS_VLV 2 - -enum dpio_channel { -DPIO_CH0 , -DPIO_CH1 -}; - -enum dpio_phy { -DPIO_PHY0 , -DPIO_PHY1 , -DPIO_PHY2 , -}; - -enum intel_display_power_domain { -POWER_DOMAIN_PIPE_A , -POWER_DOMAIN_PIPE_B , -POWER_DOMAIN_PIPE_C , -POWER_DOMAIN_PIPE_A_PANEL_FITTER , -POWER_DOMAIN_PIPE_B_PANEL_FITTER , -POWER_DOMAIN_PIPE_C_PANEL_FITTER , -POWER_DOMAIN_TRANSCODER_A , -POWER_DOMAIN_TRANSCODER_B , -POWER_DOMAIN_TRANSCODER_C , -POWER_DOMAIN_TRANSCODER_EDP , -POWER_DOMAIN_TRANSCODER_DSI_A , -POWER_DOMAIN_TRANSCODER_DSI_C , -POWER_DOMAIN_PORT_DDI_A_LANES , -POWER_DOMAIN_PORT_DDI_B_LANES , -POWER_DOMAIN_PORT_DDI_C_LANES , -POWER_DOMAIN_PORT_DDI_D_LANES , -POWER_DOMAIN_PORT_DDI_E_LANES , -POWER_DOMAIN_PORT_DDI_A_IO , -POWER_DOMAIN_PORT_DDI_B_IO , -POWER_DOMAIN_PORT_DDI_C_IO , -POWER_DOMAIN_PORT_DDI_D_IO , -POWER_DOMAIN_PORT_DDI_E_IO , -POWER_DOMAIN_PORT_DSI , -POWER_DOMAIN_PORT_CRT , -POWER_DOMAIN_PORT_OTHER , -POWER_DOMAIN_VGA , -POWER_DOMAIN_AUDIO , -POWER_DOMAIN_PLLS , -POWER_DOMAIN_AUX_A , -POWER_DOMAIN_AUX_B , -POWER_DOMAIN_AUX_C , -POWER_DOMAIN_AUX_D , -POWER_DOMAIN_GMBUS , -POWER_DOMAIN_MODESET , -POWER_DOMAIN_GT_IRQ , -POWER_DOMAIN_INIT , - -POWER_DOMAIN_NUM , -}; - -#define POWER_DOMAIN_PIPE (pipe) ((pipe) + POWER_DOMAIN_PIPE_A) -#define POWER_DOMAIN_PIPE_PANEL_FITTER (pipe) \ - ((pipe) + POWER_DOMAIN_PIPE_A_PANEL_FITTER) -#define POWER_DOMAIN_TRANSCODER (tran) \ - ((tran) == TRANSCODER_EDP ? POWER_DOMAIN_TRANSCODER_EDP : \ - (tran) + POWER_DOMAIN_TRANSCODER_A) -enum hpd_pin {HPD_NONE =0 ,HPD_TV =HPD_NONE ,/* TV is known to be unreliable */
@@ -457,121 +305,6 @@ struct i915_hotplug { I915_GEM_DOMAIN_INSTRUCTION | \ I915_GEM_DOMAIN_VERTEX) -#define for_each_pipe (__dev_priv, __p) \ - for ((__p) = 0; (__p) < INTEL_INFO(__dev_priv)->num_pipes; (__p)++) -#define for_each_pipe_masked (__dev_priv, __p, __mask) \ - for ((__p) = 0; (__p) < INTEL_INFO(__dev_priv)->num_pipes; (__p)++) \ - for_each_if ((__mask) & (1 << (__p))) -#define for_each_universal_plane (__dev_priv, __pipe, __p) \ - for ((__p) = 0; \ - (__p) < INTEL_INFO(__dev_priv)->num_sprites[(__pipe)] + 1; \ - (__p)++) -#define for_each_sprite (__dev_priv, __p, __s) \ - for ((__s) = 0; \ - (__s) < INTEL_INFO(__dev_priv)->num_sprites[(__p)]; \ - (__s)++) - -#define for_each_port_masked (__port, __ports_mask) \ - for ((__port) = PORT_A; (__port) < I915_MAX_PORTS; (__port)++) \ - for_each_if ((__ports_mask) & (1 << (__port))) - -#define for_each_crtc (dev, crtc) \ - list_for_each_entry(crtc, &(dev)->mode_config.crtc_list, head) - -#define for_each_intel_plane (dev, intel_plane) \ - list_for_each_entry(intel_plane, \ - &(dev)->mode_config.plane_list, \ - base.head) - -#define for_each_intel_plane_mask (dev, intel_plane, plane_mask) \ - list_for_each_entry(intel_plane, \ - &(dev)->mode_config.plane_list, \ - base.head) \ - for_each_if ((plane_mask) & \ - (1 << drm_plane_index(&intel_plane->base))) - -#define for_each_intel_plane_on_crtc (dev, intel_crtc, intel_plane) \ - list_for_each_entry(intel_plane, \ - &(dev)->mode_config.plane_list, \ - base.head) \ - for_each_if ((intel_plane)->pipe == (intel_crtc)->pipe) - -#define for_each_intel_crtc (dev, intel_crtc) \ - list_for_each_entry(intel_crtc, \ - &(dev)->mode_config.crtc_list, \ - base.head) - -#define for_each_intel_crtc_mask (dev, intel_crtc, crtc_mask) \ - list_for_each_entry(intel_crtc, \ - &(dev)->mode_config.crtc_list, \ - base.head) \ - for_each_if ((crtc_mask) & (1 << drm_crtc_index(&intel_crtc->base))) - -#define for_each_intel_encoder (dev, intel_encoder) \ - list_for_each_entry(intel_encoder, \ - &(dev)->mode_config.encoder_list, \ - base.head) - -#define for_each_intel_connector_iter (intel_connector, iter) \ - while ((intel_connector = to_intel_connector(drm_connector_list_iter_next(iter)))) - -#define for_each_encoder_on_crtc (dev, __crtc, intel_encoder) \ - list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \ - for_each_if ((intel_encoder)->base.crtc == (__crtc)) - -#define for_each_connector_on_encoder (dev, __encoder, intel_connector) \ - list_for_each_entry((intel_connector), &(dev)->mode_config.connector_list, base.head) \ - for_each_if ((intel_connector)->base.encoder == (__encoder)) - -#define for_each_power_domain (domain, mask) \ - for ((domain) = 0; (domain) < POWER_DOMAIN_NUM; (domain)++) \ - for_each_if (BIT_ULL(domain) & (mask)) - -#define for_each_power_well (__dev_priv, __power_well) \ - for ((__power_well) = (__dev_priv)->power_domains.power_wells; \ - (__power_well) - (__dev_priv)->power_domains.power_wells < \ - (__dev_priv)->power_domains.power_well_count; \ - (__power_well)++) - -#define for_each_power_well_rev (__dev_priv, __power_well) \ - for ((__power_well) = (__dev_priv)->power_domains.power_wells + \ - (__dev_priv)->power_domains.power_well_count - 1; \ - (__power_well) - (__dev_priv)->power_domains.power_wells >= 0; \ - (__power_well)--) - -#define for_each_power_domain_well (__dev_priv, __power_well, __domain_mask) \ - for_each_power_well(__dev_priv, __power_well) \ - for_each_if ((__power_well)->domains & (__domain_mask)) - -#define for_each_power_domain_well_rev (__dev_priv, __power_well, __domain_mask) \ - for_each_power_well_rev(__dev_priv, __power_well) \ - for_each_if ((__power_well)->domains & (__domain_mask)) - -#define for_each_new_intel_plane_in_state (__state, plane, new_plane_state, __i) \ - for ((__i) = 0; \ - (__i) < (__state)->base.dev->mode_config.num_total_plane && \ - ((plane) = to_intel_plane((__state)->base.planes[__i].ptr), \ - (new_plane_state) = to_intel_plane_state((__state)->base.planes[__i].new_state), 1); \ - (__i)++) \ - for_each_if (plane) - -#define for_each_new_intel_crtc_in_state (__state, crtc, new_crtc_state, __i) \ - for ((__i) = 0; \ - (__i) < (__state)->base.dev->mode_config.num_crtc && \ - ((crtc) = to_intel_crtc((__state)->base.crtcs[__i].ptr), \ - (new_crtc_state) = to_intel_crtc_state((__state)->base.crtcs[__i].new_state), 1); \ - (__i)++) \ - for_each_if (crtc) - -#define for_each_oldnew_intel_plane_in_state (__state, plane, old_plane_state, new_plane_state, __i) \ - for ((__i) = 0; \ - (__i) < (__state)->base.dev->mode_config.num_total_plane && \ - ((plane) = to_intel_plane((__state)->base.planes[__i].ptr), \ - (old_plane_state) = to_intel_plane_state((__state)->base.planes[__i].old_state), \ - (new_plane_state) = to_intel_plane_state((__state)->base.planes[__i].new_state), 1); \ - (__i)++) \ - for_each_if (plane) -struct drm_i915_private ;struct i915_mm_struct ;struct i915_mmu_object ;
@@ -608,20 +341,6 @@ struct drm_i915_file_private {atomic_t context_bans; }; -/* Used by dp and fdi links */ -struct intel_link_m_n { -uint32_t tu; -uint32_t gmch_m; -uint32_t gmch_n; -uint32_t link_m; -uint32_t link_n; -}; - -void intel_link_compute_m_n (int bpp,int nlanes, -int pixel_clock,int link_clock, -struct intel_link_m_n *m_n, -bool reduce_m_n); -/* Interface history: * * 1.1: Original.
drivers/gpu/drm/i915/intel_display.h new file +312 -0
312 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/7 drm/i915: Move opregion definitions to dedicated intel_opregion.h
In reply to Michal WajdeczkoWe already have dedicated file for opregion related code, dedicated header will make our life easier.
v2: reorder includes (Chris)
--- drivers/gpu/drm/i915/i915_drv.h | 63 ++-------------------- drivers/gpu/drm/i915/intel_opregion.c | 2 + drivers/gpu/drm/i915/intel_opregion.h | 99 +++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 59 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_opregion.h
drivers/gpu/drm/i915/i915_drv.h +4 -59
@@ -56,13 +56,14 @@#include "i915_reg.h" #include "i915_utils.h" -#include "intel_uncore.h" #include "intel_bios.h" +#include "intel_display.h" #include "intel_dpll_mgr.h" -#include "intel_uc.h" #include "intel_lrc.h" +#include "intel_opregion.h" #include "intel_ringbuffer.h" -#include "intel_display.h" +#include "intel_uncore.h" +#include "intel_uc.h" #include "i915_gem.h" #include "i915_gem_context.h"
@@ -355,27 +356,6 @@ struct drm_i915_file_private {#define DRIVER_MINOR 6#define DRIVER_PATCHLEVEL 0 -struct opregion_header ; -struct opregion_acpi ; -struct opregion_swsci ; -struct opregion_asle ; - -struct intel_opregion { -struct opregion_header *header; -struct opregion_acpi *acpi; -struct opregion_swsci *swsci; -u32 swsci_gbda_sub_functions; -u32 swsci_sbcb_sub_functions; -struct opregion_asle *asle; -void *rvda; -void *vbt_firmware; -const void *vbt; -u32 vbt_size; -u32 *lid_state; -struct work_struct asle_work; -}; -#define OPREGION_SIZE (8*1024) -struct intel_overlay ;struct intel_overlay_error_state ;
@@ -3816,41 +3796,6 @@ bool intel_bios_is_port_hpd_inverted(struct drm_i915_private *dev_priv,bool intel_bios_is_lspcon_present (struct drm_i915_private *dev_priv,enum port port); - -/* intel_opregion.c */ -#ifdef CONFIG_ACPI -extern int intel_opregion_setup (struct drm_i915_private *dev_priv); -extern void intel_opregion_register (struct drm_i915_private *dev_priv); -extern void intel_opregion_unregister (struct drm_i915_private *dev_priv); -extern void intel_opregion_asle_intr (struct drm_i915_private *dev_priv); -extern int intel_opregion_notify_encoder (struct intel_encoder *intel_encoder, -bool enable); -extern int intel_opregion_notify_adapter (struct drm_i915_private *dev_priv, -pci_power_t state); -extern int intel_opregion_get_panel_type (struct drm_i915_private *dev_priv); -#else -static inline int intel_opregion_setup (struct drm_i915_private *dev) {return 0 ; } -static inline void intel_opregion_register (struct drm_i915_private *dev_priv) { } -static inline void intel_opregion_unregister (struct drm_i915_private *dev_priv) { } -static inline void intel_opregion_asle_intr (struct drm_i915_private *dev_priv) -{ -} -static inline int -intel_opregion_notify_encoder (struct intel_encoder *intel_encoder,bool enable) -{ -return 0 ; -} -static inline int -intel_opregion_notify_adapter (struct drm_i915_private *dev,pci_power_t state) -{ -return 0 ; -} -static inline int intel_opregion_get_panel_type (struct drm_i915_private *dev) -{ -return -ENODEV ; -} -#endif -/* intel_acpi.c */ #ifdef CONFIG_ACPI extern void intel_register_dsm_handler (void );
drivers/gpu/drm/i915/intel_opregion.c +2 -0
@@ -32,6 +32,8 @@#include <drm/drmP.h> #include <drm/i915_drm.h> + +#include "intel_opregion.h" #include "i915_drv.h" #include "intel_drv.h"
drivers/gpu/drm/i915/intel_opregion.h new file +99 -0
99 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/7 drm/i915: Move intel_device_info definitions to its own header
In reply to Michal WajdeczkoWe already keep intel_device_info functions in dedicated file. Add matching header file and move related definitions there.
v2: add gen boundaries (Chris)
--- drivers/gpu/drm/i915/i915_drv.h | 139 +----------------------- drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 181 +++++++++++++++++++++++++++++++ 3 files changed, 183 insertions(+), 138 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_device_info.h
drivers/gpu/drm/i915/i915_drv.h +1 -138
@@ -57,6 +57,7 @@#include "i915_utils.h" #include "intel_bios.h" +#include "intel_device_info.h" #include "intel_display.h" #include "intel_dpll_mgr.h" #include "intel_lrc.h"
@@ -448,137 +449,6 @@ struct intel_csr {uint32_t allowed_dc_mask; }; -#define DEV_INFO_FOR_EACH_FLAG (func) \ - func(is_mobile); \ - func(is_lp); \ - func(is_alpha_support); \ -/* Keep has_* in alphabetical order */ \ -func (has_64bit_reloc); \ -func (has_aliasing_ppgtt); \ -func (has_csr); \ -func (has_ddi); \ -func (has_dp_mst); \ -func (has_reset_engine); \ -func (has_fbc); \ -func (has_fpga_dbg); \ -func (has_full_ppgtt); \ -func (has_full_48bit_ppgtt); \ -func (has_gmch_display); \ -func (has_guc); \ -func (has_guc_ct); \ -func (has_hotplug); \ -func (has_l3_dpf); \ -func (has_llc); \ -func (has_logical_ring_contexts); \ -func (has_logical_ring_preemption); \ -func (has_overlay); \ -func (has_pooled_eu); \ -func (has_psr); \ -func (has_rc6); \ -func (has_rc6p); \ -func (has_resource_streamer); \ -func (has_runtime_pm); \ -func (has_snoop); \ -func (unfenced_needs_alignment); \ -func (cursor_needs_physical); \ -func (hws_needs_physical); \ -func (overlay_needs_physical); \ -func (supports_tv); \ -func (has_ipc); - -struct sseu_dev_info { -u8 slice_mask; -u8 subslice_mask; -u8 eu_total; -u8 eu_per_subslice; -u8 min_eu_in_pool; -/* For each slice, which subslice(s) has(have) 7 EUs (bitfield)? */ -u8 subslice_7eu[3 ]; -u8 has_slice_pg:1 ; -u8 has_subslice_pg:1 ; -u8 has_eu_pg:1 ; -}; - -static inline unsigned int sseu_subslice_total (const struct sseu_dev_info *sseu) -{ -return hweight8 (sseu->slice_mask) *hweight8 (sseu->subslice_mask); -} - -/* Keep in gen based order, and chronological order within a gen */ -enum intel_platform { -INTEL_PLATFORM_UNINITIALIZED =0 , -INTEL_I830 , -INTEL_I845G , -INTEL_I85X , -INTEL_I865G , -INTEL_I915G , -INTEL_I915GM , -INTEL_I945G , -INTEL_I945GM , -INTEL_G33 , -INTEL_PINEVIEW , -INTEL_I965G , -INTEL_I965GM , -INTEL_G45 , -INTEL_GM45 , -INTEL_IRONLAKE , -INTEL_SANDYBRIDGE , -INTEL_IVYBRIDGE , -INTEL_VALLEYVIEW , -INTEL_HASWELL , -INTEL_BROADWELL , -INTEL_CHERRYVIEW , -INTEL_SKYLAKE , -INTEL_BROXTON , -INTEL_KABYLAKE , -INTEL_GEMINILAKE , -INTEL_COFFEELAKE , -INTEL_CANNONLAKE , -INTEL_MAX_PLATFORMS -}; - -struct intel_device_info { -u16 device_id; -u16 gen_mask; - -u8 gen; -u8 gt;/* GT number, 0 if undefined */ -u8 num_rings; -u8 ring_mask;/* Rings supported by the HW */ - -enum intel_platform platform; -u32 platform_mask; - -u32 display_mmio_offset; - -u8 num_pipes; -u8 num_sprites[I915_MAX_PIPES ]; -u8 num_scalers[I915_MAX_PIPES ]; - -unsigned int page_sizes;/* page sizes supported by the HW */ - -#define DEFINE_FLAG (name) u8 name:1 -DEV_INFO_FOR_EACH_FLAG (DEFINE_FLAG); -#undef DEFINE_FLAG -u16 ddb_size;/* in blocks */ - -/* Register offsets for the various display pipes and transcoders */ -int pipe_offsets[I915_MAX_TRANSCODERS ]; -int trans_offsets[I915_MAX_TRANSCODERS ]; -int palette_offsets[I915_MAX_PIPES ]; -int cursor_offsets[I915_MAX_PIPES ]; - -/* Slice/subslice/EU info */ -struct sseu_dev_info sseu; - -u32 cs_timestamp_frequency_khz; - -struct color_luts { -u16 degamma_lut_size; -u16 gamma_lut_size; - } color; -}; -struct intel_display_error_state ;struct i915_gpu_state {
@@ -3812,13 +3682,6 @@ bool intel_bios_is_lspcon_present(struct drm_i915_private *dev_priv,return (struct intel_device_info *)&dev_priv->info; } -const char *intel_platform_name (enum intel_platform platform); -void intel_device_info_runtime_init (struct drm_i915_private *dev_priv); -void intel_device_info_dump (const struct intel_device_info *info, -struct drm_printer *p); -void intel_device_info_dump_flags (const struct intel_device_info *info, -struct drm_printer *p); -/* modesetting */ extern void intel_modeset_init_hw (struct drm_device *dev);extern int intel_modeset_init (struct drm_device *dev);
drivers/gpu/drm/i915/intel_device_info.c +1 -0
@@ -24,6 +24,7 @@#include <drm/drm_print.h> +#include "intel_device_info.h" #include "i915_drv.h" #define PLATFORM_NAME (x) [INTEL_##x] = #x
drivers/gpu/drm/i915/intel_device_info.h new file +181 -0
181 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/7 drm/i915: Update intel_device_info_runtime_init() parameter
In reply to Michal WajdeczkoAs we try to follow object-verb pattern in our functions, update intel_device_info_runtime_init() parameter from dev_priv to info.
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/intel_device_info.c | 10 +++++++--- drivers/gpu/drm/i915/intel_device_info.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -1088,7 +1088,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)if (i915_inject_load_failure ())return -ENODEV ; -intel_device_info_runtime_init (dev_priv); +intel_device_info_runtime_init (mkwrite_device_info (dev_priv));intel_sanitize_options (dev_priv);
drivers/gpu/drm/i915/intel_device_info.c +7 -3
@@ -431,7 +431,10 @@ static u32 read_timestamp_frequency(struct drm_i915_private *dev_priv)return 0 ; } -/* +/** +* intel_device_info_runtime_init - initialize runtime info +* @info: intel device info struct +* * Determine various intel_device_info fields at runtime. * * Use it when either:
@@ -444,9 +447,10 @@ static u32 read_timestamp_frequency(struct drm_i915_private *dev_priv)* - after the PCH has been detected, * - before the first usage of the fields it can tweak. */ -void intel_device_info_runtime_init (struct drm_i915_private *dev_priv) +void intel_device_info_runtime_init (struct intel_device_info *info) { -struct intel_device_info *info =mkwrite_device_info (dev_priv); +struct drm_i915_private *dev_priv = + container_of(info, struct drm_i915_private, info);enum pipe pipe;if (INTEL_GEN (dev_priv) >=10 ) {
drivers/gpu/drm/i915/intel_device_info.h +1 -1
@@ -172,7 +172,7 @@ static inline unsigned int sseu_subslice_total(const struct sseu_dev_info *sseu)const char *intel_platform_name (enum intel_platform platform); -void intel_device_info_runtime_init (struct drm_i915_private *dev_priv); +void intel_device_info_runtime_init (struct intel_device_info *info);void intel_device_info_dump (const struct intel_device_info *info,struct drm_printer *p); void intel_device_info_dump_flags(const struct intel_device_info *info,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/7 drm/i915: Add pretty printer for runtime part of intel_device_info
In reply to Michal WajdeczkoDuring initialization of the runtime part of the intel_device_info we are dumping that part using DRM_DEBUG_DRIVER mechanism. As we already have pretty printer for const part of the info, make similar function for the runtime part and use it separately.
v2: add runtime dump to debugfs (Chris)
--- drivers/gpu/drm/i915/i915_debugfs.c | 1 + drivers/gpu/drm/i915/i915_drv.c | 5 ++++ drivers/gpu/drm/i915/intel_device_info.c | 44 +++++++++++++++++++------------- drivers/gpu/drm/i915/intel_device_info.h | 2 ++ 4 files changed, 34 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -0
@@ -48,6 +48,7 @@ static int i915_capabilities(struct seq_file *m, void *data)seq_printf (m,"pch: %d\n" ,INTEL_PCH_TYPE (dev_priv));intel_device_info_dump_flags (info, &p); +intel_device_info_dump_runtime (info, &p);kernel_param_lock (THIS_MODULE );i915_params_dump (&i915_modparams, &p);
drivers/gpu/drm/i915/i915_drv.c +5 -0
@@ -1089,6 +1089,11 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)return -ENODEV ;intel_device_info_runtime_init (mkwrite_device_info (dev_priv)); +if (drm_debug &DRM_UT_DRIVER ) { +struct drm_printer p =drm_debug_printer ("i915 device info:" ); + +intel_device_info_dump_runtime (&dev_priv->info, &p); + }intel_sanitize_options (dev_priv);
drivers/gpu/drm/i915/intel_device_info.c +26 -18
54 lines not on this page · raw message
drivers/gpu/drm/i915/intel_device_info.h +2 -0
@@ -177,5 +177,7 @@ void intel_device_info_dump(const struct intel_device_info *info, struct drm_printer *p);void intel_device_info_dump_flags (const struct intel_device_info *info,struct drm_printer *p); +void intel_device_info_dump_runtime (const struct intel_device_info *info, +struct drm_printer *p);#endif
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 6/7] drm/i915: Add pretty printer for runtime part of intel_device_info
Quoting Michal Wajdeczko (2017-12-21 18:53:33)
Quoted 11 lines
During initialization of the runtime part of the
intel_device_infowe are dumping that part usingDRM_DEBUG_DRIVERmechanism. As we already have pretty printer for const part of the info, make similar function for the runtime part and use it separately.v2: add runtime dump to debugfs (Chris)
Signed-off-by Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Joonas Lahtinen <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 7/7 drm/i915: Dump device info at once
In reply to Michal WajdeczkoWe are dumping device info separately for sw_only and runtime part but to simplify the code we can also do it from one place once we complete driver load.
v2: use dedicated welcome function (Chris)
--- drivers/gpu/drm/i915/i915_drv.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +17 -16
@@ -931,12 +931,6 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,intel_display_crc_init (dev_priv); -if (drm_debug &DRM_UT_DRIVER ) { -struct drm_printer p =drm_debug_printer ("i915 device info:" ); - -intel_device_info_dump (&dev_priv->info, &p); - } -intel_detect_preproduction_hw (dev_priv);return 0 ;
@@ -1089,11 +1083,6 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)return -ENODEV ;intel_device_info_runtime_init (mkwrite_device_info (dev_priv)); -if (drm_debug &DRM_UT_DRIVER ) { -struct drm_printer p =drm_debug_printer ("i915 device info:" ); - -intel_device_info_dump_runtime (&dev_priv->info, &p); - }intel_sanitize_options (dev_priv);
@@ -1303,6 +1292,21 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)i915_gem_shrinker_unregister (dev_priv); } +static void i915_welcome_messages (struct drm_i915_private *dev_priv) +{ +if (drm_debug &DRM_UT_DRIVER ) { +struct drm_printer p =drm_debug_printer ("i915 device info:" ); + +intel_device_info_dump (&dev_priv->info, &p); +intel_device_info_dump_runtime (&dev_priv->info, &p); + } + +if (IS_ENABLED (CONFIG_DRM_I915_DEBUG )) +DRM_INFO ("DRM_I915_DEBUG enabled\n" ); +if (IS_ENABLED (CONFIG_DRM_I915_DEBUG_GEM )) +DRM_INFO ("DRM_I915_DEBUG_GEM enabled\n" ); +} +/** * i915_driver_load - setup chip and create an initial config * @pdev: PCI device
@@ -1388,13 +1392,10 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)intel_init_ipc (dev_priv); -if (IS_ENABLED (CONFIG_DRM_I915_DEBUG )) -DRM_INFO ("DRM_I915_DEBUG enabled\n" ); -if (IS_ENABLED (CONFIG_DRM_I915_DEBUG_GEM )) -DRM_INFO ("DRM_I915_DEBUG_GEM enabled\n" ); -intel_runtime_pm_put (dev_priv); +i915_welcome_messages (dev_priv); +return 0 ; out_cleanup_hw:
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 7/7] drm/i915: Dump device info at once
Quoting Michal Wajdeczko (2017-12-21 18:53:34)
Quoted 44 lines
We are dumping device info separately for
sw_onlyand runtime part but to simplify the code we can also do it from one place once we complete driver load.v2: use dedicated welcome function (Chris)
Signed-off-by Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)drivers/gpu/drm/i915/i915_drv.c +0
-11@@ -931,12 +931,6 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,intel_display_crc_init (dev_priv); -if (drm_debug &DRM_UT_DRIVER ) { -struct drm_printer p =drm_debug_printer ("i915 device info:" ); - -intel_device_info_dump (&dev_priv->info, &p); - } -intel_detect_preproduction_hw (dev_priv);return 0 ;@@ -1089,11 +1083,6 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)return -ENODEV ;intel_device_info_runtime_init (mkwrite_device_info (dev_priv)); -if (drm_debug &DRM_UT_DRIVER ) { -struct drm_printer p =drm_debug_printer ("i915 device info:" ); - -intel_device_info_dump_runtime (&dev_priv->info, &p); - }intel_sanitize_options (dev_priv);
drivers/gpu/drm/i915/i915_drv.c static void i915_driver_unregister(struct drm_i915_private *dev_priv) · line 1301
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.c +7
-0@@ -1303,6 +1292,21 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)i915_gem_shrinker_unregister (dev_priv); } +static void i915_welcome_messages (struct drm_i915_private *dev_priv) +{ +if (drm_debug &DRM_UT_DRIVER ) { +struct drm_printer p =drm_debug_printer ("i915 device info:" ); + +intel_device_info_dump (&dev_priv->info, &p); +intel_device_info_dump_runtime (&dev_priv->info, &p);
I'd throw the flags into here as well (and to debugfs), then all parties are doing the same and we can reduce this to a single intel_device_info_dump() routine.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Misc i915_drv.h cleanups (rev2)
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: Misc i915_drv.h cleanups (rev2)
URL : https://patchwork.freedesktop.org/series/35637/
State : success
== Summary ==
Series 35637v2 Misc i915_drv.h cleanups
https://patchwork.freedesktop.org/api/1.0/series/35637/revisions/2/mbox/
Test debugfs_test:
Subgroup read_all_entries:
dmesg-warn -> DMESG-FAIL (fi-elk-e7500) fdo#103989
incomplete -> PASS (fi-snb-2520m) fdo#103713
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (fi-kbl-r) fdo#104172 +1fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#104172 https://bugs.freedesktop.org/show_bug.cgi?id=104172
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:431s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:436s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:379s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:499s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:276s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:492s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:491s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:475s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:476s fi-elk-e7500 total:224 pass:163 dwarn:14 dfail:1 fail:0 skip:45 fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:527s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:403s fi-hsw-4770r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:415s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:474s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:427s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:480s fi-kbl-7560u total:288 pass:268 dwarn:1 dfail:0 fail:0 skip:19 time:522s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:465s fi-kbl-r total:288 pass:260 dwarn:1 dfail:0 fail:0 skip:27 time:525s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:577s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:441s fi-skl-6600u total:288 pass:260 dwarn:1 dfail:0 fail:0 skip:27 time:528s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:552s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:499s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:492s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:437s fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:540s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:407s Blacklisted hosts: fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:587s fi-cnl-y total:245 pass:220 dwarn:0 dfail:0 fail:0 skip:24 fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:484s
c0a64101df89fe312cb41d27e184555400d0e3b9 drm-tip: 2017y-12m-21d-18h-02m-56s UTC integration manifest 25bbbaadf1df drm/i915: Dump device info at once8152b7eebb80 drm/i915: Add pretty printer for runtime part of intel_device_info 696b81fc5097 drm/i915: Update intel_device_info_runtime_init() parameter 64ffd9738a0c drm/i915: Move intel_device_info definitions to its own header eb9cc008be1f drm/i915: Move opregion definitions to dedicated intel_opregion.h c4b036f45d6c drm/i915: Move display related definitions to dedicated header 3613e32913d8 drm/i915: Move some utility functions to i915_util.h
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7558/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for Misc i915_drv.h cleanups (rev2)
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: Misc i915_drv.h cleanups (rev2)
URL : https://patchwork.freedesktop.org/series/35637/
State : failure
== Summary ==
Test gem_tiled_swapping:
Subgroup non-threaded:
incomplete -> PASS (shard-hsw) fdo#104218
Test drv_suspend:
Subgroup fence-restore-tiled2untiled:
skip -> PASS (shard-snb)
skip -> PASS (shard-hsw)
Subgroup sysfs-reader:
skip -> PASS (shard-hsw)
Test kms_setmode:
Subgroup basic:
fail -> PASS (shard-hsw) fdo#99912
Test kms_fbcon_fbt:
Subgroup fbc-suspend:
pass -> DMESG-WARN (shard-snb)
Test pm_rpm:
Subgroup system-suspend:
skip -> PASS (shard-hsw) fdo#103375
Test gem_exec_parallel:
Subgroup render:
pass -> INCOMPLETE (shard-snb)fdo#104218 https://bugs.freedesktop.org/show_bug.cgi?id=104218
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
shard-hsw total:2712 pass:1538 dwarn:1 dfail:0 fail:9 skip:1164 time:9377s shard-snb total:2702 pass:1304 dwarn:2 dfail:0 fail:10 skip:1385 time:7916s Blacklisted hosts: shard-apl total:2660 pass:1648 dwarn:1 dfail:0 fail:24 skip:985 time:13299s shard-kbl total:2653 pass:1734 dwarn:29 dfail:1 fail:22 skip:866 time:10653s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7558/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.IGT: failure for Misc i915_drv.h cleanups (rev2)
Quoting Patchwork (2017-12-21 21:36:17)
Quoted 21 lines
== Series Details ==
Series: Misc
i915_drv.hcleanups (rev2)
URL : https://patchwork.freedesktop.org/series/35637/
State : failure== Summary ==
Test
gem_tiled_swapping:Subgroup non-threaded: incomplete -> PASS (shard-hsw) fdo#104218 Test drv_suspend: Subgroup fence-restore-tiled2untiled: skip -> PASS (shard-snb) skip -> PASS (shard-hsw) Subgroup sysfs-reader: skip -> PASS (shard-hsw) Test kms_setmode: Subgroup basic: fail -> PASS (shard-hsw) fdo#99912Test
kms_fbcon_fbt:
Quoted 8 lines
Subgroup fbc-suspend:
pass -> DMESG-WARN (shard-snb)
Test pm_rpm:
Subgroup system-suspend:
skip -> PASS (shard-hsw) fdo#103375
Test gem_exec_parallel:
Subgroup render:
pass -> INCOMPLETE (shard-snb)Tweaked a few patch to appease checkpatch (and resent to CI) and applied. Thanks for the cleanup,
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx