drm/i915: Advertise ppgtt support type in platform definition
Subsystems (2)
PATCH 1/2 drm/i915: Advertise ppgtt support type in platform definition
Instead of being hidden in sanitize_enable_ppgtt.
It also seems to be the place to do so nowadays.
--- drivers/gpu/drm/i915/i915_drv.h | 3 +++ drivers/gpu/drm/i915/i915_gem_gtt.c | 7 +++---- drivers/gpu/drm/i915/i915_pci.c | 11 +++++++++++ 3 files changed, 17 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -710,11 +710,14 @@ struct intel_csr {func (is_alpha_support); \/* Keep has_* in alphabetical order */ \func (has_64bit_reloc); \ +func (has_aliasing_ppgtt); \func (has_csr); \func (has_ddi); \func (has_dp_mst); \func (has_fbc); \func (has_fpga_dbg); \ +func (has_full_ppgtt); \ +func (has_full_48bit_ppgtt); \func (has_gmbus_irq); \func (has_gmch_display); \func (has_guc); \
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -4
@@ -113,10 +113,9 @@ int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv,bool has_full_ppgtt;bool has_full_48bit_ppgtt; - has_aliasing_ppgtt =INTEL_GEN (dev_priv) >=6 ; - has_full_ppgtt =INTEL_GEN (dev_priv) >=7 ; - has_full_48bit_ppgtt = -IS_BROADWELL (dev_priv) ||INTEL_GEN (dev_priv) >=9 ; + has_aliasing_ppgtt = dev_priv->info.has_aliasing_ppgtt; + has_full_ppgtt = dev_priv->info.has_full_ppgtt; + has_full_48bit_ppgtt = dev_priv->info.has_full_48bit_ppgtt;if (intel_vgpu_active (dev_priv)) {/* emulation is too hard */
drivers/gpu/drm/i915/i915_pci.c +11 -0
@@ -204,6 +204,7 @@ static const struct intel_device_info intel_ironlake_m_info = { .has_rc6p = 1, \ .has_gmbus_irq = 1, \ .has_hw_contexts = 1, \ + .has_aliasing_ppgtt =1 , \GEN_DEFAULT_PIPEOFFSETS , \CURSOR_OFFSETS
@@ -226,6 +227,8 @@ static const struct intel_device_info intel_sandybridge_m_info = { .has_rc6p = 1, \ .has_gmbus_irq = 1, \ .has_hw_contexts = 1, \ + .has_aliasing_ppgtt = 1, \ + .has_full_ppgtt =1 , \GEN_DEFAULT_PIPEOFFSETS , \IVB_CURSOR_OFFSETS
@@ -258,6 +261,8 @@ static const struct intel_device_info intel_ivybridge_q_info = { .has_hw_contexts = 1, \ .has_gmch_display = 1, \ .has_hotplug = 1, \ + .has_aliasing_ppgtt = 1, \ + .has_full_ppgtt = 1, \ .ring_mask = RENDER_RING | BSD_RING | BLT_RING, \ .display_mmio_offset =VLV_DISPLAY_BASE , \ GEN_DEFAULT_PIPEOFFSETS, \
@@ -289,6 +294,7 @@ static const struct intel_device_info intel_haswell_info = {HSW_FEATURES , \BDW_COLORS , \ .has_logical_ring_contexts = 1, \ + .has_full_48bit_ppgtt = 1, \ .has_64bit_reloc = 1static const struct intel_device_info intel_broadwell_info = {
@@ -318,6 +324,8 @@ static const struct intel_device_info intel_cherryview_info = { .has_hw_contexts = 1, .has_logical_ring_contexts = 1, .has_gmch_display = 1, + .has_aliasing_ppgtt = 1, + .has_full_ppgtt = 1, .display_mmio_offset =VLV_DISPLAY_BASE ,GEN_CHV_PIPEOFFSETS , CURSOR_OFFSETS,
@@ -364,6 +372,9 @@ static const struct intel_device_info intel_skylake_gt3_info = { .has_logical_ring_contexts = 1, \ .has_guc = 1, \ .has_decoupled_mmio = 1, \ + .has_aliasing_ppgtt = 1, \ + .has_full_ppgtt = 1, \ + .has_full_48bit_ppgtt =1 , \GEN_DEFAULT_PIPEOFFSETS , \IVB_CURSOR_OFFSETS , \BDW_COLORS
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Keep has_* in alphabetical order
As it already says in the comment block...
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -713,6 +713,7 @@ struct intel_csr {func (has_aliasing_ppgtt); \func (has_csr); \func (has_ddi); \ +func (has_decoupled_mmio); \func (has_dp_mst); \func (has_fbc); \func (has_fpga_dbg); \
@@ -738,8 +739,7 @@ struct intel_csr {func (cursor_needs_physical); \func (hws_needs_physical); \func (overlay_needs_physical); \ -func (supports_tv); \ -func (has_decoupled_mmio) +func (supports_tv);struct sseu_dev_info {u8 slice_mask;
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Keep has_* in alphabetical order
Quoted 1 line · Michel Thierry
As it already says in the comment block...
-Michał
Quoted 4 lines
Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: Advertise ppgtt support type in platform definition
In reply to Michel Thierry== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Advertise ppgtt support type in platform definition
URL : https://patchwork.freedesktop.org/series/16403/
State : warning
== Summary ==
Series 16403v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/16403/revisions/1/mbox/
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-a:
pass -> DMESG-WARN (fi-snb-2520m)fi-bdw-5557u total:247 pass:232 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:247 pass:207 dwarn:0 dfail:0 fail:0 skip:40 fi-bxt-t5700 total:247 pass:219 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-j1900 total:247 pass:219 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:247 pass:215 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:247 pass:194 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-ivb-3770 total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-kbl-7500u total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:247 pass:223 dwarn:3 dfail:0 fail:0 skip:21 fi-skl-6770hq total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-snb-2520m total:247 pass:214 dwarn:1 dfail:0 fail:0 skip:32 fi-snb-2600 total:247 pass:214 dwarn:0 dfail:0 fail:0 skip:33
c3ccb720019c23b0c1fff182214a7ad26af519b8 drm-tip: 2016y-12m-05d-20h-50m-01s UTC integration manifest f38c193 drm/i915: Keep has_* in alphabetical order
92d7853 drm/i915: Advertise ppgtt support type in platform definition
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3200/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: Advertise ppgtt support type in platform definition
Quoted 6 lines · Patchwork
== Series Details ==
Series: series starting with [1/2] drm/i915: Advertise ppgtt support type in platform definition
URL : https://patchwork.freedesktop.org/series/16403/
State : warning
Quoted 9 lines
== Summary ==
Series 16403v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/16403/revisions/1/mbox/Test
kms_pipe_crc_basic:Subgroup nonblocking-crc-pipe-a: pass -> DMESG-WARN (fi-snb-2520m)
[ 486.586950] [drm:drm_edid_block_valid] *ERROR* EDID checksum is invalid, remainder is 117
This is already reported in https://bugs.freedesktop.org/show_bug.cgi?id=98625 {[SNB BAT] HDMI: EDID checksum is invalid}
Thanks to Michał for reviewing the patches.
-Michel
Quoted 18 lines
fi-bdw-5557u total:247 pass:232 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:247 pass:207 dwarn:0 dfail:0 fail:0 skip:40 fi-bxt-t5700 total:247 pass:219 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-j1900 total:247 pass:219 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:247 pass:215 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:247 pass:194 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-ivb-3770 total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-kbl-7500u total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:247 pass:223 dwarn:3 dfail:0 fail:0 skip:21 fi-skl-6770hq total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-snb-2520m total:247 pass:214 dwarn:1 dfail:0 fail:0 skip:32 fi-snb-2600 total:247 pass:214 dwarn:0 dfail:0 fail:0 skip:33
Quoted 8 lines
c3ccb720019c23b0c1fff182214a7ad26af519b8drm-tip: 2016y-12m-05d-20h-50m-01s UTC integration manifest f38c193 drm/i915: Keep has_* in alphabetical order
92d7853 drm/i915: Advertise ppgtt support type in platform definition== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3200/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
AppliedRe: ✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: Advertise ppgtt support type in platform definition
Quoted 18 lines · Michel Thierry
Quoted 7 lines · Patchwork
== Series Details ==
Series: series starting with [1/2] drm/i915: Advertise ppgtt support type in platform definition
URL : https://patchwork.freedesktop.org/series/16403/
State : warningQuoted 9 lines
== Summary ==
Series 16403v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/16403/revisions/1/mbox/Test
kms_pipe_crc_basic:Subgroup nonblocking-crc-pipe-a: pass -> DMESG-WARN (fi-snb-2520m)
Quoted 8 lines
[ 486.586950] [drm:drm_edid_block_valid] *ERROR* EDID checksum isinvalid, remainder is 117
This is already reported in
https://bugs.freedesktop.org/show_bug.cgi?id=98625 {[SNB BAT] HDMI: EDID checksum is invalid}Thanks to Michał for reviewing the patches.
Pushed to dinq, thanks for the patches and review!
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 2 lines · Michel Thierry
Instead of being hidden in
sanitize_enable_ppgtt.
It also seems to be the place to do so nowadays.
-Michał
Quoted 6 lines
Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 3 +++ drivers/gpu/drm/i915/i915_gem_gtt.c | 7 +++---- drivers/gpu/drm/i915/i915_pci.c | 11 +++++++++++ 3 files changed, 17 insertions(+), 4 deletions(-)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx