* [PATCH RESEND FOR CI] drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr
@ 2017-10-17 14:02 Jani Nikula
2017-10-17 14:35 ` ✗ Fi.CI.BAT: warning for " Patchwork
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Jani Nikula @ 2017-10-17 14:02 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Daniel Vetter
They're unused and unsupported. Leave the reduced_clock pointers in
place still, should they prove useful later on.
v2: go from nuking DDI lowfreq_avail to nuking it entirely (Ville)
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 2 --
drivers/gpu/drm/i915/i915_pci.c | 2 --
drivers/gpu/drm/i915/intel_display.c | 15 ---------------
drivers/gpu/drm/i915/intel_drv.h | 1 -
4 files changed, 20 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index dd141b250583..084822b4e7fa 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -785,7 +785,6 @@ struct intel_csr {
func(has_logical_ring_contexts); \
func(has_logical_ring_preemption); \
func(has_overlay); \
- func(has_pipe_cxsr); \
func(has_pooled_eu); \
func(has_psr); \
func(has_rc6); \
@@ -3173,7 +3172,6 @@ intel_info(const struct drm_i915_private *dev_priv)
#define I915_HAS_HOTPLUG(dev_priv) ((dev_priv)->info.has_hotplug)
#define HAS_FW_BLC(dev_priv) (INTEL_GEN(dev_priv) > 2)
-#define HAS_PIPE_CXSR(dev_priv) ((dev_priv)->info.has_pipe_cxsr)
#define HAS_FBC(dev_priv) ((dev_priv)->info.has_fbc)
#define HAS_CUR_FBC(dev_priv) (!HAS_GMCH_DISPLAY(dev_priv) && INTEL_INFO(dev_priv)->gen >= 7)
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index bf467f30c99b..c162477ad1ff 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -193,7 +193,6 @@ static const struct intel_device_info intel_i965gm_info __initconst = {
static const struct intel_device_info intel_g45_info __initconst = {
GEN4_FEATURES,
.platform = INTEL_G45,
- .has_pipe_cxsr = 1,
.ring_mask = RENDER_RING | BSD_RING,
};
@@ -201,7 +200,6 @@ static const struct intel_device_info intel_gm45_info __initconst = {
GEN4_FEATURES,
.platform = INTEL_GM45,
.is_mobile = 1, .has_fbc = 1,
- .has_pipe_cxsr = 1,
.supports_tv = 1,
.ring_mask = RENDER_RING | BSD_RING,
};
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 897fe7e0cce5..ac72be52de47 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6522,11 +6522,9 @@ static void i9xx_update_pll_dividers(struct intel_crtc *crtc,
crtc_state->dpll_hw_state.fp0 = fp;
- crtc->lowfreq_avail = false;
if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_LVDS) &&
reduced_clock) {
crtc_state->dpll_hw_state.fp1 = fp2;
- crtc->lowfreq_avail = true;
} else {
crtc_state->dpll_hw_state.fp1 = fp;
}
@@ -7221,15 +7219,6 @@ static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc)
}
}
- if (HAS_PIPE_CXSR(dev_priv)) {
- if (intel_crtc->lowfreq_avail) {
- DRM_DEBUG_KMS("enabling CxSR downclocking\n");
- pipeconf |= PIPECONF_CXSR_DOWNCLOCK;
- } else {
- DRM_DEBUG_KMS("disabling CxSR downclocking\n");
- }
- }
-
if (intel_crtc->config->base.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE) {
if (INTEL_GEN(dev_priv) < 4 ||
intel_crtc_has_type(intel_crtc->config, INTEL_OUTPUT_SDVO))
@@ -8365,8 +8354,6 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
memset(&crtc_state->dpll_hw_state, 0,
sizeof(crtc_state->dpll_hw_state));
- crtc->lowfreq_avail = false;
-
/* CPU eDP is the only output that doesn't need a PCH PLL of its own. */
if (!crtc_state->has_pch_encoder)
return 0;
@@ -9025,8 +9012,6 @@ static int haswell_crtc_compute_clock(struct intel_crtc *crtc,
}
}
- crtc->lowfreq_avail = false;
-
return 0;
}
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 86eed3c7828b..c0d8b2d9ecdd 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -803,7 +803,6 @@ struct intel_crtc {
* some outputs connected to this crtc.
*/
bool active;
- bool lowfreq_avail;
u8 plane_ids_mask;
unsigned long long enabled_power_domains;
struct intel_overlay *overlay;
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* ✗ Fi.CI.BAT: warning for drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr
2017-10-17 14:02 [PATCH RESEND FOR CI] drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr Jani Nikula
@ 2017-10-17 14:35 ` Patchwork
2017-10-17 15:49 ` Patchwork
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2017-10-17 14:35 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr
URL : https://patchwork.freedesktop.org/series/32134/
State : warning
== Summary ==
Series 32134v1 drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr
https://patchwork.freedesktop.org/api/1.0/series/32134/revisions/1/mbox/
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
fail -> PASS (fi-gdg-551) fdo#102618
Subgroup basic-flip-after-cursor-varying-size:
skip -> PASS (fi-hsw-4770r)
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-b-frame-sequence:
pass -> SKIP (fi-hsw-4770r)
fdo#102618 https://bugs.freedesktop.org/show_bug.cgi?id=102618
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:443s
fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:452s
fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:373s
fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:518s
fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:263s
fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:500s
fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:497s
fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:496s
fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:477s
fi-cfl-s total:289 pass:253 dwarn:4 dfail:0 fail:0 skip:32 time:564s
fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:419s
fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:259s
fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:573s
fi-hsw-4770r total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:426s
fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:435s
fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:494s
fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:460s
fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:489s
fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:575s
fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:477s
fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:585s
fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:550s
fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:452s
fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:645s
fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:520s
fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:497s
fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:462s
fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:570s
fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:428s
920fa3252916e0ec9da1df709744c568f621a43d drm-tip: 2017y-10m-17d-09h-45m-06s UTC integration manifest
0efdc392dd41 drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6071/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* ✗ Fi.CI.BAT: warning for drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr
2017-10-17 14:02 [PATCH RESEND FOR CI] drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr Jani Nikula
2017-10-17 14:35 ` ✗ Fi.CI.BAT: warning for " Patchwork
@ 2017-10-17 15:49 ` Patchwork
2017-10-18 8:25 ` ✓ Fi.CI.BAT: success " Patchwork
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2017-10-17 15:49 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr
URL : https://patchwork.freedesktop.org/series/32134/
State : warning
== Summary ==
Series 32134v1 drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr
https://patchwork.freedesktop.org/api/1.0/series/32134/revisions/1/mbox/
Test chamelium:
Subgroup dp-crc-fast:
pass -> FAIL (fi-kbl-7500u) fdo#102514
Test debugfs_test:
Subgroup read_all_entries:
pass -> DMESG-WARN (fi-kbl-7500u) fdo#103285
Test gem_exec_reloc:
Subgroup basic-cpu-read-active:
pass -> SKIP (fi-gdg-551) fdo#102582 +2
Subgroup basic-write-cpu-active:
pass -> SKIP (fi-gdg-551)
Subgroup basic-write-gtt-active:
pass -> SKIP (fi-gdg-551)
Subgroup basic-softpin:
pass -> SKIP (fi-gdg-551)
Test gem_linear_blits:
Subgroup basic:
pass -> SKIP (fi-gdg-551)
Test gem_render_linear_blits:
Subgroup basic:
pass -> SKIP (fi-gdg-551)
Test gem_render_tiled_blits:
Subgroup basic:
pass -> SKIP (fi-gdg-551)
Test gem_sync:
Subgroup basic-all:
pass -> SKIP (fi-gdg-551)
Subgroup basic-each:
pass -> SKIP (fi-gdg-551)
Subgroup basic-many-each:
pass -> SKIP (fi-gdg-551)
Subgroup basic-store-each:
pass -> SKIP (fi-gdg-551)
Test gem_tiled_blits:
Subgroup basic:
pass -> SKIP (fi-gdg-551)
Test gem_tiled_fence_blits:
Subgroup basic:
pass -> SKIP (fi-gdg-551)
Test gem_wait:
Subgroup basic-busy-all:
pass -> SKIP (fi-gdg-551)
Subgroup basic-wait-all:
pass -> SKIP (fi-gdg-551)
Subgroup basic-await-all:
pass -> SKIP (fi-gdg-551)
Test kms_busy:
Subgroup basic-flip-a:
pass -> SKIP (fi-gdg-551) fdo#102654 +1
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
fail -> SKIP (fi-gdg-551) fdo#102618
Subgroup basic-flip-after-cursor-varying-size:
skip -> PASS (fi-hsw-4770r)
fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#103285 https://bugs.freedesktop.org/show_bug.cgi?id=103285
fdo#102582 https://bugs.freedesktop.org/show_bug.cgi?id=102582
fdo#102654 https://bugs.freedesktop.org/show_bug.cgi?id=102654
fdo#102618 https://bugs.freedesktop.org/show_bug.cgi?id=102618
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:438s
fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:449s
fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:374s
fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:522s
fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:265s
fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:493s
fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:498s
fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:490s
fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:475s
fi-cfl-s total:289 pass:253 dwarn:4 dfail:0 fail:0 skip:32 time:567s
fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:421s
fi-gdg-551 total:289 pass:157 dwarn:1 dfail:0 fail:1 skip:130 time:253s
fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:584s
fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:426s
fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:439s
fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:484s
fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:460s
fi-kbl-7500u total:289 pass:262 dwarn:2 dfail:0 fail:1 skip:24 time:479s
fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:567s
fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:475s
fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:582s
fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:544s
fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:450s
fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:637s
fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:519s
fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:493s
fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:449s
fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:566s
fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:415s
920fa3252916e0ec9da1df709744c568f621a43d drm-tip: 2017y-10m-17d-09h-45m-06s UTC integration manifest
9b3693968ca1 drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6075/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr
2017-10-17 14:02 [PATCH RESEND FOR CI] drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr Jani Nikula
2017-10-17 14:35 ` ✗ Fi.CI.BAT: warning for " Patchwork
2017-10-17 15:49 ` Patchwork
@ 2017-10-18 8:25 ` Patchwork
2017-10-18 14:29 ` ✓ Fi.CI.IGT: " Patchwork
2017-10-19 14:06 ` [PATCH RESEND FOR CI] " Jani Nikula
4 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2017-10-18 8:25 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr
URL : https://patchwork.freedesktop.org/series/32134/
State : success
== Summary ==
Series 32134v1 drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr
https://patchwork.freedesktop.org/api/1.0/series/32134/revisions/1/mbox/
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:438s
fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:451s
fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:370s
fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:528s
fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:265s
fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:498s
fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:496s
fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:488s
fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:478s
fi-cfl-s total:289 pass:253 dwarn:4 dfail:0 fail:0 skip:32 time:570s
fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:417s
fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:249s
fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:573s
fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:425s
fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:433s
fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:483s
fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:458s
fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:489s
fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:572s
fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:473s
fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:575s
fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:546s
fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:442s
fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:645s
fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:513s
fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:491s
fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:458s
fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:569s
fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:420s
abb54f404cc5f5564dffcb1b5b300554bac9c32b drm-tip: 2017y-10m-18d-04h-09m-17s UTC integration manifest
6e1acf92b7e0 drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6089/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr
2017-10-17 14:02 [PATCH RESEND FOR CI] drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr Jani Nikula
` (2 preceding siblings ...)
2017-10-18 8:25 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2017-10-18 14:29 ` Patchwork
2017-10-19 14:06 ` [PATCH RESEND FOR CI] " Jani Nikula
4 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2017-10-18 14:29 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr
URL : https://patchwork.freedesktop.org/series/32134/
State : success
== Summary ==
Test drv_suspend:
Subgroup sysfs-reader-hibernate:
dmesg-fail -> FAIL (shard-hsw) k.org#196691
Test kms_setmode:
Subgroup basic:
fail -> PASS (shard-hsw) fdo#99912
k.org#196691 https://bugzilla.kernel.org/show_bug.cgi?id=196691
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
shard-hsw total:2551 pass:1442 dwarn:0 dfail:0 fail:8 skip:1101 time:9289s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6089/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH RESEND FOR CI] drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr
2017-10-17 14:02 [PATCH RESEND FOR CI] drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr Jani Nikula
` (3 preceding siblings ...)
2017-10-18 14:29 ` ✓ Fi.CI.IGT: " Patchwork
@ 2017-10-19 14:06 ` Jani Nikula
4 siblings, 0 replies; 6+ messages in thread
From: Jani Nikula @ 2017-10-19 14:06 UTC (permalink / raw)
To: intel-gfx; +Cc: Daniel Vetter
On Tue, 17 Oct 2017, Jani Nikula <jani.nikula@intel.com> wrote:
> They're unused and unsupported. Leave the reduced_clock pointers in
> place still, should they prove useful later on.
>
> v2: go from nuking DDI lowfreq_avail to nuking it entirely (Ville)
>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Pushed to dinq, thanks for the review.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/i915_drv.h | 2 --
> drivers/gpu/drm/i915/i915_pci.c | 2 --
> drivers/gpu/drm/i915/intel_display.c | 15 ---------------
> drivers/gpu/drm/i915/intel_drv.h | 1 -
> 4 files changed, 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index dd141b250583..084822b4e7fa 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -785,7 +785,6 @@ struct intel_csr {
> func(has_logical_ring_contexts); \
> func(has_logical_ring_preemption); \
> func(has_overlay); \
> - func(has_pipe_cxsr); \
> func(has_pooled_eu); \
> func(has_psr); \
> func(has_rc6); \
> @@ -3173,7 +3172,6 @@ intel_info(const struct drm_i915_private *dev_priv)
> #define I915_HAS_HOTPLUG(dev_priv) ((dev_priv)->info.has_hotplug)
>
> #define HAS_FW_BLC(dev_priv) (INTEL_GEN(dev_priv) > 2)
> -#define HAS_PIPE_CXSR(dev_priv) ((dev_priv)->info.has_pipe_cxsr)
> #define HAS_FBC(dev_priv) ((dev_priv)->info.has_fbc)
> #define HAS_CUR_FBC(dev_priv) (!HAS_GMCH_DISPLAY(dev_priv) && INTEL_INFO(dev_priv)->gen >= 7)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index bf467f30c99b..c162477ad1ff 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -193,7 +193,6 @@ static const struct intel_device_info intel_i965gm_info __initconst = {
> static const struct intel_device_info intel_g45_info __initconst = {
> GEN4_FEATURES,
> .platform = INTEL_G45,
> - .has_pipe_cxsr = 1,
> .ring_mask = RENDER_RING | BSD_RING,
> };
>
> @@ -201,7 +200,6 @@ static const struct intel_device_info intel_gm45_info __initconst = {
> GEN4_FEATURES,
> .platform = INTEL_GM45,
> .is_mobile = 1, .has_fbc = 1,
> - .has_pipe_cxsr = 1,
> .supports_tv = 1,
> .ring_mask = RENDER_RING | BSD_RING,
> };
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 897fe7e0cce5..ac72be52de47 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6522,11 +6522,9 @@ static void i9xx_update_pll_dividers(struct intel_crtc *crtc,
>
> crtc_state->dpll_hw_state.fp0 = fp;
>
> - crtc->lowfreq_avail = false;
> if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_LVDS) &&
> reduced_clock) {
> crtc_state->dpll_hw_state.fp1 = fp2;
> - crtc->lowfreq_avail = true;
> } else {
> crtc_state->dpll_hw_state.fp1 = fp;
> }
> @@ -7221,15 +7219,6 @@ static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc)
> }
> }
>
> - if (HAS_PIPE_CXSR(dev_priv)) {
> - if (intel_crtc->lowfreq_avail) {
> - DRM_DEBUG_KMS("enabling CxSR downclocking\n");
> - pipeconf |= PIPECONF_CXSR_DOWNCLOCK;
> - } else {
> - DRM_DEBUG_KMS("disabling CxSR downclocking\n");
> - }
> - }
> -
> if (intel_crtc->config->base.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE) {
> if (INTEL_GEN(dev_priv) < 4 ||
> intel_crtc_has_type(intel_crtc->config, INTEL_OUTPUT_SDVO))
> @@ -8365,8 +8354,6 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,
> memset(&crtc_state->dpll_hw_state, 0,
> sizeof(crtc_state->dpll_hw_state));
>
> - crtc->lowfreq_avail = false;
> -
> /* CPU eDP is the only output that doesn't need a PCH PLL of its own. */
> if (!crtc_state->has_pch_encoder)
> return 0;
> @@ -9025,8 +9012,6 @@ static int haswell_crtc_compute_clock(struct intel_crtc *crtc,
> }
> }
>
> - crtc->lowfreq_avail = false;
> -
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 86eed3c7828b..c0d8b2d9ecdd 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -803,7 +803,6 @@ struct intel_crtc {
> * some outputs connected to this crtc.
> */
> bool active;
> - bool lowfreq_avail;
> u8 plane_ids_mask;
> unsigned long long enabled_power_domains;
> struct intel_overlay *overlay;
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-10-19 14:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-17 14:02 [PATCH RESEND FOR CI] drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr Jani Nikula
2017-10-17 14:35 ` ✗ Fi.CI.BAT: warning for " Patchwork
2017-10-17 15:49 ` Patchwork
2017-10-18 8:25 ` ✓ Fi.CI.BAT: success " Patchwork
2017-10-18 14:29 ` ✓ Fi.CI.IGT: " Patchwork
2017-10-19 14:06 ` [PATCH RESEND FOR CI] " Jani Nikula
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.