drm/i915: distinguish G33 and Pineview from each other
Subsystems (2)
PATCH 1/1 drm/i915: distinguish G33 and Pineview from each other
Pineview deserves to use its own platform enum (which was already added, unused, previously). IS_G33() no longer matches Pineview, and gets replaced by IS_G33() || IS_PINEVIEW() or equivalent. Pineview is no longer an outlier among platform definitions.
--- drivers/gpu/drm/i915/i915_drv.h | 3 +-- drivers/gpu/drm/i915/i915_gem.c | 8 +++++--- drivers/gpu/drm/i915/i915_gem_fence_reg.c | 5 +++-- drivers/gpu/drm/i915/i915_gem_stolen.c | 4 ++-- drivers/gpu/drm/i915/i915_pci.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 5 +++-- drivers/gpu/drm/i915/intel_sdvo.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 2 +- 8 files changed, 17 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -2
@@ -688,7 +688,6 @@ struct intel_csr {#define DEV_INFO_FOR_EACH_FLAG (func) \ func(is_mobile); \ - func(is_pineview); \ func(is_lp); \ func(is_alpha_support); \/* Keep has_* in alphabetical order */ \
@@ -2533,7 +2532,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define IS_G4X (dev_priv) (IS_G45(dev_priv) || IS_GM45(dev_priv))#define IS_PINEVIEW_G (dev_priv) (INTEL_DEVID(dev_priv) == 0xa001)#define IS_PINEVIEW_M (dev_priv) (INTEL_DEVID(dev_priv) == 0xa011) -#define IS_PINEVIEW (dev_priv) ((dev_priv)->info.is_pineview) +#define IS_PINEVIEW (dev_priv) ((dev_priv)->info.platform == INTEL_PINEVIEW)#define IS_G33 (dev_priv) ((dev_priv)->info.platform == INTEL_G33)#define IS_IRONLAKE_M (dev_priv) (INTEL_DEVID(dev_priv) == 0x0046)#define IS_IVYBRIDGE (dev_priv) ((dev_priv)->info.platform == INTEL_IVYBRIDGE)
drivers/gpu/drm/i915/i915_gem.c +5 -3
@@ -2084,7 +2084,8 @@ u64 i915_gem_get_ggtt_alignment(struct drm_i915_private *dev_priv, u64 size,* Minimum alignment is 4k (GTT page size), but might be greater * if a fence register is needed for the object. */ -if (INTEL_GEN (dev_priv) >=4 || (!fenced &&IS_G33 (dev_priv)) || +if (INTEL_GEN (dev_priv) >=4 || + (!fenced && (IS_G33 (dev_priv) ||IS_PINEVIEW (dev_priv))) || tiling_mode ==I915_TILING_NONE )return 4096 ;
@@ -4498,8 +4499,9 @@ i915_gem_load_init_fences(struct drm_i915_private *dev_priv)if (INTEL_INFO (dev_priv)->gen >=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) || -IS_I945GM (dev_priv) ||IS_G33 (dev_priv)) +else if (INTEL_INFO (dev_priv)->gen >=4 || +IS_I945G (dev_priv) ||IS_I945GM (dev_priv) || +IS_G33 (dev_priv) ||IS_PINEVIEW (dev_priv)) dev_priv->num_fence_regs =16 ;else dev_priv->num_fence_regs =8 ;
drivers/gpu/drm/i915/i915_gem_fence_reg.c +3 -2
@@ -512,8 +512,9 @@ i915_gem_detect_bit_6_swizzle(struct drm_i915_private *dev_priv)*/ swizzle_x =I915_BIT_6_SWIZZLE_NONE ; swizzle_y =I915_BIT_6_SWIZZLE_NONE ; - }else if (IS_MOBILE (dev_priv) || (IS_GEN3 (dev_priv) && - !IS_G33 (dev_priv))) { + }else if (IS_MOBILE (dev_priv) || + (IS_GEN3 (dev_priv) && + !IS_G33 (dev_priv) && !IS_PINEVIEW (dev_priv))) {uint32_t dcc;/* On 9xx chipsets, channel interleave by the CPU is
drivers/gpu/drm/i915/i915_gem_stolen.c +2 -2
@@ -203,8 +203,8 @@ static unsigned long i915_stolen_to_physical(struct drm_i915_private *dev_priv)return 0 ;/* make sure we don't clobber the GTT if it's within stolen memory */ -if (INTEL_GEN (dev_priv) <=4 && !IS_G33 (dev_priv) && - !IS_G4X (dev_priv)) { +if (INTEL_GEN (dev_priv) <=4 && + !IS_G33 (dev_priv) && !IS_PINEVIEW (dev_priv) && !IS_G4X (dev_priv)) {struct {u32 start, end; } stolen[2 ] = {
drivers/gpu/drm/i915/i915_pci.c +1 -1
@@ -141,7 +141,7 @@ static const struct intel_device_info intel_g33_info = {static const struct intel_device_info intel_pineview_info = {GEN3_FEATURES , - .platform =INTEL_G33 , .is_pineview =1 , .is_mobile =1 , + .platform =INTEL_PINEVIEW , .is_mobile =1 , .has_hotplug =1 , .has_overlay =1 , };
drivers/gpu/drm/i915/intel_display.c +3 -2
@@ -8180,7 +8180,8 @@ static void i9xx_compute_dpll(struct intel_crtc *crtc,else dpll |=DPLLB_MODE_DAC_SERIAL ; -if (IS_I945G (dev_priv) ||IS_I945GM (dev_priv) ||IS_G33 (dev_priv)) { +if (IS_I945G (dev_priv) ||IS_I945GM (dev_priv) || +IS_G33 (dev_priv) ||IS_PINEVIEW (dev_priv)) { dpll |= (crtc_state->pixel_multiplier -1 ) <<SDVO_MULTIPLIER_SHIFT_HIRES ; }
@@ -8893,7 +8894,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc, >> DPLL_MD_UDI_MULTIPLIER_SHIFT) + 1; pipe_config->dpll_hw_state.dpll_md = tmp; }else if (IS_I945G (dev_priv) ||IS_I945GM (dev_priv) || -IS_G33 (dev_priv)) { +IS_G33 (dev_priv) ||IS_PINEVIEW (dev_priv)) { tmp =I915_READ (DPLL (crtc->pipe)); pipe_config->pixel_multiplier = ((tmp & SDVO_MULTIPLIER_MASK)
drivers/gpu/drm/i915/intel_sdvo.c +1 -1
@@ -1296,7 +1296,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,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_priv) ||IS_I945GM (dev_priv) || -IS_G33 (dev_priv)) { +IS_G33 (dev_priv) ||IS_PINEVIEW (dev_priv)) {/* done in crtc_mode_set as it lives inside the dpll register */ }else { sdvox |= (crtc_state->pixel_multiplier -1 )
drivers/gpu/drm/i915/intel_uncore.c +1 -1
@@ -1812,7 +1812,7 @@ static reset_func intel_get_gpu_reset(struct drm_i915_private *dev_priv)return ironlake_do_reset; else if (IS_G4X(dev_priv)) return g4x_do_reset; - else if (IS_G33(dev_priv)) + else if (IS_G33(dev_priv) || IS_PINEVIEW(dev_priv)) return g33_do_reset; else if (INTEL_INFO(dev_priv)->gen >= 3) return i915_do_reset;
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 88 lines · Jani Nikula
Pineview deserves to use its own platform enum (which was already added, unused, previously).
IS_G33()no longer matches Pineview, and gets replaced byIS_G33()||IS_PINEVIEW()or equivalent. Pineview is no longer an outlier among platform definitions.Cc Ville Syrjälä <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 3 +-- drivers/gpu/drm/i915/i915_gem.c | 8 +++++--- drivers/gpu/drm/i915/i915_gem_fence_reg.c | 5 +++-- drivers/gpu/drm/i915/i915_gem_stolen.c | 4 ++-- drivers/gpu/drm/i915/i915_pci.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 5 +++-- drivers/gpu/drm/i915/intel_sdvo.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 2 +- 8 files changed, 17 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-2@@ -688,7 +688,6 @@ struct intel_csr {#define DEV_INFO_FOR_EACH_FLAG (func) \ func(is_mobile); \ - func(is_pineview); \ func(is_lp); \ func(is_alpha_support); \/* Keep has_* in alphabetical order */ \@@ -2533,7 +2532,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define IS_G4X (dev_priv) (IS_G45(dev_priv) || IS_GM45(dev_priv))#define IS_PINEVIEW_G (dev_priv) (INTEL_DEVID(dev_priv) == 0xa001)#define IS_PINEVIEW_M (dev_priv) (INTEL_DEVID(dev_priv) == 0xa011) -#define IS_PINEVIEW (dev_priv) ((dev_priv)->info.is_pineview) +#define IS_PINEVIEW (dev_priv) ((dev_priv)->info.platform == INTEL_PINEVIEW)#define IS_G33 (dev_priv) ((dev_priv)->info.platform == INTEL_G33)#define IS_IRONLAKE_M (dev_priv) (INTEL_DEVID(dev_priv) == 0x0046)#define IS_IVYBRIDGE (dev_priv) ((dev_priv)->info.platform == INTEL_IVYBRIDGE)drivers/gpu/drm/i915/i915_gem.c +5
-3@@ -2084,7 +2084,8 @@ u64 i915_gem_get_ggtt_alignment(struct drm_i915_private *dev_priv, u64 size,* Minimum alignment is 4k (GTT page size), but might be greater * if a fence register is needed for the object. */ -if (INTEL_GEN (dev_priv) >=4 || (!fenced &&IS_G33 (dev_priv)) || +if (INTEL_GEN (dev_priv) >=4 || + (!fenced && (IS_G33 (dev_priv) ||IS_PINEVIEW (dev_priv))) || tiling_mode ==I915_TILING_NONE )return 4096 ;@@ -4498,8 +4499,9 @@ i915_gem_load_init_fences(struct drm_i915_private *dev_priv)if (INTEL_INFO (dev_priv)->gen >=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) || -IS_I945GM (dev_priv) ||IS_G33 (dev_priv)) +else if (INTEL_INFO (dev_priv)->gen >=4 || +IS_I945G (dev_priv) ||IS_I945GM (dev_priv) || +IS_G33 (dev_priv) ||IS_PINEVIEW (dev_priv)) dev_priv->num_fence_regs =16 ;else dev_priv->num_fence_regs =8 ;drivers/gpu/drm/i915/i915_gem_fence_reg.c +3
-2@@ -512,8 +512,9 @@ i915_gem_detect_bit_6_swizzle(struct drm_i915_private *dev_priv)*/ swizzle_x =I915_BIT_6_SWIZZLE_NONE ; swizzle_y =I915_BIT_6_SWIZZLE_NONE ; - }else if (IS_MOBILE (dev_priv) || (IS_GEN3 (dev_priv) && - !IS_G33 (dev_priv))) { + }else if (IS_MOBILE (dev_priv) || + (IS_GEN3 (dev_priv) && + !IS_G33 (dev_priv) && !IS_PINEVIEW (dev_priv))) {uint32_t dcc;/* On 9xx chipsets, channel interleave by the CPU is drivers/gpu/drm/i915/i915_gem_stolen.c +0
-0
drivers/gpu/drm/i915/i915_gem_stolen.c static unsigned long i915_stolen_to_physical(struct drm_i915_private *dev_priv) · line 207
Quoted 7 lines
drivers/gpu/drm/i915/i915_gem_stolen.c +2
-2@@ -203,8 +203,8 @@ static unsigned long i915_stolen_to_physical(struct drm_i915_private *dev_priv)return 0 ;/* make sure we don't clobber the GTT if it's within stolen memory */ -if (INTEL_GEN (dev_priv) <=4 && !IS_G33 (dev_priv) && - !IS_G4X (dev_priv)) { +if (INTEL_GEN (dev_priv) <=4 && + !IS_G33 (dev_priv) && !IS_PINEVIEW (dev_priv) && !IS_G4X (dev_priv)) {
A lot of the checks involving g33 are apparently quite ugly. Might be nice to clean some of those up into a more readable form. But the patch looks correct so, and it looks like the rest of the IS_G33 checks already deal with PNV separately.
I do wonder a bit about the IS_PINEVIEW_G and IS_PINEVIEW_M. I wonder if we should/could convert that to .is_mobile=true/false? Right now we seem to set .is_mobile=true for both.
Quoted 67 lines
drivers/gpu/drm/i915/i915_gem_stolen.c +0
-0struct {u32 start, end; } stolen[2 ] = {drivers/gpu/drm/i915/i915_pci.c +1
-1@@ -141,7 +141,7 @@ static const struct intel_device_info intel_g33_info = {static const struct intel_device_info intel_pineview_info = {GEN3_FEATURES , - .platform =INTEL_G33 , .is_pineview =1 , .is_mobile =1 , + .platform =INTEL_PINEVIEW , .is_mobile =1 , .has_hotplug =1 , .has_overlay =1 , };drivers/gpu/drm/i915/intel_display.c +3
-2@@ -8180,7 +8180,8 @@ static void i9xx_compute_dpll(struct intel_crtc *crtc,else dpll |=DPLLB_MODE_DAC_SERIAL ; -if (IS_I945G (dev_priv) ||IS_I945GM (dev_priv) ||IS_G33 (dev_priv)) { +if (IS_I945G (dev_priv) ||IS_I945GM (dev_priv) || +IS_G33 (dev_priv) ||IS_PINEVIEW (dev_priv)) { dpll |= (crtc_state->pixel_multiplier -1 ) <<SDVO_MULTIPLIER_SHIFT_HIRES ; }@@ -8893,7 +8894,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc, >> DPLL_MD_UDI_MULTIPLIER_SHIFT) + 1; pipe_config->dpll_hw_state.dpll_md = tmp; }else if (IS_I945G (dev_priv) ||IS_I945GM (dev_priv) || -IS_G33 (dev_priv)) { +IS_G33 (dev_priv) ||IS_PINEVIEW (dev_priv)) { tmp =I915_READ (DPLL (crtc->pipe)); pipe_config->pixel_multiplier = ((tmp & SDVO_MULTIPLIER_MASK)drivers/gpu/drm/i915/intel_sdvo.c +1
-1@@ -1296,7 +1296,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,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_priv) ||IS_I945GM (dev_priv) || -IS_G33 (dev_priv)) { +IS_G33 (dev_priv) ||IS_PINEVIEW (dev_priv)) {/* done in crtc_mode_set as it lives inside the dpll register */ }else { sdvox |= (crtc_state->pixel_multiplier -1 )drivers/gpu/drm/i915/intel_uncore.c +1
-1@@ -1812,7 +1812,7 @@ static reset_func intel_get_gpu_reset(struct drm_i915_private *dev_priv)return ironlake_do_reset; else if (IS_G4X(dev_priv)) return g4x_do_reset; - else if (IS_G33(dev_priv)) + else if (IS_G33(dev_priv) || IS_PINEVIEW(dev_priv)) return g33_do_reset; else if (INTEL_INFO(dev_priv)->gen >= 3) return i915_do_reset;Signature · 1 line
2.1.4
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Ville Syrjälä
A lot of the checks involving g33 are apparently quite ugly. Might be nice to clean some of those up into a more readable form. But the patch looks correct so, and it looks like the rest of the
IS_G33checks already deal with PNV separately.
Agreed. But this is the required first step.
Quoted 3 lines
I do wonder a bit about the
IS_PINEVIEW_GandIS_PINEVIEW_M. I wonder if we should/could convert that to .is_mobile=true/false? Right now we seem to set .is_mobile=true for both.
Patches follow.
In the mean time, this one pushed, thanks for the review.
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for drm/i915: distinguish G33 and Pineview from each other
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: distinguish G33 and Pineview from each other
URL : https://patchwork.freedesktop.org/series/16506/
State : warning
== Summary ==
Series 16506v1 drm/i915: distinguish G33 and Pineview from each other
https://patchwork.freedesktop.org/api/1.0/series/16506/revisions/1/mbox/
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
pass -> DMESG-WARN (fi-skl-6770hq)fi-bdw-5557u total:247 pass:219 dwarn:0 dfail:0 fail:0 skip:28 fi-bsw-n3050 total:247 pass:195 dwarn:0 dfail:0 fail:0 skip:52 fi-bxt-t5700 total:247 pass:206 dwarn:0 dfail:0 fail:0 skip:41 fi-byt-j1900 total:247 pass:206 dwarn:0 dfail:0 fail:0 skip:41 fi-byt-n2820 total:247 pass:202 dwarn:0 dfail:0 fail:0 skip:45 fi-hsw-4770 total:247 pass:214 dwarn:0 dfail:0 fail:0 skip:33 fi-hsw-4770r total:247 pass:214 dwarn:0 dfail:0 fail:0 skip:33 fi-ilk-650 total:247 pass:181 dwarn:0 dfail:0 fail:0 skip:66 fi-ivb-3520m total:247 pass:213 dwarn:0 dfail:0 fail:0 skip:34 fi-ivb-3770 total:247 pass:212 dwarn:0 dfail:0 fail:0 skip:35 fi-kbl-7500u total:247 pass:212 dwarn:0 dfail:0 fail:0 skip:35 fi-skl-6260u total:247 pass:220 dwarn:0 dfail:0 fail:0 skip:27 fi-skl-6700hq total:247 pass:214 dwarn:0 dfail:0 fail:0 skip:33 fi-skl-6700k total:247 pass:210 dwarn:3 dfail:0 fail:0 skip:34 fi-skl-6770hq total:247 pass:219 dwarn:1 dfail:0 fail:0 skip:27 fi-snb-2520m total:247 pass:202 dwarn:0 dfail:0 fail:0 skip:45 fi-snb-2600 total:247 pass:201 dwarn:0 dfail:0 fail:0 skip:46
e46c97f4cfb63328f5bbbc0fb85c3f53703792f2 drm-tip: 2016y-12m-07d-17h-47m-18s UTC integration manifest 39342ea drm/i915: distinguish G33 and Pineview from each other
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3226/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx