Feature macro cleanup, batch 1
Subsystems (2)
cover Feature macro cleanup, batch 1
Most of our feature macros are made to take drm_i915_private as a parameter, since the wanted information is part of that struct.
A lot of code still passes drm_device instead, meaning extra pointer churn. As a stop-gap solution our macros currently implements a poor man's polymorphism by use of the magic __I915__ macro.
This batch of patches starts a transition to a shinier world with non-polymorphic macros. I've got more patches in the pipeline, but to prevent the merge from stalling due to lack of review or due to merge conflicts, I've decided to split them into several batches.
The first patch in this series is only needed during the merge period; the final patch in the final batch of patches will undo those changes (but until then these transitional macros serve to prevent new code being added that uses the old behaviour).
This batch will, due to the introduction of some transitional code, introduce more lines that it deletes, but the following batches will more than compensate for this. In terms of module size, this patch should save us a bit less than 1kB. The total series will save something on the order of 35-40kB (without doing most of the further cleanup that this enables).
The philosophy when doing this transition has been:
* Whenever struct drm_i915_private * has been introduced it has been named dev_priv[1].
* In most of those cases I've tried to make the newly introduced pointers be independent from struct drm_device *, to ease finding unused variables once the transition is complete
* Whenever a transitioned macro has another macro on the same line, or the ones immediately preceeding or succeeding, I've transitioned those too, to minimise the amount of patches that changes the same lines.
* If leaf functions with struct drm_device * as an in-parameter has ended up not using that parameter at all (except for turning it into struct drm_i915_private *), I have in a few cases modified the function to take the latter pointer as a parameter instead.
* In a few cases I've rebroken lines to make them follow the kernel coding style.
[1] Let the bikeshedding ensue; i915 is an alternative that would make the code slightly more compact, be slightly more descriptive, and allow for fewer lines that violates that the kernel coding style in terms of length, but it does have a solid majority against it in terms of established use.
David Weinehall (12):
drm/i915: Transitional, non-polymorph, macros drm/i915: IS_MOBILE() fixes
drm/i915: HAS_POOLED_EU() fixes drm/i915: INTEL_GEN() fixes, part 1 drm/i915: INTEL_GEN() fixes, part 2 drm/i915: INTEL_GEN() fixes, part 3 drm/i915: INTEL_GEN() fixes, part 4 drm/i915: INTEL_GEN() fixes, part 5 drm/i915: i915_vgacntrl_reg() fixes drm/i915: HAS_GMCH_DISPLAY() fixes drm/i915: RESOURCE_STREAMER/CORE_RING_FREQ fixes drm/i915: INTEL_GEN() fixes, part 6
drivers/gpu/drm/i915/i915_drv.c | 29 ++-- drivers/gpu/drm/i915/i915_drv.h | 52 +++--- drivers/gpu/drm/i915/i915_gem.c | 14 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 11 +- drivers/gpu/drm/i915/i915_gem_fence.c | 9 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 22 +-- drivers/gpu/drm/i915/i915_gem_render_state.c | 6 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 9 +- drivers/gpu/drm/i915/i915_gem_tiling.c | 7 +- drivers/gpu/drm/i915/i915_gpu_error.c | 18 +-- drivers/gpu/drm/i915/i915_irq.c | 50 +++--- drivers/gpu/drm/i915/i915_suspend.c | 18 +-- drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_bios.c | 2 +- drivers/gpu/drm/i915/intel_color.c | 16 +- drivers/gpu/drm/i915/intel_crt.c | 9 +- drivers/gpu/drm/i915/intel_ddi.c | 24 ++- drivers/gpu/drm/i915/intel_device_info.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 231 ++++++++++++++------------- drivers/gpu/drm/i915/intel_dp.c | 56 ++++--- drivers/gpu/drm/i915/intel_dpll_mgr.c | 5 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_dsi.c | 5 +- drivers/gpu/drm/i915/intel_fbc.c | 28 ++-- drivers/gpu/drm/i915/intel_fifo_underrun.c | 2 +- drivers/gpu/drm/i915/intel_guc_loader.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 15 +- drivers/gpu/drm/i915/intel_lvds.c | 17 +- drivers/gpu/drm/i915/intel_mocs.c | 2 +- drivers/gpu/drm/i915/intel_panel.c | 12 +- drivers/gpu/drm/i915/intel_pm.c | 83 ++++++---- drivers/gpu/drm/i915/intel_psr.c | 8 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- drivers/gpu/drm/i915/intel_sdvo.c | 12 +- drivers/gpu/drm/i915/intel_sprite.c | 17 +- drivers/gpu/drm/i915/intel_tv.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 14 +- 37 files changed, 418 insertions(+), 397 deletions(-)
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/12 drm/i915: Transitional, non-polymorph, macros
Introduce non-polymorph versions of INTEL_INFO(), INTEL_DEVID(), and INTEL_REVID(), to help the transition to ridding the driver of the polymorph versions.
These macros are only intended to be used *within* i915_drv.h, to prevent already transitioned macros from inadvertent introduction of new, non-fixed, uses.
--- drivers/gpu/drm/i915/i915_drv.h | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -2564,11 +2564,14 @@ struct drm_i915_cmd_table { __p; \ })#define INTEL_INFO (p) (&__I915__(p)->info) +#define __INTEL_INFO (dev_priv) (dev_priv->info)#define INTEL_GEN (p) (INTEL_INFO(p)->gen)#define INTEL_DEVID (p) (INTEL_INFO(p)->device_id) +#define __INTEL_DEVID (dev_priv) (__INTEL_INFO(dev_priv)->device_id)#define REVID_FOREVER 0xff#define INTEL_REVID (p) (__I915__(p)->drm.pdev->revision) +#define __INTEL_REVID (dev_priv) (dev_priv->drm.pdev->revision)#define GEN_FOREVER (0)/*
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/12 drm/i915: IS_MOBILE() fixes
In reply to David WeinehallPass dev_priv to all instances of IS_MOBILE(), convert the only user of INTEL_INFO()->is_mobile to use IS_MOBILE(), and make the macro use the new non-polymorph version of INTEL_INFO().
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- drivers/gpu/drm/i915/i915_gem_fence.c | 3 ++- drivers/gpu/drm/i915/intel_display.c | 9 +++++---- drivers/gpu/drm/i915/intel_lvds.c | 5 ++++- drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/i915/intel_sdvo.c | 4 ++-- 6 files changed, 16 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -2564,7 +2564,7 @@ struct drm_i915_cmd_table { __p; \ })#define INTEL_INFO (p) (&__I915__(p)->info) -#define __INTEL_INFO (dev_priv) (dev_priv->info) +#define __INTEL_INFO (dev_priv) (&dev_priv->info)#define INTEL_GEN (p) (INTEL_INFO(p)->gen)#define INTEL_DEVID (p) (INTEL_INFO(p)->device_id)#define __INTEL_DEVID (dev_priv) (__INTEL_INFO(dev_priv)->device_id)
@@ -2628,7 +2628,7 @@ struct drm_i915_cmd_table {#define IS_SKYLAKE (dev) (INTEL_INFO(dev)->is_skylake)#define IS_BROXTON (dev) (INTEL_INFO(dev)->is_broxton)#define IS_KABYLAKE (dev) (INTEL_INFO(dev)->is_kabylake) -#define IS_MOBILE (dev) (INTEL_INFO(dev)->is_mobile) +#define IS_MOBILE (dev_priv) (__INTEL_INFO(dev_priv)->is_mobile)#define IS_HSW_EARLY_SDV (dev) (IS_HASWELL(dev) && \ (INTEL_DEVID(dev) & 0xFF00) == 0x0C00)#define IS_BDW_ULT (dev) (IS_BROADWELL(dev) && \
drivers/gpu/drm/i915/i915_gem_fence.c +2 -1
@@ -499,7 +499,8 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)*/ swizzle_x =I915_BIT_6_SWIZZLE_NONE ; swizzle_y =I915_BIT_6_SWIZZLE_NONE ; - }else if (IS_MOBILE (dev) || (IS_GEN3 (dev) && !IS_G33 (dev))) { + }else if (IS_MOBILE (dev_priv) || + (IS_GEN3 (dev_priv) && !IS_G33 (dev_priv))) {uint32_t dcc;/* On 9xx chipsets, channel interleave by the CPU is
drivers/gpu/drm/i915/intel_display.c +5 -4
@@ -1619,7 +1619,7 @@ static void i9xx_enable_pll(struct intel_crtc *crtc)assert_pipe_disabled (dev_priv, crtc->pipe);/* PLL is protected by panel, make sure we can write it */ -if (IS_MOBILE (dev) && !IS_I830 (dev)) +if (IS_MOBILE (dev_priv) && !IS_I830 (dev_priv))assert_panel_unlocked (dev_priv, crtc->pipe);/* Enable DVO 2x clock on both PLLs if necessary */
@@ -7530,7 +7530,7 @@ static unsigned int intel_hpll_vco(struct drm_device *dev)else return 0 ; - tmp =I915_READ (IS_MOBILE (dev) ?HPLLVCO_MOBILE :HPLLVCO ); + tmp =I915_READ (IS_MOBILE (dev_priv) ?HPLLVCO_MOBILE :HPLLVCO ); vco = vco_table[tmp &0x7 ];if (vco ==0 )
@@ -8638,7 +8638,8 @@ static void i9xx_get_pfit_config(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (dev);uint32_t tmp; -if (INTEL_INFO (dev)->gen <=3 && (IS_I830 (dev) || !IS_MOBILE (dev))) +if (INTEL_GEN (dev_priv) <=3 && + (IS_I830 (dev_priv) || !IS_MOBILE (dev_priv)))return ; tmp =I915_READ (PFIT_CONTROL );
@@ -15297,7 +15298,7 @@ static bool has_edp_a(struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -if (!IS_MOBILE (dev)) +if (!IS_MOBILE (dev_priv))return false;if ((I915_READ (DP_A ) &DP_DETECTED ) ==0 )
drivers/gpu/drm/i915/intel_lvds.c +4 -1
@@ -951,6 +951,8 @@ static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder)static bool intel_lvds_supported (struct drm_device *dev) { +struct drm_i915_private *dev_priv =to_i915 (dev); +/* With the introduction of the PCH we gained a dedicated * LVDS presence pin, use it. */ if (HAS_PCH_IBX (dev) ||HAS_PCH_CPT (dev))
@@ -958,7 +960,8 @@ static bool intel_lvds_supported(struct drm_device *dev)/* Otherwise LVDS was only attached to mobile products, * except for the inglorious 830gm */ -if (INTEL_INFO (dev)->gen <=4 &&IS_MOBILE (dev) && !IS_I830 (dev)) +if (INTEL_GEN (dev_priv) <=4 && +IS_MOBILE (dev_priv) && !IS_I830 (dev_priv))return true;return false;
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -6226,7 +6226,7 @@ static u32 pvid_to_extvid(struct drm_i915_private *dev_priv, u8 pxvid)const int vd =_pxvid_to_vd (pxvid);const int vm = vd -1125 ; -if (INTEL_INFO (dev_priv)->is_mobile) +if (IS_MOBILE (dev_priv))return vm >0 ? vm :0 ;return vd;
drivers/gpu/drm/i915/intel_sdvo.c +2 -2
@@ -2410,10 +2410,10 @@ static void intel_sdvo_add_hdmi_properties(struct intel_sdvo *intel_sdvo, struct intel_sdvo_connector *connector) { - struct drm_device *dev = connector->base.base.dev; + struct drm_i915_private *dev_priv = to_i915(connector->base.base.dev);intel_attach_force_audio_property (&connector->base.base); -if (INTEL_INFO (dev)->gen >=4 &&IS_MOBILE (dev)) { +if (INTEL_GEN (dev_priv) >=4 &&IS_MOBILE (dev_priv)) {intel_attach_broadcast_rgb_property (&connector->base.base); intel_sdvo->color_range_auto = true; }
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/12 drm/i915: HAS_POOLED_EU() fixes
In reply to David WeinehallPass dev_priv to all instances of HAS_POOLED_EU(), as well as to INTEL_INFO()->min_eu_in_pool, and make the macro use the new non-polymorph version of INTEL_INFO().
--- drivers/gpu/drm/i915/i915_drv.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gem_render_state.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -2
@@ -350,10 +350,10 @@ static int i915_getparam(struct drm_device *dev, void *data, value =1 ;break ;case I915_PARAM_HAS_POOLED_EU : - value =HAS_POOLED_EU (dev); + value =HAS_POOLED_EU (dev_priv);break ;case I915_PARAM_MIN_EU_IN_POOL : - value =INTEL_INFO (dev)->min_eu_in_pool; + value =INTEL_INFO (dev_priv)->min_eu_in_pool;break ;case I915_PARAM_MMAP_GTT_VERSION :/* Though we've started our numbering from 1, and so class all
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -2809,7 +2809,7 @@ struct drm_i915_cmd_table { !IS_VALLEYVIEW(dev) && !IS_CHERRYVIEW(dev) && \ !IS_BROXTON(dev)) -#define HAS_POOLED_EU (dev) (INTEL_INFO(dev)->has_pooled_eu) +#define HAS_POOLED_EU (dev_priv) (__INTEL_INFO(dev_priv)->has_pooled_eu)#define INTEL_PCH_DEVICE_ID_MASK 0xff00#define INTEL_PCH_IBX_DEVICE_ID_TYPE 0x3b00
drivers/gpu/drm/i915/i915_gem_render_state.c +2 -1
@@ -73,6 +73,7 @@ render_state_get_rodata(const struct drm_i915_gem_request *req)static int render_state_setup (struct render_state *so) {struct drm_device *dev = so->vma->vm->dev; +struct drm_i915_private *dev_priv =to_i915 (so->vma->vm->dev);const struct intel_renderstate_rodata *rodata = so->rodata;const bool has_64bit_reloc =INTEL_GEN (dev) >=8 ;unsigned int i =0 , reloc_index =0 ;
@@ -115,7 +116,7 @@ static int render_state_setup(struct render_state *so) so->aux_batch_offset = i *sizeof (u32); -if (HAS_POOLED_EU (dev)) { +if (HAS_POOLED_EU (dev_priv)) {/* * We always program 3x6 pool config but depending upon which * subslice is disabled HW drops down to appropriate config
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/12 drm/i915: INTEL_GEN() fixes, part 1
In reply to David WeinehallPass dev_priv to all instances of INTEL_GEN(), and make the macro use the new non-polymorph version of INTEL_INFO().
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gem_render_state.c | 3 +-- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_sprite.c | 3 ++- 4 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -2565,7 +2565,7 @@ struct drm_i915_cmd_table { })#define INTEL_INFO (p) (&__I915__(p)->info)#define __INTEL_INFO (dev_priv) (&dev_priv->info) -#define INTEL_GEN (p) (INTEL_INFO(p)->gen) +#define INTEL_GEN (dev_priv) (__INTEL_INFO(dev_priv)->gen)#define INTEL_DEVID (p) (INTEL_INFO(p)->device_id)#define __INTEL_DEVID (dev_priv) (__INTEL_INFO(dev_priv)->device_id)
drivers/gpu/drm/i915/i915_gem_render_state.c +1 -2
@@ -72,10 +72,9 @@ render_state_get_rodata(const struct drm_i915_gem_request *req)static int render_state_setup (struct render_state *so) { -struct drm_device *dev = so->vma->vm->dev;struct drm_i915_private *dev_priv =to_i915 (so->vma->vm->dev);const struct intel_renderstate_rodata *rodata = so->rodata; -const bool has_64bit_reloc =INTEL_GEN (dev) >=8 ; +const bool has_64bit_reloc =INTEL_GEN (dev_priv) >=8 ;unsigned int i =0 , reloc_index =0 ;struct page *page;u32 *d;
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -12432,7 +12432,7 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,struct drm_framebuffer *fb = plane_state->fb;int ret; -if (INTEL_GEN (dev) >=9 && plane->type !=DRM_PLANE_TYPE_CURSOR ) { +if (INTEL_GEN (dev_priv) >=9 && plane->type !=DRM_PLANE_TYPE_CURSOR ) { ret =skl_update_scaler_plane (to_intel_crtc_state (crtc_state),to_intel_plane_state (plane_state));
drivers/gpu/drm/i915/intel_sprite.c +2 -1
@@ -748,6 +748,7 @@ intel_check_sprite_plane(struct drm_plane *plane,struct intel_crtc_state *crtc_state, struct intel_plane_state *state) { + struct drm_i915_private *dev_priv = to_i915(plane->dev);struct drm_device *dev = plane->dev;struct drm_crtc *crtc = state->base.crtc;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);
@@ -927,7 +928,7 @@ intel_check_sprite_plane(struct drm_plane *plane, dst->y1 = crtc_y; dst->y2 = crtc_y + crtc_h; -if (INTEL_GEN (dev) >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) { ret =skl_check_plane_surface (state);if (ret)return ret;
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/12 drm/i915: INTEL_GEN() fixes, part 2
In reply to David WeinehallConvert all instances of INTEL_INFO(dev_priv)->gen to INTEL_GEN(dev_priv).
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_gem.c | 10 +++++----- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 6 +++--- drivers/gpu/drm/i915/i915_gem_fence.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +++--- drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 24 ++++++++++++------------ drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_bios.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 4 ++-- drivers/gpu/drm/i915/intel_device_info.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 22 +++++++++++----------- drivers/gpu/drm/i915/intel_dp.c | 4 ++-- drivers/gpu/drm/i915/intel_fbc.c | 28 ++++++++++++++-------------- drivers/gpu/drm/i915/intel_guc_loader.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 4 ++-- drivers/gpu/drm/i915/intel_lvds.c | 2 +- drivers/gpu/drm/i915/intel_mocs.c | 2 +- drivers/gpu/drm/i915/intel_panel.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 12 ++++++------ drivers/gpu/drm/i915/intel_psr.c | 4 ++-- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 14 +++++++------- 23 files changed, 80 insertions(+), 80 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -1531,7 +1531,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)* Fujitsu FSC S7110 * Acer Aspire 1830T */ -if (!(hibernation &&INTEL_INFO (dev_priv)->gen <6 )) +if (!(hibernation &&INTEL_GEN (dev_priv) <6 ))pci_set_power_state (pdev, PCI_D3hot); dev_priv->suspended_to_idle =suspend_to_idle (dev_priv);
drivers/gpu/drm/i915/i915_gem.c +5 -5
@@ -4459,7 +4459,7 @@ out:bool intel_sanitize_semaphores (struct drm_i915_private *dev_priv,int value) { -if (INTEL_INFO (dev_priv)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return false;/* TODO: make semaphores and Execlists play nicely together */
@@ -4471,7 +4471,7 @@ bool intel_sanitize_semaphores(struct drm_i915_private *dev_priv, int value)#ifdef CONFIG_INTEL_IOMMU /* Enable semaphores on SNB when IO remapping is off */ -if (INTEL_INFO (dev_priv)->gen ==6 && intel_iommu_gfx_mapped) +if (INTEL_GEN (dev_priv) ==6 && intel_iommu_gfx_mapped)return false;#endif
@@ -4553,10 +4553,10 @@ i915_gem_load_init_fences(struct drm_i915_private *dev_priv)struct drm_device *dev = &dev_priv->drm;int i; -if (INTEL_INFO (dev_priv)->gen >=7 && !IS_VALLEYVIEW (dev_priv) && - !IS_CHERRYVIEW (dev_priv)) +if (INTEL_GEN (dev_priv) >=7 && + !IS_VALLEYVIEW (dev_priv) && !IS_CHERRYVIEW (dev_priv)) dev_priv->num_fence_regs =32 ; -else if (INTEL_INFO (dev_priv)->gen >=4 ||IS_I945G (dev_priv) || +else if (INTEL_GEN (dev_priv) >=4 ||IS_I945G (dev_priv) ||IS_I945GM (dev_priv) ||IS_G33 (dev_priv)) dev_priv->num_fence_regs =16 ;else
drivers/gpu/drm/i915/i915_gem_execbuffer.c +3 -3
@@ -1460,19 +1460,19 @@ execbuf_submit(struct i915_execbuffer_params *params, }if (instp_mode != dev_priv->relative_constants_mode) { -if (INTEL_INFO (dev_priv)->gen <4 ) { +if (INTEL_GEN (dev_priv) <4 ) {DRM_DEBUG ("no rel constants on pre-gen4\n" );return -EINVAL ; } -if (INTEL_INFO (dev_priv)->gen >5 && +if (INTEL_GEN (dev_priv) >5 && instp_mode ==I915_EXEC_CONSTANTS_REL_SURFACE ) {DRM_DEBUG ("rel surface constants mode invalid on gen5+\n" );return -EINVAL ; }/* The HW changed the meaning on this bit on gen6 */ -if (INTEL_INFO (dev_priv)->gen >=6 ) +if (INTEL_GEN (dev_priv) >=6 ) instp_mask &= ~I915_EXEC_CONSTANTS_REL_SURFACE ; }break ;
drivers/gpu/drm/i915/i915_gem_fence.c +1 -1
@@ -64,7 +64,7 @@ static void i965_write_fence_reg(struct drm_i915_fence_reg *fence,int fence_pitch_shift;u64 val; -if (INTEL_INFO (fence->i915)->gen >=6 ) { +if (INTEL_GEN (fence->i915) >=6 ) { fence_reg_lo =FENCE_REG_GEN6_LO (fence->id); fence_reg_hi =FENCE_REG_GEN6_HI (fence->id); fence_pitch_shift =GEN6_FENCE_PITCH_SHIFT ;
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -3
@@ -2101,7 +2101,7 @@ static int __hw_ppgtt_init(struct i915_hw_ppgtt *ppgtt, { ppgtt->base.dev = &dev_priv->drm; -if (INTEL_INFO (dev_priv)->gen <8 ) +if (INTEL_GEN (dev_priv) <8 )return gen6_ppgtt_init (ppgtt);else return gen8_ppgtt_init (ppgtt);
@@ -2237,7 +2237,7 @@ void i915_check_and_clear_faults(struct drm_i915_private *dev_priv) {struct intel_engine_cs *engine; -if (INTEL_INFO (dev_priv)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return ;for_each_engine (engine, dev_priv) {
@@ -2262,7 +2262,7 @@ void i915_check_and_clear_faults(struct drm_i915_private *dev_priv)static void i915_ggtt_flush (struct drm_i915_private *dev_priv) { -if (INTEL_INFO (dev_priv)->gen <6 ) { +if (INTEL_GEN (dev_priv) <6 ) {intel_gtt_chipset_flush (); }else {I915_WRITE (GFX_FLSH_CNTL_GEN6 ,GFX_FLSH_CNTL_EN );
drivers/gpu/drm/i915/i915_gem_stolen.c +1 -1
@@ -432,7 +432,7 @@ int i915_gem_init_stolen(struct drm_device *dev) stolen_top = dev_priv->mm.stolen_base + ggtt->stolen_size; -switch (INTEL_INFO (dev_priv)->gen) { +switch (INTEL_GEN (dev_priv)) {case 2 :case 3 :break ;
drivers/gpu/drm/i915/i915_irq.c +12 -12
@@ -274,17 +274,17 @@ void gen5_disable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask)static i915_reg_t gen6_pm_iir (struct drm_i915_private *dev_priv) { -return INTEL_INFO (dev_priv)->gen >=8 ?GEN8_GT_IIR (2 ) :GEN6_PMIIR ; +return INTEL_GEN (dev_priv) >=8 ?GEN8_GT_IIR (2 ) :GEN6_PMIIR ; }static i915_reg_t gen6_pm_imr (struct drm_i915_private *dev_priv) { -return INTEL_INFO (dev_priv)->gen >=8 ?GEN8_GT_IMR (2 ) :GEN6_PMIMR ; +return INTEL_GEN (dev_priv) >=8 ?GEN8_GT_IMR (2 ) :GEN6_PMIMR ; }static i915_reg_t gen6_pm_ier (struct drm_i915_private *dev_priv) { -return INTEL_INFO (dev_priv)->gen >=8 ?GEN8_GT_IER (2 ) :GEN6_PMIER ; +return INTEL_GEN (dev_priv) >=8 ?GEN8_GT_IER (2 ) :GEN6_PMIER ; }/**
@@ -1587,7 +1587,7 @@ static void gen6_rps_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir)spin_unlock (&dev_priv->irq_lock); } -if (INTEL_INFO (dev_priv)->gen >=8 ) +if (INTEL_GEN (dev_priv) >=8 )return ;if (HAS_VEBOX (dev_priv)) {
@@ -2322,7 +2322,7 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) ret =IRQ_HANDLED ; tmp_mask =GEN8_AUX_CHANNEL_A ; -if (INTEL_INFO (dev_priv)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) tmp_mask |=GEN9_AUX_CHANNEL_B |GEN9_AUX_CHANNEL_C |GEN9_AUX_CHANNEL_D ;
@@ -2380,7 +2380,7 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)intel_check_page_flip (dev_priv, pipe); flip_done = iir; -if (INTEL_INFO (dev_priv)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) flip_done &=GEN9_PIPE_PLANE1_FLIP_DONE ;else flip_done &=GEN8_PIPE_PRIMARY_FLIP_DONE ;
@@ -2395,7 +2395,7 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)intel_cpu_fifo_underrun_irq_handler (dev_priv, pipe); fault_errors = iir; -if (INTEL_INFO (dev_priv)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) fault_errors &=GEN9_DE_PIPE_IRQ_FAULT_ERRORS ;else fault_errors &=GEN8_DE_PIPE_IRQ_FAULT_ERRORS ;
@@ -3715,7 +3715,7 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)u32 de_misc_masked =GEN8_DE_MISC_GSE ;enum pipe pipe; -if (INTEL_INFO (dev_priv)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) { de_pipe_masked |=GEN9_PIPE_PLANE1_FLIP_DONE |GEN9_DE_PIPE_IRQ_FAULT_ERRORS ; de_port_masked |= GEN9_AUX_CHANNEL_B | GEN9_AUX_CHANNEL_C |
@@ -4501,10 +4501,10 @@ void intel_irq_init(struct drm_i915_private *dev_priv)* * TODO: verify if this can be reproduced on VLV,CHV. */ -if (INTEL_INFO (dev_priv)->gen <=7 && !IS_HASWELL (dev_priv)) +if (INTEL_GEN (dev_priv) <=7 && !IS_HASWELL (dev_priv)) dev_priv->rps.pm_intr_keep |=GEN6_PM_RP_UP_EI_EXPIRED ; -if (INTEL_INFO (dev_priv)->gen >=8 ) +if (INTEL_GEN (dev_priv) >=8 ) dev_priv->rps.pm_intr_keep |=GEN8_PMINTR_REDIRECT_TO_NON_DISP ; INIT_DELAYED_WORK(&dev_priv->gpu_error.hangcheck_work,
@@ -4514,7 +4514,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv)/* Gen2 doesn't have a hardware frame counter */ dev->max_vblank_count =0 ; dev->driver->get_vblank_counter = drm_vblank_no_hw_counter; - }else if (IS_G4X (dev_priv) ||INTEL_INFO (dev_priv)->gen >=5 ) { + }else if (IS_G4X (dev_priv) ||INTEL_GEN (dev_priv) >=5 ) { dev->max_vblank_count =0xffffffff ;/* full 32 bit counter */ dev->driver->get_vblank_counter = g4x_get_vblank_counter; }else {
@@ -4549,7 +4549,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv) dev->driver->enable_vblank = valleyview_enable_vblank; dev->driver->disable_vblank = valleyview_disable_vblank; dev_priv->display.hpd_irq_setup = i915_hpd_irq_setup; - }else if (INTEL_INFO (dev_priv)->gen >=8 ) { + }else if (INTEL_GEN (dev_priv) >=8 ) { dev->driver->irq_handler = gen8_irq_handler; dev->driver->irq_preinstall = gen8_irq_reset; dev->driver->irq_postinstall = gen8_irq_postinstall;
drivers/gpu/drm/i915/intel_audio.c +1 -1
@@ -567,7 +567,7 @@ void intel_init_audio_hooks(struct drm_i915_private *dev_priv) }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) { dev_priv->display.audio_codec_enable = ilk_audio_codec_enable; dev_priv->display.audio_codec_disable = ilk_audio_codec_disable; - }else if (IS_HASWELL (dev_priv) ||INTEL_INFO (dev_priv)->gen >=8 ) { + }else if (IS_HASWELL (dev_priv) ||INTEL_GEN (dev_priv) >=8 ) { dev_priv->display.audio_codec_enable = hsw_audio_codec_enable; dev_priv->display.audio_codec_disable = hsw_audio_codec_disable; }else if (HAS_PCH_SPLIT (dev_priv)) {
drivers/gpu/drm/i915/intel_bios.c +1 -1
@@ -387,7 +387,7 @@ parse_sdvo_panel_data(struct drm_i915_private *dev_priv,static int intel_bios_ssc_frequency (struct drm_i915_private *dev_priv,bool alternate) { -switch (INTEL_INFO (dev_priv)->gen) { +switch (INTEL_GEN (dev_priv)) {case 2 :return alternate ?66667 :48000 ;case 3 :
drivers/gpu/drm/i915/intel_ddi.c +2 -2
@@ -1605,7 +1605,7 @@ void intel_ddi_clk_select(struct intel_encoder *encoder,I915_WRITE (DPLL_CTRL2 , val); - }else if (INTEL_INFO (dev_priv)->gen <9 ) { + }else if (INTEL_GEN (dev_priv) <9 ) {WARN_ON (pipe_config->ddi_pll_sel ==PORT_CLK_SEL_NONE );I915_WRITE (PORT_CLK_SEL (port), pipe_config->ddi_pll_sel); }
@@ -1645,7 +1645,7 @@ static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder,intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_ON );intel_dp_start_link_train (intel_dp); -if (port !=PORT_A ||INTEL_INFO (dev_priv)->gen >=9 ) +if (port !=PORT_A ||INTEL_GEN (dev_priv) >=9 )intel_dp_stop_link_train (intel_dp); }else if (type ==INTEL_OUTPUT_HDMI ) {struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder);
drivers/gpu/drm/i915/intel_device_info.c +1 -1
@@ -365,7 +365,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)cherryview_sseu_info_init (dev_priv); else if (IS_BROADWELL(dev_priv)) broadwell_sseu_info_init(dev_priv); - else if (INTEL_INFO(dev_priv)->gen >= 9) + else if (INTEL_GEN(dev_priv) >= 9) gen9_sseu_info_init(dev_priv); info->has_snoop = !info->has_llc;
drivers/gpu/drm/i915/intel_display.c +11 -11
@@ -2149,12 +2149,12 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view,static unsigned int intel_linear_alignment (const struct drm_i915_private *dev_priv) { -if (INTEL_INFO (dev_priv)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )return 256 *1024 ;else if (IS_BROADWATER (dev_priv) ||IS_CRESTLINE (dev_priv) ||IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv))return 128 *1024 ; -else if (INTEL_INFO (dev_priv)->gen >=4 ) +else if (INTEL_GEN (dev_priv) >=4 )return 4 *1024 ;else return 0 ;
@@ -2167,7 +2167,7 @@ static unsigned int intel_surf_alignment(const struct drm_i915_private *dev_privcase DRM_FORMAT_MOD_NONE :return intel_linear_alignment (dev_priv);case I915_FORMAT_MOD_X_TILED : -if (INTEL_INFO (dev_priv)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )return 256 *1024 ;return 0 ;case I915_FORMAT_MOD_Y_TILED :
@@ -3118,7 +3118,7 @@ static void i9xx_disable_primary_plane(struct drm_plane *primary,int plane = intel_crtc->plane;I915_WRITE (DSPCNTR (plane),0 ); -if (INTEL_INFO (dev_priv)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 )I915_WRITE (DSPSURF (plane),0 );else I915_WRITE (DSPADDR (plane),0 );
@@ -5798,12 +5798,12 @@ static int intel_compute_max_dotclk(struct drm_i915_private *dev_priv) {int max_cdclk_freq = dev_priv->max_cdclk_freq; -if (INTEL_INFO (dev_priv)->gen >=9 || +if (INTEL_GEN (dev_priv) >=9 ||IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv))return max_cdclk_freq;else if (IS_CHERRYVIEW (dev_priv))return max_cdclk_freq*95 /100 ; -else if (INTEL_INFO (dev_priv)->gen <4 ) +else if (INTEL_GEN (dev_priv) <4 )return 2 *max_cdclk_freq*90 /100 ;else return max_cdclk_freq*90 /100 ;
@@ -7159,7 +7159,7 @@ static bool intel_crtc_supports_double_wide(const struct intel_crtc *crtc)const struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);/* GDG double wide on either pipe, otherwise pipe A only */ -return INTEL_INFO (dev_priv)->gen <4 && +return INTEL_GEN (dev_priv) <4 && (crtc->pipe ==PIPE_A ||IS_I915G (dev_priv)); }
@@ -9399,7 +9399,7 @@ static void haswell_set_pipemisc(struct drm_crtc *crtc)struct drm_i915_private *dev_priv =to_i915 (crtc->dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -if (IS_BROADWELL (dev_priv) ||INTEL_INFO (dev_priv)->gen >=9 ) { +if (IS_BROADWELL (dev_priv) ||INTEL_GEN (dev_priv) >=9 ) {u32 val =0 ;switch (intel_crtc->config->pipe_bpp) {
@@ -15695,7 +15695,7 @@ static int intel_framebuffer_init(struct drm_device *dev,* gen2/3 display engine uses the fence if present, * so the tiling mode must match the fb modifier exactly. */ -if (INTEL_INFO (dev_priv)->gen <4 && +if (INTEL_GEN (dev_priv) <4 && tiling !=intel_fb_modifier_to_tiling (mode_cmd->modifier[0 ])) {DRM_DEBUG ("tiling_mode must match fb modifier exactly on gen2/3\n" );return -EINVAL ;
@@ -15855,7 +15855,7 @@ static const struct drm_mode_config_funcs intel_mode_funcs = {*/ void intel_init_display_hooks (struct drm_i915_private *dev_priv) { -if (INTEL_INFO (dev_priv)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) { dev_priv->display.get_pipe_config = haswell_get_pipe_config; dev_priv->display.get_initial_plane_config = skylake_get_initial_plane_config;
@@ -16017,7 +16017,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)else dev_priv->display.update_crtcs = intel_update_crtcs; -switch (INTEL_INFO (dev_priv)->gen) { +switch (INTEL_GEN (dev_priv)) {case 2 : dev_priv->display.queue_flip = intel_gen2_queue_flip;break ;
drivers/gpu/drm/i915/intel_dp.c +2 -2
@@ -1206,7 +1206,7 @@ static i915_reg_t skl_aux_data_reg(struct drm_i915_private *dev_priv,static i915_reg_t intel_aux_ctl_reg (struct drm_i915_private *dev_priv,enum port port) { -if (INTEL_INFO (dev_priv)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )return skl_aux_ctl_reg (dev_priv, port);else if (HAS_PCH_SPLIT (dev_priv))return ilk_aux_ctl_reg (dev_priv, port);
@@ -1217,7 +1217,7 @@ static i915_reg_t intel_aux_ctl_reg(struct drm_i915_private *dev_priv,static i915_reg_t intel_aux_data_reg (struct drm_i915_private *dev_priv,enum port port,int index) { -if (INTEL_INFO (dev_priv)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )return skl_aux_data_reg (dev_priv, port, index);else if (HAS_PCH_SPLIT (dev_priv))return ilk_aux_data_reg (dev_priv, port, index);
drivers/gpu/drm/i915/intel_fbc.c +14 -14
@@ -48,17 +48,17 @@ static inline bool fbc_supported(struct drm_i915_private *dev_priv)static inline bool fbc_on_pipe_a_only (struct drm_i915_private *dev_priv) { -return IS_HASWELL (dev_priv) ||INTEL_INFO (dev_priv)->gen >=8 ; +return IS_HASWELL (dev_priv) ||INTEL_GEN (dev_priv) >=8 ; }static inline bool fbc_on_plane_a_only (struct drm_i915_private *dev_priv) { -return INTEL_INFO (dev_priv)->gen <4 ; +return INTEL_GEN (dev_priv) <4 ; }static inline bool no_fbc_on_multiple_pipes (struct drm_i915_private *dev_priv) { -return INTEL_INFO (dev_priv)->gen <=3 ; +return INTEL_GEN (dev_priv) <=3 ; }/*
@@ -104,7 +104,7 @@ static int intel_fbc_calculate_cfb_size(struct drm_i915_private *dev_priv,int lines;intel_fbc_get_plane_source_size (cache,NULL , &lines); -if (INTEL_INFO (dev_priv)->gen >=7 ) +if (INTEL_GEN (dev_priv) >=7 ) lines =min (lines,2048 );/* Hardware needs the full buffer stride, not just the active area. */
@@ -349,7 +349,7 @@ static void gen7_fbc_activate(struct drm_i915_private *dev_priv)static bool intel_fbc_hw_is_active (struct drm_i915_private *dev_priv) { -if (INTEL_INFO (dev_priv)->gen >=5 ) +if (INTEL_GEN (dev_priv) >=5 )return ilk_fbc_is_active (dev_priv);else if (IS_GM45 (dev_priv))return g4x_fbc_is_active (dev_priv);
@@ -363,9 +363,9 @@ static void intel_fbc_hw_activate(struct drm_i915_private *dev_priv) fbc->active = true; -if (INTEL_INFO (dev_priv)->gen >=7 ) +if (INTEL_GEN (dev_priv) >=7 )gen7_fbc_activate (dev_priv); -else if (INTEL_INFO (dev_priv)->gen >=5 ) +else if (INTEL_GEN (dev_priv) >=5 )ilk_fbc_activate (dev_priv);else if (IS_GM45 (dev_priv))g4x_fbc_activate (dev_priv);
@@ -379,7 +379,7 @@ static void intel_fbc_hw_deactivate(struct drm_i915_private *dev_priv) fbc->active = false; -if (INTEL_INFO (dev_priv)->gen >=5 ) +if (INTEL_GEN (dev_priv) >=5 )ilk_fbc_deactivate (dev_priv);else if (IS_GM45 (dev_priv))g4x_fbc_deactivate (dev_priv);
@@ -559,7 +559,7 @@ again: ret =i915_gem_stolen_insert_node_in_range (dev_priv, node, size >>=1 ,4096 ,0 , end); -if (ret &&INTEL_INFO (dev_priv)->gen <=4 ) { +if (ret &&INTEL_GEN (dev_priv) <=4 ) {return 0 ; }else if (ret) { compression_threshold <<=1 ;
@@ -592,7 +592,7 @@ static int intel_fbc_alloc_cfb(struct intel_crtc *crtc) fbc->threshold = ret; -if (INTEL_INFO (dev_priv)->gen >=5 ) +if (INTEL_GEN (dev_priv) >=5 )I915_WRITE (ILK_DPFC_CB_BASE , fbc->compressed_fb.start);else if (IS_GM45 (dev_priv)) {I915_WRITE (DPFC_CB_BASE , fbc->compressed_fb.start);
@@ -706,10 +706,10 @@ static bool intel_fbc_hw_tracking_covers_screen(struct intel_crtc *crtc)struct intel_fbc *fbc = &dev_priv->fbc;unsigned int effective_w, effective_h, max_w, max_h; -if (INTEL_INFO (dev_priv)->gen >=8 ||IS_HASWELL (dev_priv)) { +if (INTEL_GEN (dev_priv) >=8 ||IS_HASWELL (dev_priv)) { max_w =4096 ; max_h =4096 ; - }else if (IS_G4X (dev_priv) ||INTEL_INFO (dev_priv)->gen >=5 ) { + }else if (IS_G4X (dev_priv) ||INTEL_GEN (dev_priv) >=5 ) { max_w =4096 ; max_h =2048 ; }else {
@@ -802,7 +802,7 @@ static bool intel_fbc_can_activate(struct intel_crtc *crtc) fbc->no_fbc_reason ="framebuffer not tiled or fenced" ;return false; } -if (INTEL_INFO (dev_priv)->gen <=4 && !IS_G4X (dev_priv) && +if (INTEL_GEN (dev_priv) <=4 && !IS_G4X (dev_priv) && cache->plane.rotation !=DRM_ROTATE_0 ) { fbc->no_fbc_reason ="rotation unsupported" ;return false;
@@ -1317,7 +1317,7 @@ void intel_fbc_init(struct drm_i915_private *dev_priv) }/* This value was pulled out of someone's hat */ -if (INTEL_INFO (dev_priv)->gen <=4 && !IS_GM45 (dev_priv)) +if (INTEL_GEN (dev_priv) <=4 && !IS_GM45 (dev_priv))I915_WRITE (FBC_CONTROL ,500 <<FBC_CTL_INTERVAL_SHIFT );/* We still don't have any sort of hardware state readout for FBC, so
drivers/gpu/drm/i915/intel_guc_loader.c +1 -1
@@ -152,7 +152,7 @@ static u32 get_gttype(struct drm_i915_private *dev_priv)static u32 get_core_family (struct drm_i915_private *dev_priv) { -switch (INTEL_INFO (dev_priv)->gen) { +switch (INTEL_GEN (dev_priv)) {case 9 :return GFXCORE_FAMILY_GEN9 ;
drivers/gpu/drm/i915/intel_hdmi.c +2 -2
@@ -1207,7 +1207,7 @@ static int intel_hdmi_source_max_tmds_clock(struct drm_i915_private *dev_priv) {if (IS_G4X (dev_priv))return 165000 ; -else if (IS_HASWELL (dev_priv) ||INTEL_INFO (dev_priv)->gen >=8 ) +else if (IS_HASWELL (dev_priv) ||INTEL_GEN (dev_priv) >=8 )return 300000 ;else return 225000 ;
@@ -1506,7 +1506,7 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)* So consider live_status only for certain platforms, for * others, read EDID to determine presence of sink. */ -if (INTEL_INFO (dev_priv)->gen <7 ||IS_IVYBRIDGE (dev_priv)) +if (INTEL_GEN (dev_priv) <7 ||IS_IVYBRIDGE (dev_priv)) live_status = true; }
drivers/gpu/drm/i915/intel_lvds.c +1 -1
@@ -189,7 +189,7 @@ static void intel_lvds_pps_get_hw_state(struct drm_i915_private *dev_priv,/* Convert from 100ms to 100us units */ pps->t4 = val *1000 ; -if (INTEL_INFO (dev_priv)->gen <=4 && +if (INTEL_GEN (dev_priv) <=4 && pps->t1_t2 ==0 && pps->t5 ==0 && pps->t3 ==0 && pps->tx ==0 ) {DRM_DEBUG_KMS ("Panel power timings uninitialized, " "setting defaults\n" );
drivers/gpu/drm/i915/intel_mocs.c +1 -1
@@ -187,7 +187,7 @@ static bool get_mocs_settings(struct drm_i915_private *dev_priv, table->table = broxton_mocs_table; result = true; }else { -WARN_ONCE (INTEL_INFO (dev_priv)->gen >=9 , +WARN_ONCE (INTEL_GEN (dev_priv) >=9 ,"Platform that should have a MOCS table does not.\n" ); }
drivers/gpu/drm/i915/intel_panel.c +1 -1
@@ -498,7 +498,7 @@ static u32 i9xx_get_backlight(struct intel_connector *connector)u32 val; val =I915_READ (BLC_PWM_CTL ) &BACKLIGHT_DUTY_CYCLE_MASK ; -if (INTEL_INFO (dev_priv)->gen <4 ) +if (INTEL_GEN (dev_priv) <4 ) val >>=1 ;if (panel->backlight.combination_mode) {
drivers/gpu/drm/i915/intel_pm.c +6 -6
@@ -5171,7 +5171,7 @@ static bool bxt_check_bios_rc6_setup(struct drm_i915_private *dev_priv)int sanitize_rc6_option (struct drm_i915_private *dev_priv,int enable_rc6) {/* No RC6 before Ironlake and code is gone for ilk. */ -if (INTEL_INFO (dev_priv)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return 0 ;if (!enable_rc6)
@@ -5596,7 +5596,7 @@ static void gen6_update_ring_freq(struct drm_i915_private *dev_priv)* No floor required for ring frequency on SKL. */ ring_freq = gpu_freq; - }else if (INTEL_INFO (dev_priv)->gen >=8 ) { + }else if (INTEL_GEN (dev_priv) >=8 ) {/* max(2 * GT, DDR). NB: GT is 50MHz units */ ring_freq =max (min_ring_freq, gpu_freq); }else if (IS_HASWELL (dev_priv)) {
@@ -6183,7 +6183,7 @@ unsigned long i915_chipset_val(struct drm_i915_private *dev_priv) {unsigned long val; -if (INTEL_INFO (dev_priv)->gen !=5 ) +if (INTEL_GEN (dev_priv) !=5 )return 0 ;spin_lock_irq (&mchdev_lock);
@@ -6267,7 +6267,7 @@ static void __i915_update_gfx_val(struct drm_i915_private *dev_priv)void i915_update_gfx_val (struct drm_i915_private *dev_priv) { -if (INTEL_INFO (dev_priv)->gen !=5 ) +if (INTEL_GEN (dev_priv) !=5 )return ;spin_lock_irq (&mchdev_lock);
@@ -6318,7 +6318,7 @@ unsigned long i915_gfx_val(struct drm_i915_private *dev_priv) {unsigned long val; -if (INTEL_INFO (dev_priv)->gen !=5 ) +if (INTEL_GEN (dev_priv) !=5 )return 0 ;spin_lock_irq (&mchdev_lock);
@@ -6776,7 +6776,7 @@ void intel_autoenable_gt_powersave(struct drm_i915_private *dev_priv)mutex_lock (&dev_priv->drm.struct_mutex);intel_init_emon (dev_priv);mutex_unlock (&dev_priv->drm.struct_mutex); - }else if (INTEL_INFO (dev_priv)->gen >=6 ) { + }else if (INTEL_GEN (dev_priv) >=6 ) {/* * PCU communication is slow and this doesn't need to be * done at any specific time, so do this out of our fast path
drivers/gpu/drm/i915/intel_psr.c +2 -2
@@ -154,7 +154,7 @@ static void vlv_psr_enable_sink(struct intel_dp *intel_dp)static i915_reg_t psr_aux_ctl_reg (struct drm_i915_private *dev_priv,enum port port) { -if (INTEL_INFO (dev_priv)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )return DP_AUX_CH_CTL (port);else return EDP_PSR_AUX_CTL ;
@@ -163,7 +163,7 @@ static i915_reg_t psr_aux_ctl_reg(struct drm_i915_private *dev_priv,static i915_reg_t psr_aux_data_reg (struct drm_i915_private *dev_priv,enum port port,int index) { -if (INTEL_INFO (dev_priv)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )return DP_AUX_CH_DATA (port, index);else return EDP_PSR_AUX_DATA (index);
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -1248,7 +1248,7 @@ static int init_render_ring(struct intel_engine_cs *engine)if (IS_GEN (dev_priv,6 ,7 ))I915_WRITE (INSTPM ,_MASKED_BIT_ENABLE (INSTPM_FORCE_ORDERING )); -if (INTEL_INFO (dev_priv)->gen >=6 ) +if (INTEL_GEN (dev_priv) >=6 )I915_WRITE_IMR (engine, ~engine->irq_keep_mask);return init_workarounds_ring (engine);
drivers/gpu/drm/i915/intel_uncore.c +7 -7
@@ -1234,7 +1234,7 @@ static void fw_domain_init(struct drm_i915_private *dev_priv,static void intel_uncore_fw_domains_init (struct drm_i915_private *dev_priv) { -if (INTEL_INFO (dev_priv)->gen <=5 ) +if (INTEL_GEN (dev_priv) <=5 )return ;if (IS_GEN9 (dev_priv)) {
@@ -1334,7 +1334,7 @@ void intel_uncore_init(struct drm_i915_private *dev_priv) dev_priv->uncore.unclaimed_mmio_check =1 ; -switch (INTEL_INFO (dev_priv)->gen) { +switch (INTEL_GEN (dev_priv)) {default :case 9 :ASSIGN_WRITE_MMIO_VFUNCS (gen9);
@@ -1738,9 +1738,9 @@ static reset_func intel_get_gpu_reset(struct drm_i915_private *dev_priv)if (!i915.reset)return NULL ; -if (INTEL_INFO (dev_priv)->gen >=8 ) +if (INTEL_GEN (dev_priv) >=8 )return gen8_reset_engines; -else if (INTEL_INFO (dev_priv)->gen >=6 ) +else if (INTEL_GEN (dev_priv) >=6 )return gen6_reset_engines;else if (IS_GEN5 (dev_priv))return ironlake_do_reset;
@@ -1748,7 +1748,7 @@ static reset_func intel_get_gpu_reset(struct drm_i915_private *dev_priv)return g4x_do_reset; else if (IS_G33(dev_priv)) return g33_do_reset; - else if (INTEL_INFO(dev_priv)->gen >= 3) + else if (INTEL_GEN(dev_priv) >= 3) return i915_do_reset; else return NULL;
@@ -1848,7 +1848,7 @@ intel_uncore_forcewake_for_read(struct drm_i915_private *dev_priv, fw_domains =__gen6_reg_read_fw_domains (i915_mmio_reg_offset (reg));break ;default : -MISSING_CASE (INTEL_INFO (dev_priv)->gen); +MISSING_CASE (INTEL_GEN (dev_priv));case 5 :/* forcewake was introduced with gen6 */ case 4 :case 3 :
@@ -1885,7 +1885,7 @@ intel_uncore_forcewake_for_write(struct drm_i915_private *dev_priv, fw_domains =FORCEWAKE_RENDER ;break ;default : -MISSING_CASE (INTEL_INFO (dev_priv)->gen); +MISSING_CASE (INTEL_GEN (dev_priv));case 5 :case 4 :case 3 :
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/12 drm/i915: INTEL_GEN() fixes, part 3
In reply to David WeinehallConvert all instances of INTEL_INFO(dev)->gen in intel_display.c to INTEL_GEN(dev_priv).
--- drivers/gpu/drm/i915/intel_display.c | 176 ++++++++++++++++++----------------- 1 file changed, 89 insertions(+), 87 deletions(-)
drivers/gpu/drm/i915/intel_display.c +89 -87
@@ -1075,7 +1075,7 @@ static void intel_wait_for_pipe_off(struct intel_crtc *crtc)enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;enum pipe pipe = crtc->pipe; -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {i915_reg_t reg =PIPECONF (cpu_transcoder);/* Wait for the Pipe State to go off */
@@ -1294,11 +1294,10 @@ static void assert_plane(struct drm_i915_private *dev_priv,static void assert_planes_disabled (struct drm_i915_private *dev_priv,enum pipe pipe) { -struct drm_device *dev = &dev_priv->drm;int i;/* Primary planes are fixed to pipes on gen4+ */ -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {u32 val =I915_READ (DSPCNTR (pipe)); I915_STATE_WARN(val & DISPLAY_PLANE_ENABLE, "plane %c assertion failure, should be disabled but not\n",
@@ -1323,7 +1322,7 @@ static void assert_sprites_disabled(struct drm_i915_private *dev_priv,struct drm_device *dev = &dev_priv->drm;int sprite; -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {for_each_sprite (dev_priv, pipe, sprite) {u32 val =I915_READ (PLANE_CTL (pipe, sprite)); I915_STATE_WARN(val & PLANE_CTL_ENABLE,
@@ -1337,12 +1336,12 @@ static void assert_sprites_disabled(struct drm_i915_private *dev_priv,"sprite %c assertion failure, should be off on pipe %c but is still active\n" , sprite_name(pipe, sprite), pipe_name(pipe)); } - }else if (INTEL_INFO (dev)->gen >=7 ) { + }else if (INTEL_GEN (dev_priv) >=7 ) {u32 val =I915_READ (SPRCTL (pipe));I915_STATE_WARN (val &SPRITE_ENABLE ,"sprite %c assertion failure, should be off on pipe %c but is still active\n" ,plane_name (pipe),pipe_name (pipe)); - }else if (INTEL_INFO (dev)->gen >=5 ) { + }else if (INTEL_GEN (dev_priv) >=5 ) {u32 val =I915_READ (DVSCNTR (pipe)); I915_STATE_WARN(val & DVS_ENABLE, "sprite %c assertion failure, should be off on pipe %c but is still active\n",
@@ -1648,7 +1647,7 @@ static void i9xx_enable_pll(struct intel_crtc *crtc)POSTING_READ (reg);udelay (150 ); -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {I915_WRITE (DPLL_MD (crtc->pipe), crtc->config->dpll_hw_state.dpll_md); }else {
@@ -3022,7 +3021,7 @@ static void i9xx_update_primary_plane(struct drm_plane *primary, dspcntr |=DISPLAY_PLANE_ENABLE ; -if (INTEL_INFO (dev)->gen <4 ) { +if (INTEL_GEN (dev_priv) <4 ) {if (intel_crtc->pipe ==PIPE_B ) dspcntr |=DISPPLANE_SEL_PIPE_B ;
@@ -3076,7 +3075,7 @@ static void i9xx_update_primary_plane(struct drm_plane *primary,intel_add_fb_offsets (&x, &y, plane_state,0 ); -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 ) intel_crtc->dspaddr_offset =intel_compute_tile_offset (&x, &y, plane_state,0 );
@@ -3089,7 +3088,7 @@ static void i9xx_update_primary_plane(struct drm_plane *primary, linear_offset =intel_fb_xy_to_linear (x, y, plane_state,0 ); -if (INTEL_INFO (dev)->gen <4 ) +if (INTEL_GEN (dev_priv) <4 ) intel_crtc->dspaddr_offset = linear_offset; intel_crtc->adjusted_x = x;
@@ -3098,7 +3097,7 @@ static void i9xx_update_primary_plane(struct drm_plane *primary,I915_WRITE (reg, dspcntr);I915_WRITE (DSPSTRIDE (plane), fb->pitches[0 ]); -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {I915_WRITE (DSPSURF (plane),intel_fb_gtt_offset (fb, rotation) + intel_crtc->dspaddr_offset);
@@ -3690,7 +3689,7 @@ static void intel_update_pipe_config(struct intel_crtc *crtc, (pipe_config->pipe_src_h - 1));/* on skylake this is done by detaching scalers */ -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {skl_detach_scalers (crtc);if (pipe_config->pch_pfit.enabled)
@@ -5442,7 +5441,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,if (!transcoder_is_dsi (cpu_transcoder))intel_ddi_enable_pipe_clock (intel_crtc); -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )skylake_pfit_enable (intel_crtc);else ironlake_pfit_enable (intel_crtc);
@@ -5574,8 +5573,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state, struct drm_atomic_state *old_state) {struct drm_crtc *crtc = old_crtc_state->base.crtc; -struct drm_device *dev = crtc->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (crtc->dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
@@ -5598,7 +5596,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,if (!transcoder_is_dsi (cpu_transcoder))intel_ddi_disable_transcoder_func (dev_priv, cpu_transcoder); -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )skylake_scaler_disable (intel_crtc);else ironlake_pfit_disable (intel_crtc, false);
@@ -7171,7 +7169,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;int clock_limit = dev_priv->max_dotclk_freq; -if (INTEL_INFO (dev)->gen <4 ) { +if (INTEL_GEN (dev_priv) <4 ) { clock_limit = dev_priv->max_cdclk_freq *9 /10 ;/*
@@ -7205,7 +7203,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,/* Cantiga+ cannot handle modes with a hsync front porch of 0. * WaPruneModeWithIncorrectHsyncOffset:ctg,elk,ilk,snb,ivb,vlv,hsw. */ -if ((INTEL_INFO (dev)->gen >4 ||IS_G4X (dev)) && +if ((INTEL_GEN (dev_priv) >4 ||IS_G4X (dev_priv)) && adjusted_mode->crtc_hsync_start == adjusted_mode->crtc_hdisplay)return -EINVAL ;
@@ -7770,12 +7768,11 @@ static void intel_cpu_transcoder_set_m_n(struct intel_crtc *crtc,struct intel_link_m_n *m_n, struct intel_link_m_n *m2_n2) { - struct drm_device *dev = crtc->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);int pipe = crtc->pipe;enum transcoder transcoder = crtc->config->cpu_transcoder; -if (INTEL_INFO (dev)->gen >=5 ) { +if (INTEL_GEN (dev_priv) >=5 ) {I915_WRITE (PIPE_DATA_M1 (transcoder),TU_SIZE (m_n->tu) | m_n->gmch_m);I915_WRITE (PIPE_DATA_N1 (transcoder), m_n->gmch_n);I915_WRITE (PIPE_LINK_M1 (transcoder), m_n->link_m);
@@ -7784,8 +7781,9 @@ static void intel_cpu_transcoder_set_m_n(struct intel_crtc *crtc,* for gen < 8) and if DRRS is supported (to make sure the * registers are not unnecessarily accessed). */ -if (m2_n2 && (IS_CHERRYVIEW (dev) ||INTEL_INFO (dev)->gen <8 ) && - crtc->config->has_drrs) { +if (m2_n2 && + (IS_CHERRYVIEW (dev_priv) ||INTEL_GEN (dev_priv) <8 ) && + crtc->config->has_drrs) {I915_WRITE (PIPE_DATA_M2 (transcoder),TU_SIZE (m2_n2->tu) | m2_n2->gmch_m);I915_WRITE (PIPE_DATA_N2 (transcoder), m2_n2->gmch_n);
@@ -8170,7 +8168,7 @@ static void i9xx_compute_dpll(struct intel_crtc *crtc, dpll |=DPLLB_LVDS_P2_CLOCK_DIV_14 ;break ; } -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 ) dpll |= (6 <<PLL_LOAD_PULSE_PHASE_SHIFT );if (crtc_state->sdvo_tv_clock)
@@ -8184,7 +8182,7 @@ static void i9xx_compute_dpll(struct intel_crtc *crtc, dpll |=DPLL_VCO_ENABLE ; crtc_state->dpll_hw_state.dpll = dpll; -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {u32 dpll_md = (crtc_state->pixel_multiplier -1 ) <<DPLL_MD_UDI_MULTIPLIER_SHIFT ; crtc_state->dpll_hw_state.dpll_md = dpll_md;
@@ -8257,7 +8255,7 @@ static void intel_set_pipe_timings(struct intel_crtc *intel_crtc) vsyncshift += adjusted_mode->crtc_htotal; } -if (INTEL_INFO (dev)->gen >3 ) +if (INTEL_GEN (dev_priv) >3 )I915_WRITE (VSYNCSHIFT (cpu_transcoder), vsyncshift); I915_WRITE(HTOTAL(cpu_transcoder),
@@ -8426,7 +8424,7 @@ static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc) }if (intel_crtc->config->base.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) { -if (INTEL_INFO (dev)->gen <4 || +if (INTEL_GEN (dev_priv) <4 ||intel_crtc_has_type (intel_crtc->config,INTEL_OUTPUT_SDVO )) pipeconf |=PIPECONF_INTERLACE_W_FIELD_INDICATION ;else
@@ -8634,8 +8632,7 @@ static int vlv_crtc_compute_clock(struct intel_crtc *crtc,static void i9xx_get_pfit_config (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config) { -struct drm_device *dev = crtc->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);uint32_t tmp; if (INTEL_GEN(dev_priv) <= 3 &&
@@ -8647,7 +8644,7 @@ static void i9xx_get_pfit_config(struct intel_crtc *crtc,return ;/* Check whether the pfit is attached to our pipe. */ -if (INTEL_INFO (dev)->gen <4 ) { +if (INTEL_GEN (dev_priv) <4 ) {if (crtc->pipe !=PIPE_B )return ; }else {
@@ -8711,7 +8708,7 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc, fb = &intel_fb->base; -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {if (val &DISPPLANE_TILED ) { plane_config->tiling =I915_TILING_X ; fb->modifier[0 ] =I915_FORMAT_MOD_X_TILED ;
@@ -8723,7 +8720,7 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc, fb->pixel_format = fourcc; fb->bits_per_pixel =drm_format_plane_cpp (fourcc,0 ) *8 ; -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {if (plane_config->tiling) offset =I915_READ (DSPTILEOFF (plane));else
@@ -8831,7 +8828,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc, (tmp & PIPECONF_COLOR_RANGE_SELECT)) pipe_config->limited_color_range = true; -if (INTEL_INFO (dev)->gen <4 ) +if (INTEL_GEN (dev_priv) <4 ) pipe_config->double_wide = tmp &PIPECONF_DOUBLE_WIDE ;intel_get_pipe_timings (crtc, pipe_config);
@@ -8839,7 +8836,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,i9xx_get_pfit_config (crtc, pipe_config); -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {/* No way to read it out on pipes B and C */ if (IS_CHERRYVIEW (dev) && crtc->pipe !=PIPE_A ) tmp = dev_priv->chv_dpll_md[crtc->pipe];
@@ -9614,11 +9611,10 @@ static void intel_cpu_transcoder_get_m_n(struct intel_crtc *crtc,struct intel_link_m_n *m_n, struct intel_link_m_n *m2_n2) { - struct drm_device *dev = crtc->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);enum pipe pipe = crtc->pipe; -if (INTEL_INFO (dev)->gen >=5 ) { +if (INTEL_GEN (dev_priv) >=5 ) { m_n->link_m =I915_READ (PIPE_LINK_M1 (transcoder)); m_n->link_n =I915_READ (PIPE_LINK_N1 (transcoder)); m_n->gmch_m =I915_READ (PIPE_DATA_M1 (transcoder))
@@ -9630,7 +9626,7 @@ static void intel_cpu_transcoder_get_m_n(struct intel_crtc *crtc,* gen < 8) and if DRRS is supported (to make sure the * registers are not unnecessarily read). */ -if (m2_n2 &&INTEL_INFO (dev)->gen <8 && +if (m2_n2 &&INTEL_GEN (dev_priv) <8 && crtc->config->has_drrs) { m2_n2->link_m =I915_READ (PIPE_LINK_M2 (transcoder)); m2_n2->link_n =I915_READ (PIPE_LINK_N2 (transcoder));
@@ -9832,7 +9828,7 @@ ironlake_get_initial_plane_config(struct intel_crtc *crtc, fb = &intel_fb->base; -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {if (val &DISPPLANE_TILED ) { plane_config->tiling =I915_TILING_X ; fb->modifier[0 ] =I915_FORMAT_MOD_X_TILED ;
@@ -10650,7 +10646,7 @@ static void haswell_get_ddi_port_state(struct intel_crtc *crtc,* DDI E. So just check whether this pipe is wired to DDI E and whether * the PCH transcoder is on. */ -if (INTEL_INFO (dev)->gen <9 && +if (INTEL_GEN (dev_priv) <9 && (port ==PORT_E ) &&I915_READ (LPT_TRANSCONF ) &TRANS_ENABLE ) { pipe_config->has_pch_encoder = true;
@@ -10699,11 +10695,11 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc, pipe_config->gamma_mode =I915_READ (GAMMA_MODE (crtc->pipe)) &GAMMA_MODE_MODE_MASK ; -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {skl_init_scalers (dev, crtc, pipe_config); } -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) { pipe_config->scaler_state.scaler_id =-1 ; pipe_config->scaler_state.scaler_users &= ~(1 <<SKL_CRTC_INDEX ); }
@@ -10711,7 +10707,7 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc, power_domain =POWER_DOMAIN_PIPE_PANEL_FITTER (crtc->pipe);if (intel_display_power_get_if_enabled (dev_priv, power_domain)) { power_domain_mask |=BIT (power_domain); -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )skylake_get_pfit_config (crtc, pipe_config);else ironlake_get_pfit_config (crtc, pipe_config);
@@ -11548,8 +11544,7 @@ static bool g4x_flip_count_after_eq(u32 a, u32 b)static bool __pageflip_finished_cs (struct intel_crtc *crtc,struct intel_flip_work *work) { -struct drm_device *dev = crtc->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);unsigned reset_counter; reset_counter =i915_reset_counter (&dev_priv->gpu_error);
@@ -11563,7 +11558,7 @@ static bool __pageflip_finished_cs(struct intel_crtc *crtc,* really needed there. But since ctg has the registers, * include it in the check anyway. */ -if (INTEL_INFO (dev)->gen <5 && !IS_G4X (dev)) +if (INTEL_GEN (dev_priv) <5 && !IS_G4X (dev_priv))return true;/*
@@ -12162,7 +12157,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,* TILEOFF/LINOFF registers can't be changed via MI display flips. * Note that pitch changes could also affect these register. */ -if (INTEL_INFO (dev)->gen >3 && +if (INTEL_GEN (dev_priv) >3 && (fb->offsets[0 ] != crtc->primary->fb->offsets[0 ] || fb->pitches[0 ] != crtc->primary->fb->pitches[0 ]))return -EINVAL ;
@@ -12227,7 +12222,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,atomic_inc (&intel_crtc->unpin_work_count); -if (INTEL_INFO (dev)->gen >=5 ||IS_G4X (dev)) +if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) work->flip_count =I915_READ (PIPE_FLIPCOUNT_G4X (pipe)) +1 ;if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) {
@@ -12237,7 +12232,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, engine =NULL ; }else if (IS_IVYBRIDGE (dev) ||IS_HASWELL (dev)) { engine = &dev_priv->engine[BCS ]; - }else if (INTEL_INFO (dev)->gen >=7 ) { + }else if (INTEL_GEN (dev_priv) >=7 ) { engine =i915_gem_active_get_engine (&obj->last_write, &obj->base.dev->struct_mutex);if (engine ==NULL || engine->id !=RCS )
@@ -12499,7 +12494,7 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,/* Pre-gen9 platforms need two-step watermark updates */ if ((pipe_config->update_wm_pre || pipe_config->update_wm_post) && -INTEL_INFO (dev)->gen <9 && dev_priv->display.optimize_watermarks) +INTEL_GEN (dev_priv) <9 && dev_priv->display.optimize_watermarks)to_intel_crtc_state (crtc_state)->wm.need_postvbl_update = true;if (visible || was_visible)
@@ -12616,7 +12611,7 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc, pipe_config->wm.ilk.intermediate = pipe_config->wm.ilk.optimal; } -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {if (mode_changed) ret =skl_update_scaler_crtc (pipe_config);
@@ -12687,15 +12682,16 @@ static int compute_baseline_pipe_bpp(struct intel_crtc *crtc, struct intel_crtc_state *pipe_config) { - struct drm_device *dev = crtc->base.dev; + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);struct drm_atomic_state *state;struct drm_connector *connector;struct drm_connector_state *connector_state;int bpp, i; -if ((IS_G4X (dev) ||IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev))) +if (IS_G4X (dev_priv) || +IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) bpp =10 *3 ; -else if (INTEL_INFO (dev)->gen >=5 ) +else if (INTEL_GEN (dev_priv) >=5 ) bpp =12 *3 ;else bpp =8 *3 ;
@@ -13185,6 +13181,7 @@ intel_pipe_config_compare(struct drm_device *dev, struct intel_crtc_state *pipe_config, bool adjust) { +struct drm_i915_private *dev_priv =to_i915 (dev);bool ret = true;#define INTEL_ERR_OR_DBG_KMS (fmt, ...) \
@@ -13304,7 +13301,7 @@ intel_pipe_config_compare(struct drm_device *dev,PIPE_CONF_CHECK_I (lane_count);PIPE_CONF_CHECK_X (lane_lat_optim_mask); -if (INTEL_INFO (dev)->gen <8 ) { +if (INTEL_GEN (dev_priv) <8 ) {PIPE_CONF_CHECK_M_N (dp_m_n);if (current_config->has_drrs)
@@ -13330,8 +13327,8 @@ intel_pipe_config_compare(struct drm_device *dev,PIPE_CONF_CHECK_I (pixel_multiplier);PIPE_CONF_CHECK_I (has_hdmi_sink); -if ((INTEL_INFO (dev)->gen <8 && !IS_HASWELL (dev)) || -IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) +if ((INTEL_GEN (dev_priv) <8 && !IS_HASWELL (dev_priv)) || +IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv))PIPE_CONF_CHECK_I (limited_color_range);PIPE_CONF_CHECK_I (has_infoframe);
@@ -13353,7 +13350,7 @@ intel_pipe_config_compare(struct drm_device *dev,PIPE_CONF_CHECK_X (gmch_pfit.control);/* pfit ratios are autocomputed by the hw on gen4+ */ -if (INTEL_INFO (dev)->gen <4 ) +if (INTEL_GEN (dev_priv) <4 )PIPE_CONF_CHECK_X (gmch_pfit.pgm_ratios);PIPE_CONF_CHECK_X (gmch_pfit.lvds_border_bits);
@@ -13392,7 +13389,7 @@ intel_pipe_config_compare(struct drm_device *dev,PIPE_CONF_CHECK_X (dsi_pll.ctrl);PIPE_CONF_CHECK_X (dsi_pll.div); -if (IS_G4X (dev) ||INTEL_INFO (dev)->gen >=5 ) +if (IS_G4X (dev_priv) ||INTEL_GEN (dev_priv) >=5 )PIPE_CONF_CHECK_I (pipe_bpp);PIPE_CONF_CHECK_CLOCK_FUZZY (base.adjusted_mode.crtc_clock);
@@ -13430,15 +13427,14 @@ static void intel_pipe_config_sanity_check(struct drm_i915_private *dev_priv,static void verify_wm_state (struct drm_crtc *crtc,struct drm_crtc_state *new_state) { -struct drm_device *dev = crtc->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (crtc->dev);struct skl_ddb_allocation hw_ddb, *sw_ddb;struct skl_ddb_entry *hw_entry, *sw_entry;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);const enum pipe pipe = intel_crtc->pipe;int plane; -if (INTEL_INFO (dev)->gen <9 || !new_state->active) +if (INTEL_GEN (dev_priv) <9 || !new_state->active)return ;skl_ddb_get_hw_state (dev_priv, &hw_ddb);
@@ -14892,6 +14888,7 @@ const struct drm_plane_funcs intel_plane_funcs = {static struct drm_plane *intel_primary_plane_create (struct drm_device *dev,int pipe) { +struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_plane *primary =NULL ;struct intel_plane_state *state =NULL ;const uint32_t *intel_primary_formats;
@@ -14909,7 +14906,7 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, primary->can_scale = false; primary->max_downscale =1 ; -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) { primary->can_scale = true; state->scaler_id =-1 ; }
@@ -14917,10 +14914,10 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, primary->plane = pipe; primary->frontbuffer_bit =INTEL_FRONTBUFFER_PRIMARY (pipe); primary->check_plane = intel_check_primary_plane; -if (HAS_FBC (dev) &&INTEL_INFO (dev)->gen <4 ) +if (HAS_FBC (dev_priv) &&INTEL_GEN (dev_priv) <4 ) primary->plane = !pipe; -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) { intel_primary_formats = skl_primary_formats; num_formats =ARRAY_SIZE (skl_primary_formats);
@@ -14932,7 +14929,7 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, primary->update_plane = ironlake_update_primary_plane; primary->disable_plane = i9xx_disable_primary_plane; - }else if (INTEL_INFO (dev)->gen >=4 ) { + }else if (INTEL_GEN (dev_priv) >=4 ) { intel_primary_formats = i965_primary_formats; num_formats =ARRAY_SIZE (i965_primary_formats);
@@ -14946,13 +14943,13 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, primary->disable_plane = i9xx_disable_primary_plane; } -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) ret =drm_universal_plane_init (dev, &primary->base,0 , &intel_plane_funcs, intel_primary_formats, num_formats,DRM_PLANE_TYPE_PRIMARY ,"plane 1%c" ,pipe_name (pipe)); -else if (INTEL_INFO (dev)->gen >=5 ||IS_G4X (dev)) +else if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) ret = drm_universal_plane_init(dev, &primary->base, 0, &intel_plane_funcs, intel_primary_formats, num_formats,
@@ -14967,7 +14964,7 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,if (ret) goto fail; -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 )intel_create_rotation_property (dev, primary);drm_plane_helper_add (&primary->base, &intel_plane_helper_funcs);
@@ -14983,11 +14980,13 @@ fail:void intel_create_rotation_property (struct drm_device *dev,struct intel_plane *plane) { +struct drm_i915_private *dev_priv =to_i915 (dev); +if (!dev->mode_config.rotation_property) {unsigned long flags =DRM_ROTATE_0 |DRM_ROTATE_180 ; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) flags |=DRM_ROTATE_90 |DRM_ROTATE_270 ; dev->mode_config.rotation_property =
@@ -15094,6 +15093,7 @@ intel_update_cursor_plane(struct drm_plane *plane,static struct drm_plane *intel_cursor_plane_create (struct drm_device *dev,int pipe) { +struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_plane *cursor =NULL ;struct intel_plane_state *state =NULL ;int ret;
@@ -15125,7 +15125,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,if (ret) goto fail; -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {if (!dev->mode_config.rotation_property) dev->mode_config.rotation_property = drm_mode_create_rotation_property(dev,
@@ -15137,7 +15137,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev, state->base.rotation); } -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) state->scaler_id =-1 ;drm_plane_helper_add (&cursor->base, &intel_plane_helper_funcs);
@@ -15188,7 +15188,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) crtc_state->base.crtc = &intel_crtc->base;/* initialize shared scalers */ -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {if (pipe ==PIPE_C ) intel_crtc->num_scalers =1 ;else
@@ -15217,7 +15217,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)*/ intel_crtc->pipe = pipe; intel_crtc->plane = pipe; -if (HAS_FBC (dev) &&INTEL_INFO (dev)->gen <4 ) { +if (HAS_FBC (dev_priv) &&INTEL_GEN (dev_priv) <4 ) {DRM_DEBUG_KMS ("swapping pipes & planes for FBC\n" ); intel_crtc->plane = !pipe; }
@@ -15314,7 +15314,7 @@ static bool intel_crt_present(struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )return false;if (IS_HSW_ULT (dev) ||IS_BDW_ULT (dev))
@@ -15614,7 +15614,8 @@ staticu32 intel_fb_pitch_limit (struct drm_device *dev,uint64_t fb_modifier,uint32_t pixel_format) { -u32 gen =INTEL_INFO (dev)->gen; +struct drm_i915_private *dev_priv =to_i915 (dev); +u32 gen =INTEL_GEN (dev_priv);if (gen >=9 ) {int cpp =drm_format_plane_cpp (pixel_format,0 );
@@ -15677,7 +15678,7 @@ static int intel_framebuffer_init(struct drm_device *dev,switch (mode_cmd->modifier[0 ]) {case I915_FORMAT_MOD_Y_TILED :case I915_FORMAT_MOD_Yf_TILED: -if (INTEL_INFO (dev)->gen <9 ) { +if (INTEL_GEN (dev_priv) <9 ) {DRM_DEBUG ("Unsupported tiling 0x%llx!\n" , mode_cmd->modifier[0 ]);return -EINVAL ;
@@ -15740,7 +15741,7 @@ static int intel_framebuffer_init(struct drm_device *dev,case DRM_FORMAT_ARGB8888 :break ;case DRM_FORMAT_XRGB1555 : -if (INTEL_INFO (dev)->gen >3 ) { +if (INTEL_GEN (dev_priv) >3 ) { format_name =drm_get_format_name (mode_cmd->pixel_format);DRM_DEBUG ("unsupported pixel format: %s\n" , format_name);kfree (format_name);
@@ -15748,8 +15749,8 @@ static int intel_framebuffer_init(struct drm_device *dev, }break ;case DRM_FORMAT_ABGR8888 : -if (!IS_VALLEYVIEW (dev) && !IS_CHERRYVIEW (dev) && -INTEL_INFO (dev)->gen <9 ) { +if (!IS_VALLEYVIEW (dev_priv) && !IS_CHERRYVIEW (dev_priv) && +INTEL_GEN (dev_priv) <9 ) { format_name =drm_get_format_name (mode_cmd->pixel_format);DRM_DEBUG ("unsupported pixel format: %s\n" , format_name);kfree (format_name);
@@ -15759,7 +15760,7 @@ static int intel_framebuffer_init(struct drm_device *dev,case DRM_FORMAT_XBGR8888 :case DRM_FORMAT_XRGB2101010 :case DRM_FORMAT_XBGR2101010 : -if (INTEL_INFO (dev)->gen <4 ) { +if (INTEL_GEN (dev_priv) <4 ) { format_name =drm_get_format_name (mode_cmd->pixel_format);DRM_DEBUG ("unsupported pixel format: %s\n" , format_name);kfree (format_name);
@@ -15778,7 +15779,7 @@ static int intel_framebuffer_init(struct drm_device *dev,case DRM_FORMAT_UYVY :case DRM_FORMAT_YVYU :case DRM_FORMAT_VYUY : -if (INTEL_INFO (dev)->gen <5 ) { +if (INTEL_GEN (dev_priv) <5 ) { format_name =drm_get_format_name (mode_cmd->pixel_format);DRM_DEBUG ("unsupported pixel format: %s\n" , format_name);kfree (format_name);
@@ -16560,7 +16561,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)/* We need to sanitize the plane -> pipe mapping first because this will * disable the crtc (and hence change the state) if it is wrong. Note * that gen4+ has a fixed plane -> pipe mapping. */ -if (INTEL_INFO (dev)->gen <4 && !intel_check_plane_mapping (crtc)) { +if (INTEL_GEN (dev_priv) <4 && !intel_check_plane_mapping (crtc)) {bool plane; DRM_DEBUG_KMS("[CRTC:%d:%s] wrong plane connection detected!\n",
@@ -17075,7 +17076,8 @@ void intel_connector_attach_encoder(struct intel_connector *connector,int intel_modeset_vga_set_state (struct drm_device *dev,bool state) {struct drm_i915_private *dev_priv =to_i915 (dev); -unsigned reg =INTEL_INFO (dev)->gen >=6 ?SNB_GMCH_CTRL :INTEL_GMCH_CTRL ; +unsigned reg =INTEL_GEN (dev_priv) >=6 ?SNB_GMCH_CTRL : +INTEL_GMCH_CTRL ;u16 gmch_ctrl;if (pci_read_config_word (dev_priv->bridge_dev, reg, &gmch_ctrl)) {
@@ -17250,13 +17252,13 @@ intel_display_print_error_state(struct drm_i915_error_state_buf *m,err_printf (m,"Plane [%d]:\n" , i);err_printf (m," CNTR: %08x\n" , error->plane[i].control);err_printf (m," STRIDE: %08x\n" , error->plane[i].stride); -if (INTEL_INFO (dev)->gen <=3 ) { +if (INTEL_GEN (dev_priv) <=3 ) {err_printf (m," SIZE: %08x\n" , error->plane[i].size);err_printf (m," POS: %08x\n" , error->plane[i].pos); } -if (INTEL_INFO (dev)->gen <=7 && !IS_HASWELL (dev)) +if (INTEL_GEN (dev_priv) <=7 && !IS_HASWELL (dev_priv))err_printf (m," ADDR: %08x\n" , error->plane[i].addr); -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {err_printf (m," SURF: %08x\n" , error->plane[i].surface);err_printf (m," TILEOFF: %08x\n" , error->plane[i].tile_offset); }
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/12 drm/i915: INTEL_GEN() fixes, part 4
In reply to David WeinehallConvert all instances of INTEL_INFO(dev)->gen in intel_pm.c to INTEL_GEN(dev_priv).
--- drivers/gpu/drm/i915/intel_pm.c | 67 ++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 27 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +40 -27
@@ -1852,23 +1852,27 @@ static uint32_t ilk_compute_fbc_wm(const struct intel_crtc_state *cstate,return ilk_wm_fbc (pri_val,drm_rect_width (&pstate->base.dst), cpp); } -static unsigned int ilk_display_fifo_size (const struct drm_device *dev) +static unsigned int +ilk_display_fifo_size (const struct drm_i915_private *dev_priv) { -if (INTEL_INFO (dev)->gen >=8 ) +if (INTEL_GEN (dev_priv) >=8 )return 3072 ; -else if (INTEL_INFO (dev)->gen >=7 ) +else if (INTEL_GEN (dev_priv) >=7 )return 768 ;else return 512 ; } -static unsigned int ilk_plane_wm_reg_max (const struct drm_device *dev, -int level,bool is_sprite) +static unsigned int +ilk_plane_wm_reg_max (const struct drm_device *dev, +int level,bool is_sprite) { -if (INTEL_INFO (dev)->gen >=8 ) +struct drm_i915_private *dev_priv =to_i915 (dev); + +if (INTEL_GEN (dev_priv) >=8 )/* BDW primary/sprite plane watermarks */ return level ==0 ?255 :2047 ; -else if (INTEL_INFO (dev)->gen >=7 ) +else if (INTEL_GEN (dev_priv) >=7 )/* IVB/HSW primary/sprite plane watermarks */ return level ==0 ?127 :1023 ;else if (!is_sprite)
@@ -1879,18 +1883,23 @@ static unsigned int ilk_plane_wm_reg_max(const struct drm_device *dev,return level ==0 ?63 :255 ; } -static unsigned int ilk_cursor_wm_reg_max (const struct drm_device *dev, -int level) +static unsigned int +ilk_cursor_wm_reg_max (const struct drm_device *dev,int level) { -if (INTEL_INFO (dev)->gen >=7 ) +struct drm_i915_private *dev_priv =to_i915 (dev); + +if (INTEL_GEN (dev_priv) >=7 )return level ==0 ?63 :255 ;else return level ==0 ?31 :63 ; } -static unsigned int ilk_fbc_wm_reg_max (const struct drm_device *dev) +static unsigned int +ilk_fbc_wm_reg_max (const struct drm_device *dev) { -if (INTEL_INFO (dev)->gen >=8 ) +struct drm_i915_private *dev_priv =to_i915 (dev); + +if (INTEL_GEN (dev_priv) >=8 )return 31 ;else return 15 ;
@@ -1903,7 +1912,8 @@ static unsigned int ilk_plane_wm_max(const struct drm_device *dev, enum intel_ddb_partitioning ddb_partitioning, bool is_sprite) { -unsigned int fifo_size =ilk_display_fifo_size (dev); +struct drm_i915_private *dev_priv =to_i915 (dev); +unsigned int fifo_size =ilk_display_fifo_size (dev_priv);/* if sprites aren't enabled, sprites get nothing */ if (is_sprite && !config->sprites_enabled)
@@ -1918,7 +1928,7 @@ static unsigned int ilk_plane_wm_max(const struct drm_device *dev,* FIFO size is only half of the self * refresh FIFO size on ILK/SNB. */ -if (INTEL_INFO (dev)->gen <=6 ) +if (INTEL_GEN (dev_priv) <=6 ) fifo_size /=2 ; }
@@ -2163,14 +2173,14 @@ static void intel_read_wm_latency(struct drm_device *dev, uint16_t wm[8]) wm[2 ] = (sskpd >>12 ) &0xFF ; wm[3 ] = (sskpd >>20 ) &0x1FF ; wm[4 ] = (sskpd >>32 ) &0x1FF ; - }else if (INTEL_INFO (dev)->gen >=6 ) { + }else if (INTEL_GEN (dev_priv) >=6 ) {uint32_t sskpd =I915_READ (MCH_SSKPD ); wm[0 ] = (sskpd >>SSKPD_WM0_SHIFT ) &SSKPD_WM_MASK ; wm[1 ] = (sskpd >>SSKPD_WM1_SHIFT ) &SSKPD_WM_MASK ; wm[2 ] = (sskpd >>SSKPD_WM2_SHIFT ) &SSKPD_WM_MASK ; wm[3 ] = (sskpd >>SSKPD_WM3_SHIFT ) &SSKPD_WM_MASK ; - }else if (INTEL_INFO (dev)->gen >=5 ) { + }else if (INTEL_GEN (dev_priv) >=5 ) {uint32_t mltr =I915_READ (MLTR_ILK );/* ILK primary LP0 latency is 700 ns */
@@ -2200,12 +2210,14 @@ static void intel_fixup_cur_wm_latency(struct drm_device *dev, uint16_t wm[5])int ilk_wm_max_level (const struct drm_device *dev) { +struct drm_i915_private *dev_priv =to_i915 (dev); +/* how many WM levels are we expecting */ -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )return 7 ;else if (IS_HASWELL (dev) ||IS_BROADWELL (dev))return 4 ; -else if (INTEL_INFO (dev)->gen >=6 ) +else if (INTEL_GEN (dev_priv) >=6 )return 3 ;else return 2 ;
@@ -2375,7 +2387,7 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate) usable_level = max_level;/* ILK/SNB: LP2+ watermarks only w/o sprites */ -if (INTEL_INFO (dev)->gen <=6 && pipe_wm->sprites_enabled) +if (INTEL_GEN (dev_priv) <=6 && pipe_wm->sprites_enabled) usable_level =1 ;/* ILK/SNB/IVB: LP1+ watermarks only w/o scaling */
@@ -2518,12 +2530,12 @@ static void ilk_wm_merge(struct drm_device *dev,int last_enabled_level = max_level;/* ILK/SNB/IVB: LP1+ watermarks only w/ single pipe */ -if ((INTEL_INFO (dev)->gen <=6 ||IS_IVYBRIDGE (dev)) && +if ((INTEL_GEN (dev_priv) <=6 ||IS_IVYBRIDGE (dev_priv)) && config->num_pipes_active >1 ) last_enabled_level =0 ;/* ILK: FBC WM must be disabled always */ - merged->fbc_wm_enabled =INTEL_INFO (dev)->gen >=6 ; + merged->fbc_wm_enabled =INTEL_GEN (dev_priv) >=6 ;/* merge each WM1+ level */ for (level =1 ; level <= max_level; level++) {
@@ -2586,6 +2598,7 @@ static void ilk_compute_wm_results(struct drm_device *dev,enum intel_ddb_partitioning partitioning, struct ilk_wm_values *results) { + struct drm_i915_private *dev_priv = to_i915(dev);struct intel_crtc *intel_crtc;int level, wm_lp;
@@ -2612,7 +2625,7 @@ static void ilk_compute_wm_results(struct drm_device *dev,if (r->enable) results->wm_lp[wm_lp -1 ] |=WM1_LP_SR_EN ; -if (INTEL_INFO (dev)->gen >=8 ) +if (INTEL_GEN (dev_priv) >=8 ) results->wm_lp[wm_lp -1 ] |= r->fbc_val <<WM1_LP_FBC_SHIFT_BDW ;else
@@ -2623,7 +2636,7 @@ static void ilk_compute_wm_results(struct drm_device *dev,* Always set WM1S_LP_EN when spr_val != 0, even if the * level is disabled. Doing otherwise could cause underruns. */ -if (INTEL_INFO (dev)->gen <=6 && r->spr_val) { +if (INTEL_GEN (dev_priv) <=6 && r->spr_val) {WARN_ON (wm_lp !=1 ); results->wm_lp_spr[wm_lp -1 ] =WM1S_LP_EN | r->spr_val; }else
@@ -2829,7 +2842,7 @@ static void ilk_write_wm_values(struct drm_i915_private *dev_priv, previous->wm_lp_spr[0] != results->wm_lp_spr[0])I915_WRITE (WM1S_LP_ILK , results->wm_lp_spr[0 ]); -if (INTEL_INFO (dev)->gen >=7 ) { +if (INTEL_GEN (dev_priv) >=7 ) {if (dirty &WM_DIRTY_LP (2 ) && previous->wm_lp_spr[1 ] != results->wm_lp_spr[1 ])I915_WRITE (WM2S_LP_IVB , results->wm_lp_spr[1 ]);if (dirty &WM_DIRTY_LP (3 ) && previous->wm_lp_spr[2 ] != results->wm_lp_spr[2 ])
@@ -4175,7 +4188,7 @@ static void ilk_program_watermarks(struct drm_i915_private *dev_priv)ilk_wm_merge (dev, &config, &max, &lp_wm_1_2);/* 5/6 split only in single pipe config on IVB+ */ -if (INTEL_INFO (dev)->gen >=7 && +if (INTEL_GEN (dev_priv) >=7 && config.num_pipes_active ==1 && config.sprites_enabled) {ilk_compute_wm_maximums (dev,1 , &config,INTEL_DDB_PART_5_6 , &max);ilk_wm_merge (dev, &config, &max, &lp_wm_5_6);
@@ -4554,7 +4567,7 @@ void ilk_wm_get_hw_state(struct drm_device *dev) hw->wm_lp[2 ] =I915_READ (WM3_LP_ILK ); hw->wm_lp_spr[0 ] =I915_READ (WM1S_LP_ILK ); -if (INTEL_INFO (dev)->gen >=7 ) { +if (INTEL_GEN (dev_priv) >=7 ) { hw->wm_lp_spr[1 ] =I915_READ (WM2S_LP_IVB ); hw->wm_lp_spr[2 ] =I915_READ (WM3S_LP_IVB ); }
@@ -7678,7 +7691,7 @@ void intel_init_pm(struct drm_device *dev)i915_ironlake_get_mem_freq (dev);/* For FIFO watermark updates */ -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {skl_setup_wm_latency (dev); dev_priv->display.update_wm = skl_update_wm; dev_priv->display.compute_global_watermarks = skl_compute_wm;
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/12 drm/i915: INTEL_GEN() fixes, part 5
In reply to David WeinehallConvert all remaining instances of INTEL_INFO(dev)->gen in *.c to INTEL_GEN(dev_priv).
--- drivers/gpu/drm/i915/i915_drv.c | 19 +++++++------- drivers/gpu/drm/i915/i915_gem.c | 4 +-- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 ++- drivers/gpu/drm/i915/i915_gem_fence.c | 4 +-- drivers/gpu/drm/i915/i915_gem_gtt.c | 16 +++++++----- drivers/gpu/drm/i915/i915_gem_stolen.c | 7 ++--- drivers/gpu/drm/i915/i915_gem_tiling.c | 7 ++--- drivers/gpu/drm/i915/i915_gpu_error.c | 14 +++++----- drivers/gpu/drm/i915/i915_irq.c | 26 +++++++++--------- drivers/gpu/drm/i915/i915_suspend.c | 18 ++++++------- drivers/gpu/drm/i915/intel_color.c | 5 ++-- drivers/gpu/drm/i915/intel_crt.c | 9 +++---- drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++------- drivers/gpu/drm/i915/intel_display.c | 6 ++--- drivers/gpu/drm/i915/intel_dp.c | 42 ++++++++++++++---------------- drivers/gpu/drm/i915/intel_dpll_mgr.c | 5 ++-- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 10 +++---- drivers/gpu/drm/i915/intel_panel.c | 10 +++---- drivers/gpu/drm/i915/intel_psr.c | 4 +-- drivers/gpu/drm/i915/intel_sdvo.c | 8 +++--- drivers/gpu/drm/i915/intel_sprite.c | 14 +++++----- drivers/gpu/drm/i915/intel_tv.c | 2 +- 23 files changed, 124 insertions(+), 131 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +9 -10
@@ -283,7 +283,7 @@ static int i915_getparam(struct drm_device *dev, void *data, value =1 ;break ;case I915_PARAM_HAS_EXEC_CONSTANTS : - value =INTEL_INFO (dev)->gen >=4 ; + value =INTEL_GEN (dev_priv) >=4 ;break ;case I915_PARAM_HAS_RELAXED_DELTA : value =1 ;
@@ -387,15 +387,14 @@ static int i915_get_bridge_dev(struct drm_device *dev)/* Allocate space for the MCH regs if needed, return nonzero on error */ static int -intel_alloc_mchbar_resource (struct drm_device *dev) +intel_alloc_mchbar_resource (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev); -int reg =INTEL_INFO (dev)->gen >=4 ?MCHBAR_I965 :MCHBAR_I915 ; +int reg =INTEL_GEN (dev_priv) >=4 ?MCHBAR_I965 :MCHBAR_I915 ;u32 temp_lo, temp_hi =0 ;u64 mchbar_addr;int ret; -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 )pci_read_config_dword (dev_priv->bridge_dev, reg +4 , &temp_hi);pci_read_config_dword (dev_priv->bridge_dev, reg, &temp_lo); mchbar_addr = ((u64 )temp_hi <<32 ) | temp_lo;
@@ -422,7 +421,7 @@ intel_alloc_mchbar_resource(struct drm_device *dev)return ret; } -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 )pci_write_config_dword (dev_priv->bridge_dev, reg +4 ,upper_32_bits (dev_priv->mch_res.start));
@@ -436,7 +435,7 @@ static void intel_setup_mchbar(struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -int mchbar_reg =INTEL_INFO (dev)->gen >=4 ?MCHBAR_I965 :MCHBAR_I915 ; +int mchbar_reg =INTEL_GEN (dev_priv) >=4 ?MCHBAR_I965 :MCHBAR_I915 ;u32 temp;bool enabled;
@@ -457,7 +456,7 @@ intel_setup_mchbar(struct drm_device *dev)if (enabled)return ; -if (intel_alloc_mchbar_resource (dev)) +if (intel_alloc_mchbar_resource (dev_priv))return ; dev_priv->mchbar_need_disable = true;
@@ -476,7 +475,7 @@ static void intel_teardown_mchbar(struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -int mchbar_reg =INTEL_INFO (dev)->gen >=4 ?MCHBAR_I965 :MCHBAR_I915 ; +int mchbar_reg =INTEL_GEN (dev_priv) >=4 ?MCHBAR_I965 :MCHBAR_I915 ;if (dev_priv->mchbar_need_disable) {if (IS_I915G (dev) ||IS_I915GM (dev)) {
@@ -903,7 +902,7 @@ static int i915_mmio_setup(struct drm_device *dev)* the register BAR remains the same size for all the earlier * generations up to Ironlake. */ -if (INTEL_INFO (dev)->gen <5 ) +if (INTEL_GEN (dev_priv) <5 ) mmio_size =512 *1024 ;else mmio_size =2 *1024 *1024 ;
drivers/gpu/drm/i915/i915_gem.c +2 -2
@@ -4343,7 +4343,7 @@ void i915_gem_init_swizzling(struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -if (INTEL_INFO (dev)->gen <5 || +if (INTEL_GEN (dev_priv) <5 || dev_priv->mm.bit_6_swizzle_x ==I915_BIT_6_SWIZZLE_NONE )return ;
@@ -4413,7 +4413,7 @@ i915_gem_init_hw(struct drm_device *dev)u32 temp =I915_READ (GEN7_MSG_CTL ); temp &= ~(WAIT_FOR_PCH_FLR_ACK |WAIT_FOR_PCH_RESET_ACK );I915_WRITE (GEN7_MSG_CTL , temp); - }else if (INTEL_INFO (dev)->gen >=7 ) { + }else if (INTEL_GEN (dev_priv) >=7 ) {u32 temp =I915_READ (HSW_NDE_RSTWRN_OPT ); temp &= ~RESET_PCH_HANDSHAKE_ENABLE ;I915_WRITE (HSW_NDE_RSTWRN_OPT , temp);
drivers/gpu/drm/i915/i915_gem_execbuffer.c +2 -1
@@ -1867,6 +1867,7 @@ int i915_gem_execbuffer(struct drm_device *dev, void *data, struct drm_file *file) { + struct drm_i915_private *dev_priv = to_i915(dev);struct drm_i915_gem_execbuffer *args = data;struct drm_i915_gem_execbuffer2 exec2;struct drm_i915_gem_exec_object *exec_list =NULL ;
@@ -1905,7 +1906,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, exec2_list[i].relocs_ptr = exec_list[i].relocs_ptr; exec2_list[i].alignment = exec_list[i].alignment; exec2_list[i].offset = exec_list[i].offset; -if (INTEL_INFO (dev)->gen <4 ) +if (INTEL_GEN (dev_priv) <4 ) exec2_list[i].flags =EXEC_OBJECT_NEEDS_FENCE ;else exec2_list[i].flags =0 ;
drivers/gpu/drm/i915/i915_gem_fence.c +2 -2
@@ -448,7 +448,7 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)uint32_t swizzle_x =I915_BIT_6_SWIZZLE_UNKNOWN ;uint32_t swizzle_y =I915_BIT_6_SWIZZLE_UNKNOWN ; -if (INTEL_INFO (dev)->gen >=8 ||IS_VALLEYVIEW (dev)) { +if (INTEL_GEN (dev_priv) >=8 ||IS_VALLEYVIEW (dev_priv)) {/* * On BDW+, swizzling is not used. We leave the CPU memory * controller in charge of optimizing memory accesses without
@@ -458,7 +458,7 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)*/ swizzle_x =I915_BIT_6_SWIZZLE_NONE ; swizzle_y =I915_BIT_6_SWIZZLE_NONE ; - }else if (INTEL_INFO (dev)->gen >=6 ) { + }else if (INTEL_GEN (dev_priv) >=6 ) {if (dev_priv->preserve_bios_swizzle) {if (I915_READ (DISP_ARB_CTL ) &DISP_TILE_SURFACE_SWIZZLING ) {
drivers/gpu/drm/i915/i915_gem_gtt.c +9 -7
@@ -427,9 +427,9 @@ static void cleanup_scratch_page(struct drm_device *dev,static struct i915_page_table *alloc_pt (struct drm_device *dev) { +struct drm_i915_private *dev_priv =to_i915 (dev);struct i915_page_table *pt; -const size_t count =INTEL_INFO (dev)->gen >=8 ? -GEN8_PTES :GEN6_PTES ; +const size_t count =INTEL_GEN (dev_priv) >=8 ?GEN8_PTES :GEN6_PTES ;int ret = -ENOMEM ; pt =kzalloc (sizeof (*pt),GFP_KERNEL );
@@ -2154,6 +2154,8 @@ static int i915_ppgtt_init(struct i915_hw_ppgtt *ppgtt,int i915_ppgtt_init_hw (struct drm_device *dev) { +struct drm_i915_private *dev_priv =to_i915 (dev); +gtt_write_workarounds (dev);/* In the case of execlists, PPGTT is enabled by the context descriptor
@@ -2169,10 +2171,10 @@ int i915_ppgtt_init_hw(struct drm_device *dev)gen6_ppgtt_enable (dev); else if (IS_GEN7(dev)) gen7_ppgtt_enable(dev); - else if (INTEL_INFO(dev)->gen >= 8) + else if (INTEL_GEN(dev_priv) >= 8) gen8_ppgtt_enable(dev); else - MISSING_CASE(INTEL_INFO(dev)->gen); +MISSING_CASE (INTEL_GEN (dev_priv ));return 0 ; }
@@ -2278,7 +2280,7 @@ void i915_gem_suspend_gtt_mappings(struct drm_device *dev)/* Don't bother messing with faults pre GEN6 as we have little * documentation supporting that it's a good idea. */ -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return ;i915_check_and_clear_faults (dev_priv);
@@ -3257,8 +3259,8 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)WARN_ON (i915_gem_object_set_to_gtt_domain (obj, false)); } -if (INTEL_INFO (dev)->gen >=8 ) { -if (IS_CHERRYVIEW (dev) ||IS_BROXTON (dev)) +if (INTEL_GEN (dev_priv) >=8 ) { +if (IS_CHERRYVIEW (dev_priv) ||IS_BROXTON (dev_priv))chv_setup_private_ppat (dev_priv);else bdw_setup_private_ppat (dev_priv);
drivers/gpu/drm/i915/i915_gem_stolen.c +4 -3
@@ -109,7 +109,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)* */ base =0 ; -if (INTEL_INFO (dev)->gen >=3 ) { +if (INTEL_GEN (dev_priv) >=3 ) {u32 bsm;pci_read_config_dword (pdev,INTEL_BSM , &bsm);
@@ -204,7 +204,8 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)return 0 ;/* make sure we don't clobber the GTT if it's within stolen memory */ -if (INTEL_INFO (dev)->gen <=4 && !IS_G33 (dev) && !IS_G4X (dev)) { +if (INTEL_GEN (dev_priv) <=4 && + !IS_G33 (dev_priv) && !IS_G4X (dev_priv)) {struct {u32 start, end; } stolen[2 ] = {
@@ -417,7 +418,7 @@ int i915_gem_init_stolen(struct drm_device *dev)mutex_init (&dev_priv->mm.stolen_lock);#ifdef CONFIG_INTEL_IOMMU -if (intel_iommu_gfx_mapped &&INTEL_INFO (dev)->gen <8 ) { +if (intel_iommu_gfx_mapped &&INTEL_GEN (dev_priv) <8 ) {DRM_INFO ("DMAR active, disabling use of stolen memory\n" );return 0 ; }
drivers/gpu/drm/i915/i915_gem_tiling.c +4 -3
@@ -62,6 +62,7 @@static bool i915_tiling_ok (struct drm_device *dev,int stride,int size,int tiling_mode) { +struct drm_i915_private *dev_priv =to_i915 (dev);int tile_width;/* Linear is always fine */
@@ -80,10 +81,10 @@ i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode)/* check maximum stride & object size */ /* i965+ stores the end address of the gtt mapping in the fence * reg, so dont bother to check the size */ -if (INTEL_INFO (dev)->gen >=7 ) { +if (INTEL_GEN (dev_priv) >=7 ) {if (stride /128 >GEN7_FENCE_MAX_PITCH_VAL )return false; - }else if (INTEL_INFO (dev)->gen >=4 ) { + }else if (INTEL_GEN (dev_priv) >=4 ) {if (stride /128 >I965_FENCE_MAX_PITCH_VAL )return false; }else {
@@ -103,7 +104,7 @@ i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode)return false;/* 965+ just needs multiples of tile width */ -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {if (stride & (tile_width -1 ))return false;return true;
drivers/gpu/drm/i915/i915_gpu_error.c +7 -7
@@ -387,7 +387,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev_priv) >=8 ) {for (i =0 ; i <4 ; i++)err_printf (m,"GTIER gt %d: 0x%08x\n" , i, error->gtier[i]);
@@ -406,10 +406,10 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m," INSTDONE_%d: 0x%08x\n" , i, error->extra_instdone[i]); -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_GEN (dev_priv) >=6 ) {err_printf (m,"ERROR: 0x%08x\n" , error->error); -if (INTEL_INFO (dev)->gen >=8 ) +if (INTEL_GEN (dev_priv) >=8 )err_printf (m,"FAULT_TLB_DATA: 0x%08x 0x%08x\n" , error->fault_data1, error->fault_data0);
@@ -1312,7 +1312,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (IS_GEN7 (dev)) error->err_int =I915_READ (GEN7_ERR_INT ); -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev_priv) >=8 ) { error->fault_data0 =I915_READ (GEN8_FAULT_TLB_DATA0 ); error->fault_data1 =I915_READ (GEN8_FAULT_TLB_DATA1 ); }
@@ -1324,10 +1324,10 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, }/* 2: Registers which belong to multiple generations */ -if (INTEL_INFO (dev)->gen >=7 ) +if (INTEL_GEN (dev_priv) >=7 ) error->forcewake =I915_READ_FW (FORCEWAKE_MT ); -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_GEN (dev_priv) >=6 ) { error->derrmr =I915_READ (DERRMR ); error->error =I915_READ (ERROR_GEN6 ); error->done_reg =I915_READ (DONE_REG );
@@ -1343,7 +1343,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev_priv) >=8 ) { error->ier =I915_READ (GEN8_DE_MISC_IER );for (i =0 ; i <4 ; i++) error->gtier[i] =I915_READ (GEN8_GT_IER (i));
drivers/gpu/drm/i915/i915_irq.c +12 -14
@@ -2698,7 +2698,7 @@ static int i915_enable_vblank(struct drm_device *dev, unsigned int pipe)unsigned long irqflags;spin_lock_irqsave (&dev_priv->irq_lock, irqflags); -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 )i915_enable_pipestat (dev_priv, pipe,PIPE_START_VBLANK_INTERRUPT_STATUS );else
@@ -2713,8 +2713,8 @@ static int ironlake_enable_vblank(struct drm_device *dev, unsigned int pipe) {struct drm_i915_private *dev_priv =to_i915 (dev);unsigned long irqflags; -uint32_t bit = (INTEL_INFO (dev)->gen >=7 ) ?DE_PIPE_VBLANK_IVB (pipe) : -DE_PIPE_VBLANK (pipe); +uint32_t bit = (INTEL_GEN (dev_priv) >=7 ) ?DE_PIPE_VBLANK_IVB (pipe) : +DE_PIPE_VBLANK (pipe);spin_lock_irqsave (&dev_priv->irq_lock, irqflags);ilk_enable_display_irq (dev_priv, bit);
@@ -2767,8 +2767,8 @@ static void ironlake_disable_vblank(struct drm_device *dev, unsigned int pipe) {struct drm_i915_private *dev_priv =to_i915 (dev);unsigned long irqflags; -uint32_t bit = (INTEL_INFO (dev)->gen >=7 ) ?DE_PIPE_VBLANK_IVB (pipe) : -DE_PIPE_VBLANK (pipe); +uint32_t bit = (INTEL_GEN (dev_priv) >=7 ) ?DE_PIPE_VBLANK_IVB (pipe) : +DE_PIPE_VBLANK (pipe);spin_lock_irqsave (&dev_priv->irq_lock, irqflags);ilk_disable_display_irq (dev_priv, bit);
@@ -3225,12 +3225,10 @@ static void ibx_irq_pre_postinstall(struct drm_device *dev)POSTING_READ (SDEIER ); } -static void gen5_gt_irq_reset (struct drm_device *dev) +static void gen5_gt_irq_reset (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev); -GEN5_IRQ_RESET (GT ); -if (INTEL_INFO (dev)->gen >=6 ) +if (INTEL_GEN (dev_priv) >=6 )GEN5_IRQ_RESET (GEN6_PM ); }
@@ -3295,7 +3293,7 @@ static void ironlake_irq_reset(struct drm_device *dev)if (IS_GEN7 (dev))I915_WRITE (GEN7_ERR_INT ,0xffffffff ); -gen5_gt_irq_reset (dev); +gen5_gt_irq_reset (dev_priv);ibx_irq_reset (dev); }
@@ -3307,7 +3305,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev)I915_WRITE (VLV_MASTER_IER ,0 );POSTING_READ (VLV_MASTER_IER ); -gen5_gt_irq_reset (dev); +gen5_gt_irq_reset (dev_priv);spin_lock_irq (&dev_priv->irq_lock);if (dev_priv->display_irqs_enabled)
@@ -3566,7 +3564,7 @@ static void gen5_gt_irq_postinstall(struct drm_device *dev)GEN5_IRQ_INIT (GT , dev_priv->gt_irq_mask, gt_irqs); -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_GEN (dev_priv) >=6 ) {/* * RPS interrupts will get enabled/disabled on demand when RPS * itself is enabled/disabled.
@@ -3584,7 +3582,7 @@ static int ironlake_irq_postinstall(struct drm_device *dev)struct drm_i915_private *dev_priv =to_i915 (dev);u32 display_mask, extra_mask; -if (INTEL_INFO (dev)->gen >=7 ) { +if (INTEL_GEN (dev_priv) >=7 ) { display_mask = (DE_MASTER_IRQ_CONTROL | DE_GSE_IVB | DE_PCH_EVENT_IVB | DE_PLANEC_FLIP_DONE_IVB | DE_PLANEB_FLIP_DONE_IVB |
@@ -3807,7 +3805,7 @@ static void valleyview_irq_uninstall(struct drm_device *dev)I915_WRITE (VLV_MASTER_IER ,0 );POSTING_READ (VLV_MASTER_IER ); -gen5_gt_irq_reset (dev); +gen5_gt_irq_reset (dev_priv);I915_WRITE (HWSTAM ,0xffffffff );
drivers/gpu/drm/i915/i915_suspend.c +8 -10
@@ -29,16 +29,14 @@#include "intel_drv.h" #include "i915_reg.h" -static void i915_save_display (struct drm_device *dev) +static void i915_save_display (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev); -/* Display arbitration control */ -if (INTEL_INFO (dev)->gen <=4 ) +if (INTEL_GEN (dev_priv) <=4 ) dev_priv->regfile.saveDSPARB =I915_READ (DSPARB );/* save FBC interval */ -if (HAS_FBC (dev) &&INTEL_INFO (dev)->gen <=4 && !IS_G4X (dev)) +if (HAS_FBC (dev_priv) &&INTEL_GEN (dev_priv) <=4 && !IS_G4X (dev_priv)) dev_priv->regfile.saveFBC_CONTROL =I915_READ (FBC_CONTROL ); }
@@ -47,14 +45,14 @@ static void i915_restore_display(struct drm_device *dev)struct drm_i915_private *dev_priv =to_i915 (dev);/* Display arbitration */ -if (INTEL_INFO (dev)->gen <=4 ) +if (INTEL_GEN (dev_priv) <=4 )I915_WRITE (DSPARB , dev_priv->regfile.saveDSPARB);/* only restore FBC info on the platform that supports FBC*/ intel_fbc_global_disable (dev_priv);/* restore FBC interval */ -if (HAS_FBC (dev) &&INTEL_INFO (dev)->gen <=4 && !IS_G4X (dev)) +if (HAS_FBC (dev_priv) &&INTEL_GEN (dev_priv) <=4 && !IS_G4X (dev_priv))I915_WRITE (FBC_CONTROL , dev_priv->regfile.saveFBC_CONTROL);i915_redisable_vga (dev);
@@ -68,14 +66,14 @@ int i915_save_state(struct drm_device *dev)mutex_lock (&dev->struct_mutex); -i915_save_display (dev); +i915_save_display (dev_priv);if (IS_GEN4 (dev))pci_read_config_word (pdev,GCDGMBUS , &dev_priv->regfile.saveGCDGMBUS);/* Cache mode state */ -if (INTEL_INFO (dev)->gen <7 ) +if (INTEL_GEN (dev_priv) <7 ) dev_priv->regfile.saveCACHE_MODE_0 =I915_READ (CACHE_MODE_0 );/* Memory Arbitration state */
@@ -122,7 +120,7 @@ int i915_restore_state(struct drm_device *dev)i915_restore_display (dev);/* Cache mode state */ -if (INTEL_INFO (dev)->gen <7 ) +if (INTEL_GEN (dev_priv) <7 )I915_WRITE (CACHE_MODE_0 , dev_priv->regfile.saveCACHE_MODE_0 |0xffff0000 );
drivers/gpu/drm/i915/intel_color.c +2 -3
@@ -95,8 +95,7 @@ static void ctm_mult_by_limited(uint64_t *result, int64_t *input)static void i9xx_load_csc_matrix (struct drm_crtc_state *crtc_state) {struct drm_crtc *crtc = crtc_state->crtc; -struct drm_device *dev = crtc->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (crtc->dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);int i, pipe = intel_crtc->pipe;uint16_t coeffs[9 ] = {0 , };
@@ -180,7 +179,7 @@ static void i9xx_load_csc_matrix(struct drm_crtc_state *crtc_state)I915_WRITE (PIPE_CSC_PREOFF_ME (pipe),0 );I915_WRITE (PIPE_CSC_PREOFF_LO (pipe),0 ); -if (INTEL_INFO (dev)->gen >6 ) { +if (INTEL_GEN (dev_priv) >6 ) {uint16_t postoff =0 ;if (intel_crtc_state->limited_color_range)
drivers/gpu/drm/i915/intel_crt.c +4 -5
@@ -154,7 +154,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder,const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode;u32 adpa; -if (INTEL_INFO (dev)->gen >=5 ) +if (INTEL_GEN (dev_priv) >=5 ) adpa =ADPA_HOTPLUG_BITS ;else adpa =0 ;
@@ -700,7 +700,7 @@ intel_crt_detect(struct drm_connector *connector, bool force)if (intel_get_load_detect_pipe (connector,NULL , &tmp, &ctx)) {if (intel_crt_detect_ddc (connector)) status = connector_status_connected; -else if (INTEL_INFO (dev)->gen <4 ) +else if (INTEL_GEN (dev_priv) <4 ) status =intel_crt_load_detect (crt,to_intel_crtc (connector->state->crtc)->pipe);else if (i915.load_detect_test)
@@ -762,11 +762,10 @@ static int intel_crt_set_property(struct drm_connector *connector,void intel_crt_reset (struct drm_encoder *encoder) { -struct drm_device *dev = encoder->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct intel_crt *crt =intel_encoder_to_crt (to_intel_encoder (encoder)); -if (INTEL_INFO (dev)->gen >=5 ) { +if (INTEL_GEN (dev_priv) >=5 ) {u32 adpa; adpa =I915_READ (crt->adpa_reg);
drivers/gpu/drm/i915/intel_ddi.c +9 -11
@@ -998,13 +998,13 @@ static void bxt_ddi_clock_get(struct intel_encoder *encoder,void intel_ddi_clock_get (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config) { -struct drm_device *dev = encoder->base.dev; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -if (INTEL_INFO (dev)->gen <=8 ) +if (INTEL_GEN (dev_priv) <=8 )hsw_ddi_clock_get (encoder, pipe_config); -else if (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev)) +else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv))skl_ddi_clock_get (encoder, pipe_config); -else if (IS_BROXTON (dev)) +else if (IS_BROXTON (dev_priv))bxt_ddi_clock_get (encoder, pipe_config); }
@@ -1670,8 +1670,7 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder, struct drm_connector_state *old_conn_state) {struct drm_encoder *encoder = &intel_encoder->base; -struct drm_device *dev = encoder->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->dev);enum port port =intel_ddi_get_encoder_port (intel_encoder);int type = intel_encoder->type;uint32_t val;
@@ -1701,10 +1700,10 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder,intel_edp_panel_off (intel_dp); } -if (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev)) +if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv))I915_WRITE (DPLL_CTRL2 , (I915_READ (DPLL_CTRL2 ) |DPLL_CTRL2_DDI_CLK_OFF (port))); -else if (INTEL_INFO (dev)->gen <9 ) +else if (INTEL_GEN (dev_priv) <9 )I915_WRITE (PORT_CLK_SEL (port),PORT_CLK_SEL_NONE );if (type ==INTEL_OUTPUT_HDMI ) {
@@ -1754,8 +1753,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder,struct drm_encoder *encoder = &intel_encoder->base;struct drm_crtc *crtc = encoder->crtc;struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct drm_device *dev = encoder->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->dev);enum port port =intel_ddi_get_encoder_port (intel_encoder);int type = intel_encoder->type;
@@ -1773,7 +1771,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder, }else if (type ==INTEL_OUTPUT_EDP ) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder); -if (port ==PORT_A &&INTEL_INFO (dev)->gen <9 ) +if (port ==PORT_A &&INTEL_GEN (dev_priv) <9 )intel_dp_stop_link_train (intel_dp);intel_edp_backlight_on (intel_dp);
drivers/gpu/drm/i915/intel_display.c +3 -3
@@ -15435,7 +15435,7 @@ static void intel_setup_outputs(struct drm_device *dev) }else if (HAS_PCH_SPLIT (dev)) {int found; - dpd_is_edp =intel_dp_is_edp (dev,PORT_D ); + dpd_is_edp =intel_dp_is_edp (dev_priv,PORT_D );if (has_edp_a (dev))intel_dp_init (dev,DP_A ,PORT_A );
@@ -15478,14 +15478,14 @@ static void intel_setup_outputs(struct drm_device *dev)* trust the port type the VBT declares as we've seen at least * HDMI ports that the VBT claim are DP or eDP. */ - has_edp =intel_dp_is_edp (dev,PORT_B ); + has_edp =intel_dp_is_edp (dev_priv,PORT_B ); has_port =intel_bios_is_port_present (dev_priv,PORT_B );if (I915_READ (VLV_DP_B ) &DP_DETECTED || has_port) has_edp &=intel_dp_init (dev,VLV_DP_B ,PORT_B );if ((I915_READ (VLV_HDMIB ) &SDVO_DETECTED || has_port) && !has_edp)intel_hdmi_init (dev,VLV_HDMIB ,PORT_B ); - has_edp =intel_dp_is_edp (dev,PORT_C ); + has_edp =intel_dp_is_edp (dev_priv,PORT_C ); has_port =intel_bios_is_port_present (dev_priv,PORT_C );if (I915_READ (VLV_DP_C ) &DP_DETECTED || has_port) has_edp &=intel_dp_init (dev,VLV_DP_C ,PORT_C );
drivers/gpu/drm/i915/intel_dp.c +20 -22
122 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dpll_mgr.c +2 -3
@@ -150,13 +150,12 @@ out:void intel_disable_shared_dpll (struct intel_crtc *crtc) { -struct drm_device *dev = crtc->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_shared_dpll *pll = crtc->config->shared_dpll;unsigned crtc_mask =1 <<drm_crtc_index (&crtc->base);/* PCH only available on ILK+ */ -if (INTEL_INFO (dev)->gen <5 ) +if (INTEL_GEN (dev_priv) <5 )return ;if (pll ==NULL )
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -1394,7 +1394,7 @@ int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc);bool intel_dp_compute_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config,struct drm_connector_state *conn_state); -bool intel_dp_is_edp (struct drm_device *dev,enum port port); +bool intel_dp_is_edp (struct drm_i915_private *dev_priv,enum port port);enum irqreturn intel_dp_hpd_pulse (struct intel_digital_port *intel_dig_port,bool long_hpd);void intel_edp_backlight_on (struct intel_dp *intel_dp);
drivers/gpu/drm/i915/intel_lvds.c +5 -5
@@ -122,8 +122,7 @@ out:static void intel_lvds_get_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config) { -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (&encoder->base);u32 tmp, flags =0 ;
@@ -139,12 +138,12 @@ static void intel_lvds_get_config(struct intel_encoder *encoder, pipe_config->base.adjusted_mode.flags |= flags; -if (INTEL_INFO (dev)->gen <5 ) +if (INTEL_GEN (dev_priv) <5 ) pipe_config->gmch_pfit.lvds_border_bits = tmp &LVDS_BORDER_ENABLE ;/* gen2/3 store dither state in pfit control, needs to match */ -if (INTEL_INFO (dev)->gen <4 ) { +if (INTEL_GEN (dev_priv) <4 ) { tmp =I915_READ (PFIT_CONTROL ); pipe_config->gmch_pfit.control |= tmp &PANEL_8TO6_DITHER_ENABLE ;
@@ -396,6 +395,7 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { + struct drm_i915_private *dev_priv = to_i915(intel_encoder->base.dev);struct drm_device *dev = intel_encoder->base.dev;struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (&intel_encoder->base);
@@ -406,7 +406,7 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder,unsigned int lvds_bpp;/* Should never happen!! */ -if (INTEL_INFO (dev)->gen <4 && intel_crtc->pipe ==0 ) { +if (INTEL_GEN (dev_priv) <4 && intel_crtc->pipe ==0 ) {DRM_ERROR ("Can't support LVDS on pipe A\n" );return false; }
drivers/gpu/drm/i915/intel_panel.c +5 -5
@@ -304,7 +304,7 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc, struct intel_crtc_state *pipe_config, int fitting_mode) { -struct drm_device *dev = intel_crtc->base.dev; +struct drm_i915_private *dev_priv =to_i915 (intel_crtc->base.dev);u32 pfit_control =0 , pfit_pgm_ratios =0 , border =0 ;struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
@@ -325,7 +325,7 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc,break ;case DRM_MODE_SCALE_ASPECT :/* Scale but preserve the aspect ratio */ -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 )i965_scale_aspect (pipe_config, &pfit_control);else i9xx_scale_aspect(pipe_config, &pfit_control,
@@ -339,7 +339,7 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc,if (pipe_config->pipe_src_h != adjusted_mode->crtc_vdisplay || pipe_config->pipe_src_w != adjusted_mode->crtc_hdisplay) { pfit_control |=PFIT_ENABLE ; -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 ) pfit_control |=PFIT_SCALING_AUTO ;else pfit_control |= (VERT_AUTO_SCALE |
@@ -355,7 +355,7 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc,/* 965+ wants fuzzy fitting */ /* FIXME: handle multiple panels by failing gracefully */ -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 ) pfit_control |= ((intel_crtc->pipe <<PFIT_PIPE_SHIFT ) |PFIT_FILTER_FUZZY );
@@ -366,7 +366,7 @@ out: }/* Make sure pre-965 set dither correctly for 18bpp panels. */ -if (INTEL_INFO (dev)->gen <4 && pipe_config->pipe_bpp ==18 ) +if (INTEL_GEN (dev_priv) <4 && pipe_config->pipe_bpp ==18 ) pfit_control |=PANEL_8TO6_DITHER_ENABLE ; pipe_config->gmch_pfit.control = pfit_control;
drivers/gpu/drm/i915/intel_psr.c +2 -2
@@ -472,7 +472,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)/* Enable PSR on the panel */ hsw_psr_enable_sink (intel_dp); -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )intel_psr_activate (intel_dp); }else {vlv_psr_setup_vsc (intel_dp);
@@ -498,7 +498,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)* - On HSW/BDW we get a recoverable frozen screen until next * exit-activate sequence. */ -if (INTEL_INFO (dev)->gen <9 ) +if (INTEL_GEN (dev_priv) <9 )schedule_delayed_work (&dev_priv->psr.work,msecs_to_jiffies (intel_dp->panel_power_cycle_delay *5 ));
drivers/gpu/drm/i915/intel_sdvo.c +4 -4
@@ -1269,13 +1269,13 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,return ;/* Set the SDVO control regs. */ -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {/* The real mode polarity is set by the SDVO commands, using * struct intel_sdvo_dtd. */ sdvox =SDVO_VSYNC_ACTIVE_HIGH |SDVO_HSYNC_ACTIVE_HIGH ;if (!HAS_PCH_SPLIT (dev) && crtc_state->limited_color_range) sdvox |=HDMI_COLOR_RANGE_16_235 ; -if (INTEL_INFO (dev)->gen <5 ) +if (INTEL_GEN (dev_priv) <5 ) sdvox |=SDVO_BORDER_ENABLE ; }else { sdvox =I915_READ (intel_sdvo->sdvo_reg);
@@ -1294,7 +1294,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,if (intel_sdvo->has_hdmi_audio) sdvox |=SDVO_AUDIO_ENABLE ; -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {/* done in crtc_mode_set as the dpll_md reg must be written early */ }else if (IS_I945G (dev) ||IS_I945GM (dev) ||IS_G33 (dev)) {/* done in crtc_mode_set as it lives inside the dpll register */
@@ -1304,7 +1304,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder, }if (input_dtd.part2.sdvo_flags &SDVO_NEED_TO_STALL && -INTEL_INFO (dev)->gen <5 ) +INTEL_GEN (dev_priv) <5 ) sdvox |=SDVO_STALL_SELECT ;intel_sdvo_write_sdvox (intel_sdvo, sdvox); }
drivers/gpu/drm/i915/intel_sprite.c +7 -7
@@ -749,7 +749,6 @@ intel_check_sprite_plane(struct drm_plane *plane, struct intel_plane_state *state) {struct drm_i915_private *dev_priv =to_i915 (plane->dev); -struct drm_device *dev = plane->dev;struct drm_crtc *crtc = state->base.crtc;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct intel_plane *intel_plane =to_intel_plane (plane);
@@ -793,7 +792,7 @@ intel_check_sprite_plane(struct drm_plane *plane, }/* setup can_scale, min_scale, max_scale */ -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {/* use scaler when colorkey is not required */ if (state->ckey.flags ==I915_SET_COLORKEY_NONE ) { can_scale =1 ;
@@ -909,7 +908,7 @@ intel_check_sprite_plane(struct drm_plane *plane, width_bytes = ((src_x * cpp) &63 ) + src_w * cpp; -if (INTEL_INFO (dev)->gen <9 && (src_w >2048 || src_h >2048 || +if (INTEL_GEN (dev_priv) <9 && (src_w >2048 || src_h >2048 || width_bytes >4096 || fb->pitches[0 ] >4096 )) {DRM_DEBUG_KMS ("Source dimensions exceed hardware limits\n" );return -EINVAL ;
@@ -1038,6 +1037,7 @@ static uint32_t skl_plane_formats[] = {int intel_plane_init (struct drm_device *dev,enum pipe pipe,int plane) { +struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_plane *intel_plane =NULL ;struct intel_plane_state *state =NULL ;unsigned long possible_crtcs;
@@ -1045,7 +1045,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)int num_plane_formats;int ret; -if (INTEL_INFO (dev)->gen <5 ) +if (INTEL_GEN (dev_priv) <5 )return -ENODEV ; intel_plane =kzalloc (sizeof (*intel_plane),GFP_KERNEL );
@@ -1061,7 +1061,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) } intel_plane->base.state = &state->base; -switch (INTEL_INFO (dev)->gen) { +switch (INTEL_GEN (dev_priv)) {case 5 :case 6 : intel_plane->can_scale = true;
@@ -1112,7 +1112,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) num_plane_formats =ARRAY_SIZE (skl_plane_formats);break ;default : -MISSING_CASE (INTEL_INFO (dev)->gen); +MISSING_CASE (INTEL_GEN (dev_priv)); ret = -ENODEV ; goto fail; }
@@ -1124,7 +1124,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) possible_crtcs = (1 << pipe); -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) ret = drm_universal_plane_init(dev, &intel_plane->base, possible_crtcs, &intel_plane_funcs, plane_formats, num_plane_formats,
drivers/gpu/drm/i915/intel_tv.c +1 -1
@@ -1106,7 +1106,7 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder,set_color_conversion (dev_priv, color_conversion); -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 )I915_WRITE (TV_CLR_KNOBS ,0x00404000 );else I915_WRITE (TV_CLR_KNOBS ,0x00606000 );
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/12 drm/i915: i915_vgacntrl_reg() fixes
In reply to David WeinehallModify i915_vgacntrl_reg() to take dev_priv instead of dev, and replace its call to INTEL_INFO(dev)->gen with INTEL_GEN(dev_priv).
--- drivers/gpu/drm/i915/i915_drv.h | 6 +++--- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -3
@@ -3814,11 +3814,11 @@ __raw_write(64, q)#define INTEL_BROADCAST_RGB_FULL 1#define INTEL_BROADCAST_RGB_LIMITED 2 -static inline i915_reg_t i915_vgacntrl_reg (struct drm_device *dev) +static inline i915_reg_t i915_vgacntrl_reg (struct drm_i915_private *dev_priv) { -if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) +if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv))return VLV_VGACNTRL ; -else if (INTEL_INFO (dev)->gen >=5 ) +else if (INTEL_GEN (dev_priv) >=5 )return CPU_VGACNTRL ;else return VGACNTRL ;
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -16221,7 +16221,7 @@ static void i915_disable_vga(struct drm_device *dev)struct drm_i915_private *dev_priv =to_i915 (dev);struct pci_dev *pdev = dev_priv->drm.pdev;u8 sr1; -i915_reg_t vga_reg =i915_vgacntrl_reg (dev); +i915_reg_t vga_reg =i915_vgacntrl_reg (dev_priv);/* WaEnableVGAAccessThroughIOPort:ctg,elk,ilk,snb,ivb,vlv,hsw */ vga_get_uninterruptible (pdev,VGA_RSRC_LEGACY_IO );
@@ -16666,7 +16666,7 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)void i915_redisable_vga_power_on (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -i915_reg_t vga_reg =i915_vgacntrl_reg (dev); +i915_reg_t vga_reg =i915_vgacntrl_reg (dev_priv);if (!(I915_READ (vga_reg) &VGA_DISP_DISABLE )) {DRM_DEBUG_KMS ("Something enabled VGA plane, disabling it\n" );
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/12 drm/i915: HAS_GMCH_DISPLAY() fixes
In reply to David WeinehallPass dev_priv to all instances of HAS_GMCH_DISPLAY(), and make the macro use INTEL_GEN().
--- drivers/gpu/drm/i915/i915_drv.h | 5 +++-- drivers/gpu/drm/i915/intel_color.c | 11 +++++------ drivers/gpu/drm/i915/intel_display.c | 12 ++++++------ drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_dsi.c | 5 +++-- drivers/gpu/drm/i915/intel_fifo_underrun.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 11 ++++++----- 7 files changed, 25 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -2
@@ -2835,8 +2835,9 @@ struct drm_i915_cmd_table {#define HAS_PCH_NOP (dev) (INTEL_PCH_TYPE(dev) == PCH_NOP)#define HAS_PCH_SPLIT (dev) (INTEL_PCH_TYPE(dev) != PCH_NONE) -#define HAS_GMCH_DISPLAY (dev) (INTEL_INFO(dev)->gen < 5 || \ - IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) +#define HAS_GMCH_DISPLAY (dev_priv) (INTEL_GEN(dev_priv) < 5 || \ + IS_VALLEYVIEW(dev_priv) || \ + IS_CHERRYVIEW(dev_priv))/* DPF == dynamic parity feature */ #define HAS_L3_DPF (dev) (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))
drivers/gpu/drm/i915/intel_color.c +5 -6
@@ -266,13 +266,12 @@ static void i9xx_load_luts_internal(struct drm_crtc *crtc,struct drm_property_blob *blob, struct intel_crtc_state *crtc_state) { - struct drm_device *dev = crtc->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); + struct drm_i915_private *dev_priv = to_i915(crtc->dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);enum pipe pipe = intel_crtc->pipe;int i; -if (HAS_GMCH_DISPLAY (dev)) { +if (HAS_GMCH_DISPLAY (dev_priv)) {if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DSI ))assert_dsi_pll_enabled (dev_priv);else
@@ -280,14 +279,14 @@ static void i9xx_load_luts_internal(struct drm_crtc *crtc, }if (blob) { -struct drm_color_lut *lut = (struct drm_color_lut *) blob->data; +struct drm_color_lut *lut = (struct drm_color_lut *)blob->data;for (i =0 ; i <256 ; i++) {uint32_t word = (drm_color_lut_extract (lut[i].red,8 ) <<16 ) | (drm_color_lut_extract (lut[i].green,8 ) <<8 ) |drm_color_lut_extract (lut[i].blue,8 ); -if (HAS_GMCH_DISPLAY (dev)) +if (HAS_GMCH_DISPLAY (dev_priv))I915_WRITE (PALETTE (pipe, i), word);else I915_WRITE (LGC_PALETTE (pipe, i), word);
@@ -296,7 +295,7 @@ static void i9xx_load_luts_internal(struct drm_crtc *crtc,for (i =0 ; i <256 ; i++) {uint32_t word = (i <<16 ) | (i <<8 ) | i; -if (HAS_GMCH_DISPLAY (dev)) +if (HAS_GMCH_DISPLAY (dev_priv))I915_WRITE (PALETTE (pipe, i), word);else I915_WRITE (LGC_PALETTE (pipe, i), word);
drivers/gpu/drm/i915/intel_display.c +6 -6
@@ -5003,8 +5003,8 @@ intel_pre_disable_primary(struct drm_crtc *crtc)static void intel_pre_disable_primary_noatomic (struct drm_crtc *crtc) { -struct drm_device *dev = crtc->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (crtc->dev); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);int pipe = intel_crtc->pipe;
@@ -5019,7 +5019,7 @@ intel_pre_disable_primary_noatomic(struct drm_crtc *crtc)* event which is after the vblank start event, so we need to have a * wait-for-vblank between disabling the plane and the pipe. */ -if (HAS_GMCH_DISPLAY (dev)) { +if (HAS_GMCH_DISPLAY (dev_priv)) {intel_set_memory_cxsr (dev_priv, false); dev_priv->wm.vlv.cxsr = false;intel_wait_for_vblank (dev, pipe);
@@ -5084,7 +5084,7 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state)intel_pre_disable_primary (&crtc->base); } -if (pipe_config->disable_cxsr &&HAS_GMCH_DISPLAY (dev)) { +if (pipe_config->disable_cxsr &&HAS_GMCH_DISPLAY (dev_priv)) { crtc->wm.cxsr_allowed = false;/*
@@ -10874,7 +10874,7 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc, pos |= y <<CURSOR_Y_SHIFT ;/* ILK+ do this automagically */ -if (HAS_GMCH_DISPLAY (dev) && +if (HAS_GMCH_DISPLAY (dev_priv) && plane_state->base.rotation ==DRM_ROTATE_180 ) { base += (plane_state->base.crtc_h * plane_state->base.crtc_w -1 ) *4 ;
@@ -16591,7 +16591,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)if (crtc->active && !intel_crtc_has_encoders (crtc))intel_crtc_disable_noatomic (&crtc->base); -if (crtc->active ||HAS_GMCH_DISPLAY (dev)) { +if (crtc->active ||HAS_GMCH_DISPLAY (dev_priv)) {/* * We start out with underrun reporting disabled to avoid races. * For correct bookkeeping mark this on active crtcs.
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -1509,7 +1509,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,return ret; } -if (HAS_GMCH_DISPLAY (dev)) +if (HAS_GMCH_DISPLAY (dev_priv))intel_gmch_panel_fitting (intel_crtc, pipe_config, intel_connector->panel.fitting_mode);else
drivers/gpu/drm/i915/intel_dsi.c +3 -2
@@ -1332,7 +1332,8 @@ static int intel_dsi_set_property(struct drm_connector *connector, struct drm_property *property, uint64_t val) { -struct drm_device *dev = connector->dev; +struct drm_i915_private *dev_priv =to_i915 (connector->dev); +struct drm_device *dev = &dev_priv->drm;struct intel_connector *intel_connector =to_intel_connector (connector);struct drm_crtc *crtc;int ret;
@@ -1346,7 +1347,7 @@ static int intel_dsi_set_property(struct drm_connector *connector,DRM_DEBUG_KMS ("no scaling not supported\n" );return -EINVAL ; } -if (HAS_GMCH_DISPLAY (dev) && +if (HAS_GMCH_DISPLAY (dev_priv) && val ==DRM_MODE_SCALE_CENTER ) {DRM_DEBUG_KMS ("centering not supported\n" );return -EINVAL ;
drivers/gpu/drm/i915/intel_fifo_underrun.c +1 -1
@@ -254,7 +254,7 @@ static bool __intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev, old = !intel_crtc->cpu_fifo_underrun_disabled; intel_crtc->cpu_fifo_underrun_disabled = !enable; -if (HAS_GMCH_DISPLAY (dev)) +if (HAS_GMCH_DISPLAY (dev_priv))i9xx_set_fifo_underrun_reporting (dev, pipe, enable, old);else if (IS_GEN5 (dev) ||IS_GEN6 (dev))ironlake_set_fifo_underrun_reporting (dev, pipe, enable);
drivers/gpu/drm/i915/intel_hdmi.c +6 -5
@@ -1257,10 +1257,10 @@ intel_hdmi_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) {struct intel_hdmi *hdmi =intel_attached_hdmi (connector); -struct drm_device *dev =intel_hdmi_to_dev (hdmi); +struct drm_i915_private *dev_priv =to_i915 (intel_hdmi_to_dev (hdmi));enum drm_mode_status status;int clock; -int max_dotclk =to_i915 (connector->dev)->max_dotclk_freq; +int max_dotclk = dev_priv->max_dotclk_freq;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ;
@@ -1280,7 +1280,7 @@ intel_hdmi_mode_valid(struct drm_connector *connector, status =hdmi_port_clock_valid (hdmi, clock, true);/* if we can't do 8bpc we may still be able to do 12bpc */ -if (!HAS_GMCH_DISPLAY (dev) && status !=MODE_OK ) +if (!HAS_GMCH_DISPLAY (dev_priv) && status !=MODE_OK ) status =hdmi_port_clock_valid (hdmi, clock *3 /2 , true);return status;
@@ -1288,9 +1288,10 @@ intel_hdmi_mode_valid(struct drm_connector *connector,static bool hdmi_12bpc_possible (struct intel_crtc_state *crtc_state) { -struct drm_device *dev = crtc_state->base.crtc->dev; +struct drm_i915_private *dev_priv = +to_i915 (crtc_state->base.crtc->dev); -if (HAS_GMCH_DISPLAY (dev)) +if (HAS_GMCH_DISPLAY (dev_priv))return false;/*
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 11/12 drm/i915: RESOURCE_STREAMER/CORE_RING_FREQ fixes
In reply to David WeinehallPass dev_priv to all instances of HAS_RESOURCE_STREAMER() and HAS_CORE_RING_FREQ(), and make the macros use INTEL_GEN().
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 11 ++++++----- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -344,7 +344,7 @@ static int i915_getparam(struct drm_device *dev, void *data, value = i915.enable_hangcheck &&intel_has_gpu_reset (dev_priv);break ;case I915_PARAM_HAS_RESOURCE_STREAMER : - value =HAS_RESOURCE_STREAMER (dev); + value =HAS_RESOURCE_STREAMER (dev_priv);break ;case I915_PARAM_HAS_EXEC_SOFTPIN : value =1 ;
drivers/gpu/drm/i915/i915_drv.h +6 -5
@@ -2802,12 +2802,13 @@ struct drm_i915_cmd_table {#define HAS_GUC_UCODE (dev) (HAS_GUC(dev))#define HAS_GUC_SCHED (dev) (HAS_GUC(dev)) -#define HAS_RESOURCE_STREAMER (dev) (IS_HASWELL(dev) || \ - INTEL_INFO(dev)->gen >= 8) +#define HAS_RESOURCE_STREAMER (dev_priv) (IS_HASWELL(dev_priv) || \ + INTEL_GEN(dev_priv) >= 8) -#define HAS_CORE_RING_FREQ (dev) (INTEL_INFO(dev)->gen >= 6 && \ - !IS_VALLEYVIEW(dev) && !IS_CHERRYVIEW(dev) && \ - !IS_BROXTON(dev)) +#define HAS_CORE_RING_FREQ (dev_priv) (INTEL_GEN(dev_priv) >= 6 && \ + !IS_VALLEYVIEW(dev_priv) && \ + !IS_CHERRYVIEW(dev_priv) && \ + !IS_BROXTON(dev_priv))#define HAS_POOLED_EU (dev_priv) (__INTEL_INFO(dev_priv)->has_pooled_eu)
drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 -1
@@ -1651,7 +1651,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, }if (args->flags &I915_EXEC_RESOURCE_STREAMER ) { -if (!HAS_RESOURCE_STREAMER (dev)) { +if (!HAS_RESOURCE_STREAMER (dev_priv)) {DRM_DEBUG ("RS is only allowed for Haswell, Gen8 and above\n" );return -EINVAL ; }
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 12/12 drm/i915: INTEL_GEN() fixes, part 6
In reply to David WeinehallFinal batch of INTEL_INFO()->gen to INTEL_GEN().
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 21 +++++++++++---------- drivers/gpu/drm/i915/i915_gpu_error.c | 4 ++-- drivers/gpu/drm/i915/intel_dp.c | 8 ++++---- drivers/gpu/drm/i915/intel_pm.c | 2 +- 5 files changed, 19 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -575,7 +575,7 @@ static void i915_gem_fini(struct drm_device *dev)* machines is a good idea, we don't - just in case it leaves the * machine in an unusable condition. */ -if (HAS_HW_CONTEXTS (dev)) { +if (HAS_HW_CONTEXTS (dev_priv)) {int reset =intel_gpu_reset (dev_priv,ALL_ENGINES );WARN_ON (reset && reset != -ENODEV ); }
drivers/gpu/drm/i915/i915_drv.h +11 -10
@@ -2735,8 +2735,8 @@ struct drm_i915_cmd_table { HAS_EDRAM(dev))#define I915_NEED_GFX_HWS (dev) (INTEL_INFO(dev)->need_gfx_hws) -#define HAS_HW_CONTEXTS (dev) (INTEL_INFO(dev)->gen >= 6) -#define HAS_LOGICAL_RING_CONTEXTS (dev) (INTEL_INFO(dev)->gen >= 8) +#define HAS_HW_CONTEXTS (dev_priv) (INTEL_GEN(dev_priv) >= 6) +#define HAS_LOGICAL_RING_CONTEXTS (dev_priv) (INTEL_GEN(dev_priv) >= 8)#define USES_PPGTT (dev) (i915.enable_ppgtt)#define USES_FULL_PPGTT (dev) (i915.enable_ppgtt >= 2)#define USES_FULL_48BIT_PPGTT (dev) (i915.enable_ppgtt == 3)
@@ -2759,8 +2759,8 @@ struct drm_i915_cmd_table {* legacy irq no. is shared with another device. The kernel then disables that * interrupt source and so prevents the other device from working properly. */ -#define HAS_AUX_IRQ (dev) (INTEL_INFO(dev)->gen >= 5) -#define HAS_GMBUS_IRQ (dev) (INTEL_INFO(dev)->gen >= 5) +#define HAS_AUX_IRQ (dev_priv) (INTEL_GEN(dev_priv) >= 5) +#define HAS_GMBUS_IRQ (dev_priv) (INTEL_GEN(dev_priv) >= 5)/* With the 945 and later, Y tiling got adjusted so that it was 32 128-byte * rows, which changed the alignment requirements and fence programming.
@@ -2770,14 +2770,15 @@ struct drm_i915_cmd_table {#define SUPPORTS_TV (dev) (INTEL_INFO(dev)->supports_tv)#define I915_HAS_HOTPLUG (dev) (INTEL_INFO(dev)->has_hotplug) -#define HAS_FW_BLC (dev) (INTEL_INFO(dev)->gen > 2) +#define HAS_FW_BLC (dev_priv) (INTEL_GEN(dev_priv) > 2)#define HAS_PIPE_CXSR (dev) (INTEL_INFO(dev)->has_pipe_cxsr)#define HAS_FBC (dev) (INTEL_INFO(dev)->has_fbc)#define HAS_IPS (dev) (IS_HSW_ULT(dev) || IS_BROADWELL(dev)) -#define HAS_DP_MST (dev) (IS_HASWELL(dev) || IS_BROADWELL(dev) || \ - INTEL_INFO(dev)->gen >= 9) +#define HAS_DP_MST (dev_priv) (IS_HASWELL(dev_priv) || \ + IS_BROADWELL(dev_priv) || \ + INTEL_GEN(dev_priv) >= 9)#define HAS_DDI (dev) (INTEL_INFO(dev)->has_ddi)#define HAS_FPGA_DBG_UNCLAIMED (dev) (INTEL_INFO(dev)->has_fpga_dbg)
@@ -2788,10 +2789,10 @@ struct drm_i915_cmd_table { IS_BROADWELL(dev) || IS_VALLEYVIEW(dev) || \ IS_CHERRYVIEW(dev) || IS_SKYLAKE(dev) || \ IS_KABYLAKE(dev) || IS_BROXTON(dev)) -#define HAS_RC6 (dev) (INTEL_INFO(dev)->gen >= 6) -#define HAS_RC6p (dev) (IS_GEN6(dev) || IS_IVYBRIDGE(dev)) +#define HAS_RC6 (dev_priv) (INTEL_GEN(dev_priv) >= 6) +#define HAS_RC6p (dev_priv) (IS_GEN6(dev_priv) || IS_IVYBRIDGE(dev_priv)) -#define HAS_CSR (dev) (IS_GEN9(dev)) +#define HAS_CSR (dev_priv) (IS_GEN9(dev_priv))/* * For now, anything with a GuC requires uCode loading, and then supports
drivers/gpu/drm/i915/i915_gpu_error.c +2 -2
@@ -375,7 +375,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, pdev->subsystem_device);err_printf (m,"IOMMU enabled?: %d\n" , error->iommu); -if (HAS_CSR (dev)) { +if (HAS_CSR (dev_priv)) {struct intel_csr *csr = &dev_priv->csr; err_printf(m, "DMC loaded: %s\n",
@@ -1340,7 +1340,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, }/* 4: Everything else */ -if (HAS_HW_CONTEXTS (dev)) +if (HAS_HW_CONTEXTS (dev_priv)) error->ccid =I915_READ (CCID );if (INTEL_GEN (dev_priv) >=8 ) {
drivers/gpu/drm/i915/intel_dp.c +4 -4
@@ -842,14 +842,14 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, uint8_t *recv, int recv_size) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = +to_i915 (intel_dig_port->base.base.dev);i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg;uint32_t aux_clock_divider;int i, ret, recv_bytes;uint32_t status;int try, clock =0 ; -bool has_aux_irq =HAS_AUX_IRQ (dev); +bool has_aux_irq =HAS_AUX_IRQ (dev_priv);bool vdd;pps_lock (intel_dp);
@@ -5651,7 +5651,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, }/* init MST on ports that can support it */ -if (HAS_DP_MST (dev) && !is_edp (intel_dp) && +if (HAS_DP_MST (dev_priv) && !is_edp (intel_dp) && (port ==PORT_B || port ==PORT_C || port ==PORT_D ))intel_dp_mst_encoder_init (intel_dig_port, intel_connector->base.base.id);
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -1598,7 +1598,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc)intel_set_memory_cxsr (dev_priv, false);/* Calc sr entries for one plane configs */ -if (HAS_FW_BLC (dev) && enabled) { +if (HAS_FW_BLC (dev_priv) && enabled) {/* self-refresh has much higher latency */ static const int sr_latency_ns =6000 ;const struct drm_display_mode *adjusted_mode = &to_intel_crtc (enabled)->config->base.adjusted_mode;
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for Feature macro cleanup, batch 1
In reply to David Weinehall== Series Details ==
== Series Details ==
Series: Feature macro cleanup, batch 1
URL : https://patchwork.freedesktop.org/series/11717/
State : warning
== Summary ==
Series 11717v1 Feature macro cleanup, batch 1
http://patchwork.freedesktop.org/api/1.0/series/11717/revisions/1/mbox/
Test gem_exec_gttfill:
Subgroup basic:
skip -> PASS (fi-byt-n2820)
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-c:
pass -> SKIP (fi-hsw-4770r)fi-bdw-5557u total:252 pass:235 dwarn:0 dfail:0 fail:2 skip:15 fi-bsw-n3050 total:252 pass:205 dwarn:0 dfail:0 fail:1 skip:46 fi-byt-n2820 total:252 pass:208 dwarn:0 dfail:0 fail:3 skip:41 fi-hsw-4770k total:252 pass:228 dwarn:0 dfail:0 fail:2 skip:22 fi-hsw-4770r total:252 pass:223 dwarn:0 dfail:0 fail:2 skip:27 fi-ivb-3520m total:252 pass:220 dwarn:0 dfail:0 fail:1 skip:31 fi-skl-6260u total:252 pass:236 dwarn:0 dfail:0 fail:2 skip:14 fi-skl-6700k total:252 pass:222 dwarn:0 dfail:0 fail:2 skip:28 fi-snb-2520m total:252 pass:207 dwarn:0 dfail:0 fail:2 skip:43 fi-snb-2600 total:252 pass:207 dwarn:0 dfail:0 fail:2 skip:43
Results at /archive/results/CI_IGT_test/Patchwork_2445/
111559eb2a460c94679ee1e5be5931c1d89ad367 drm-intel-nightly: 2016y-08m-29d-09h-31m-22s UTC integration manifest 0f98b32 drm/i915: INTEL_GEN() fixes, part 6
c09d98a drm/i915: RESOURCE_STREAMER/CORE_RING_FREQ fixes
2b66f93 drm/i915: HAS_GMCH_DISPLAY() fixes
9fd9bdf drm/i915: i915_vgacntrl_reg() fixes
eb8666c drm/i915: INTEL_GEN() fixes, part 5
04ef863 drm/i915: INTEL_GEN() fixes, part 4
e2dc6f4 drm/i915: INTEL_GEN() fixes, part 3
fc847db drm/i915: INTEL_GEN() fixes, part 2
e3cd6a0 drm/i915: INTEL_GEN() fixes, part 1
bdfdb57 drm/i915: HAS_POOLED_EU() fixes
9ae06fc drm/i915: IS_MOBILE() fixes
086471c drm/i915: Transitional, non-polymorph, macros
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx