drm/i915/skl: Enabling PSR on Skylake
Subsystems (2)
PATCH 1/1 drm/i915/skl: Enabling PSR on Skylake
Mainly taking care of some register offsets, otherwise things are similar to hsw. Also, programming ddi aux to use hardcoded values for psr data select.
v2: introduce EDP_PSR_AUX_BASE macro (Chris)
v3: Moving to HW tracking for SKL+ platforms, so activating source psr during psr_enabling and then avoiding psr entries and exits for each frontbuffer updates.
--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 19 +++++++++++++------ drivers/gpu/drm/i915/intel_frontbuffer.c | 7 +++++-- drivers/gpu/drm/i915/intel_psr.c | 18 +++++++++++++++++- 4 files changed, 37 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -2355,7 +2355,8 @@ struct drm_i915_cmd_table {#define HAS_DDI (dev) (INTEL_INFO(dev)->has_ddi)#define HAS_FPGA_DBG_UNCLAIMED (dev) (INTEL_INFO(dev)->has_fpga_dbg)#define HAS_PSR (dev) (IS_HASWELL(dev) || IS_BROADWELL(dev) || \ - IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) + IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev) || \ + IS_SKYLAKE(dev))#define HAS_RUNTIME_PM (dev) (IS_GEN6(dev) || IS_HASWELL(dev) || \ IS_BROADWELL(dev) || IS_VALLEYVIEW(dev))#define HAS_RC6 (dev) (INTEL_INFO(dev)->gen >= 6)
drivers/gpu/drm/i915/i915_reg.h +13 -6
@@ -2619,12 +2619,14 @@ enum skl_disp_power_wells {#define EDP_PSR_TP1_TIME_0us (3<<4)#define EDP_PSR_IDLE_FRAME_SHIFT 0 -#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_BASE(dev) + 0x10) -#define EDP_PSR_AUX_DATA1 (dev) (EDP_PSR_BASE(dev) + 0x14) -#define EDP_PSR_AUX_DATA2 (dev) (EDP_PSR_BASE(dev) + 0x18) -#define EDP_PSR_AUX_DATA3 (dev) (EDP_PSR_BASE(dev) + 0x1c) -#define EDP_PSR_AUX_DATA4 (dev) (EDP_PSR_BASE(dev) + 0x20) -#define EDP_PSR_AUX_DATA5 (dev) (EDP_PSR_BASE(dev) + 0x24) +#define EDP_PSR_AUX_BASE (dev) (INTEL_INFO(dev)->gen >= 9 ? \ + 0x64000 : EDP_PSR_BASE(dev)) +#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_AUX_BASE(dev) + 0x10) +#define EDP_PSR_AUX_DATA1 (dev) (EDP_PSR_AUX_BASE(dev) + 0x14) +#define EDP_PSR_AUX_DATA2 (dev) (EDP_PSR_AUX_BASE(dev) + 0x18) +#define EDP_PSR_AUX_DATA3 (dev) (EDP_PSR_AUX_BASE(dev) + 0x1c) +#define EDP_PSR_AUX_DATA4 (dev) (EDP_PSR_AUX_BASE(dev) + 0x20) +#define EDP_PSR_AUX_DATA5 (dev) (EDP_PSR_AUX_BASE(dev) + 0x24)#define EDP_PSR_STATUS_CTL (dev) (EDP_PSR_BASE(dev) + 0x40)#define EDP_PSR_STATUS_STATE_MASK (7<<29)
@@ -3771,6 +3773,11 @@ enum skl_disp_power_wells {#define DP_AUX_CH_CTL_PRECHARGE_TEST (1 << 11)#define DP_AUX_CH_CTL_BIT_CLOCK_2X_MASK (0x7ff)#define DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT 0 +#define DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL (1 << 14) +#define DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL (1 << 13) +#define DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL (1 << 12) +#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL_MASK (1f << 5) +#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (c) (((c) - 1) << 5)#define DP_AUX_CH_CTL_SYNC_PULSE_SKL (c) ((c) - 1)/*
drivers/gpu/drm/i915/intel_frontbuffer.c +5 -2
@@ -156,7 +156,9 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,intel_mark_fb_busy (dev, obj->frontbuffer_bits, ring); -intel_psr_invalidate (dev, obj->frontbuffer_bits); + +if (INTEL_INFO (dev)->gen <9 ) +intel_psr_invalidate (dev, obj->frontbuffer_bits); }/**
@@ -182,7 +184,8 @@ void intel_frontbuffer_flush(struct drm_device *dev,intel_mark_fb_busy (dev, frontbuffer_bits,NULL ); -intel_psr_flush (dev, frontbuffer_bits); +if (INTEL_INFO (dev)->gen <9 ) +intel_psr_flush (dev, frontbuffer_bits);/* * FIXME: Unconditional fbc flushing here is a rather gross hack and
drivers/gpu/drm/i915/intel_psr.c +17 -1
@@ -173,11 +173,24 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)I915_WRITE (EDP_PSR_AUX_DATA1 (dev) + i,intel_dp_pack_aux (&aux_msg[i],sizeof (aux_msg) - i)); -I915_WRITE (EDP_PSR_AUX_CTL (dev), +if (INTEL_INFO (dev)->gen >=9 ) { +uint32_t val; + + val =I915_READ (EDP_PSR_AUX_CTL (dev)); + val &= ~DP_AUX_CH_CTL_TIME_OUT_MASK ; + val |= DP_AUX_CH_CTL_TIME_OUT_1600us; + val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; + val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); +/* Use hardcoded data values for PSR */ + val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; +I915_WRITE (EDP_PSR_AUX_CTL (dev), val); + }else { +I915_WRITE (EDP_PSR_AUX_CTL (dev), DP_AUX_CH_CTL_TIME_OUT_400us | (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | (precharge <<DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT ) | (aux_clock_divider <<DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT )); + } }static void vlv_psr_enable_source (struct intel_dp *intel_dp)
@@ -355,6 +368,9 @@ 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 ) +intel_psr_activate (intel_dp); }else {vlv_psr_setup_vsc (intel_dp);
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 5591 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -1 353/353 352/353
ILK 353/353 353/353 SNB 400/422 400/422 IVB 487/487 487/487 BYT 296/296 296/296
HSW +20-8 487/508 499/508
BDW 401/402 401/402
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*PNV igt_gen3_render_linear_blits PASS(2, M25M23) CRASH(1, M23) *HSW igt_kms_cursor_crc_cursor-size-change NSPT(1, M19)TIMEOUT(1, M40)PASS(1, M20) PASS(1, M40) *HSW igt_kms_fence_pin_leak NSPT(1, M19)DMESG_WARN(1, M40)PASS(1, M20) PASS(1, M40) HSW igt_kms_flip_dpms-vs-vblank-race DMESG_WARN(2, M20M40)PASS(1, M19) DMESG_WARN(1, M40) HSW igt_kms_flip_flip-vs-dpms-off-vs-modeset DMESG_WARN(1, M40)PASS(2, M19M20) DMESG_WARN(1, M40) *HSW igt_kms_mmio_vs_cs_flip_setcrtc_vs_cs_flip NSPT(1, M19)TIMEOUT(1, M40)PASS(1, M20) PASS(1, M40) *HSW igt_kms_mmio_vs_cs_flip_setplane_vs_cs_flip NSPT(1, M19)TIMEOUT(1, M40)PASS(1, M20) FAIL(1, M40) *HSW igt_kms_plane_plane-panning-top-left-pipe-B-plane-1 TIMEOUT(1, M40)PASS(1, M19) DMESG_FAIL(1, M40) HSW igt_kms_plane_plane-panning-top-left-pipe-C-plane-1 TIMEOUT(1, M40)PASS(1, M19) TIMEOUT(1, M40) *HSW igt_pm_lpsp_non-edp NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_pm_rpm_cursor NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_pm_rpm_cursor-dpms NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_pm_rpm_dpms-mode-unset-non-lpsp NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_pm_rpm_dpms-non-lpsp NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_pm_rpm_drm-resources-equal NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_pm_rpm_fences NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_pm_rpm_fences-dpms NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_pm_rpm_gem-execbuf NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_pm_rpm_gem-mmap-cpu NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_pm_rpm_gem-mmap-gtt NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_pm_rpm_gem-pread NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_pm_rpm_i2c NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_pm_rpm_modeset-non-lpsp NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_pm_rpm_modeset-non-lpsp-stress-no-wait NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_pm_rpm_pci-d3-state NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_pm_rpm_rte NSPT(1, M19)PASS(1, M20) PASS(1, M40) *HSW igt_kms_flip_absolute-wf_vblank-interruptible PASS(1, M19) DMESG_WARN(1, M40) *HSW igt_kms_flip_blocking-absolute-wf_vblank PASS(1, M19) DMESG_WARN(1, M40) *HSW igt_kms_flip_plain-flip-fb-recreate PASS(1, M19) DMESG_WARN(1, M40) *HSW igt_kms_flip_plain-flip-ts-check-interruptible PASS(1, M19) DMESG_WARN(1, M40)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 83 lines · Sonika Jindal
Mainly taking care of some register offsets, otherwise things are similar to hsw. Also, programming ddi aux to use hardcoded values for psr data select.
v2: introduce
EDP_PSR_AUX_BASEmacro (Chris)
v3: Moving to HW tracking for SKL+ platforms, so activating source psr duringpsr_enablingand then avoiding psr entries and exits for each frontbuffer updates.Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 19 +++++++++++++------ drivers/gpu/drm/i915/intel_frontbuffer.c | 7 +++++-- drivers/gpu/drm/i915/intel_psr.c | 18 +++++++++++++++++- 4 files changed, 37 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/i915_drv.h +2
-1@@ -2355,7 +2355,8 @@ struct drm_i915_cmd_table {#define HAS_DDI (dev) (INTEL_INFO(dev)->has_ddi)#define HAS_FPGA_DBG_UNCLAIMED (dev) (INTEL_INFO(dev)->has_fpga_dbg)#define HAS_PSR (dev) (IS_HASWELL(dev) || IS_BROADWELL(dev) || \ - IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) + IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev) || \ + IS_SKYLAKE(dev))#define HAS_RUNTIME_PM (dev) (IS_GEN6(dev) || IS_HASWELL(dev) || \ IS_BROADWELL(dev) || IS_VALLEYVIEW(dev))#define HAS_RC6 (dev) (INTEL_INFO(dev)->gen >= 6)drivers/gpu/drm/i915/i915_reg.h +13
-6@@ -2619,12 +2619,14 @@ enum skl_disp_power_wells {#define EDP_PSR_TP1_TIME_0us (3<<4)#define EDP_PSR_IDLE_FRAME_SHIFT 0 -#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_BASE(dev) + 0x10) -#define EDP_PSR_AUX_DATA1 (dev) (EDP_PSR_BASE(dev) + 0x14) -#define EDP_PSR_AUX_DATA2 (dev) (EDP_PSR_BASE(dev) + 0x18) -#define EDP_PSR_AUX_DATA3 (dev) (EDP_PSR_BASE(dev) + 0x1c) -#define EDP_PSR_AUX_DATA4 (dev) (EDP_PSR_BASE(dev) + 0x20) -#define EDP_PSR_AUX_DATA5 (dev) (EDP_PSR_BASE(dev) + 0x24) +#define EDP_PSR_AUX_BASE (dev) (INTEL_INFO(dev)->gen >= 9 ? \ + 0x64000 : EDP_PSR_BASE(dev)) +#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_AUX_BASE(dev) + 0x10) +#define EDP_PSR_AUX_DATA1 (dev) (EDP_PSR_AUX_BASE(dev) + 0x14) +#define EDP_PSR_AUX_DATA2 (dev) (EDP_PSR_AUX_BASE(dev) + 0x18) +#define EDP_PSR_AUX_DATA3 (dev) (EDP_PSR_AUX_BASE(dev) + 0x1c) +#define EDP_PSR_AUX_DATA4 (dev) (EDP_PSR_AUX_BASE(dev) + 0x20) +#define EDP_PSR_AUX_DATA5 (dev) (EDP_PSR_AUX_BASE(dev) + 0x24)#define EDP_PSR_STATUS_CTL (dev) (EDP_PSR_BASE(dev) + 0x40)#define EDP_PSR_STATUS_STATE_MASK (7<<29)@@ -3771,6 +3773,11 @@ enum skl_disp_power_wells {#define DP_AUX_CH_CTL_PRECHARGE_TEST (1 << 11)#define DP_AUX_CH_CTL_BIT_CLOCK_2X_MASK (0x7ff)#define DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT 0 +#define DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL (1 << 14) +#define DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL (1 << 13) +#define DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL (1 << 12) +#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL_MASK (1f << 5) +#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (c) (((c) - 1) << 5)#define DP_AUX_CH_CTL_SYNC_PULSE_SKL (c) ((c) - 1)/* drivers/gpu/drm/i915/intel_frontbuffer.c +3
-1@@ -156,7 +156,9 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,intel_mark_fb_busy (dev, obj->frontbuffer_bits, ring); -intel_psr_invalidate (dev, obj->frontbuffer_bits); + +if (INTEL_INFO (dev)->gen <9 ) +intel_psr_invalidate (dev, obj->frontbuffer_bits); }/**
drivers/gpu/drm/i915/intel_frontbuffer.c void intel_frontbuffer_flush(struct drm_device *dev, · line 188
Quoted 6 lines
drivers/gpu/drm/i915/intel_frontbuffer.c +2
-1@@ -182,7 +184,8 @@ void intel_frontbuffer_flush(struct drm_device *dev,intel_mark_fb_busy (dev, frontbuffer_bits,NULL ); -intel_psr_flush (dev, frontbuffer_bits); +if (INTEL_INFO (dev)->gen <9 ) +intel_psr_flush (dev, frontbuffer_bits);
I'm pretty sure the hw isn't good enough yet to detect everything, unfortunately the testcase is also not quite ready yet. In any case these changes should be moved into the inel_psr_* functions and in a separate patch.
Also someone needs to re-review the psr igt testcase to make sure it covers everything. Ville could do that too since he's done the fbc testcase.
-Daniel
Quoted 50 lines
drivers/gpu/drm/i915/intel_frontbuffer.c +0
-0/* * FIXME: Unconditional fbc flushing here is a rather gross hack and drivers/gpu/drm/i915/intel_psr.c +17
-2@@ -173,11 +173,24 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)I915_WRITE (EDP_PSR_AUX_DATA1 (dev) + i,intel_dp_pack_aux (&aux_msg[i],sizeof (aux_msg) - i)); -I915_WRITE (EDP_PSR_AUX_CTL (dev), +if (INTEL_INFO (dev)->gen >=9 ) { +uint32_t val; + + val =I915_READ (EDP_PSR_AUX_CTL (dev)); + val &= ~DP_AUX_CH_CTL_TIME_OUT_MASK ; + val |= DP_AUX_CH_CTL_TIME_OUT_1600us; + val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; + val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); +/* Use hardcoded data values for PSR */ + val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; +I915_WRITE (EDP_PSR_AUX_CTL (dev), val); + }else { +I915_WRITE (EDP_PSR_AUX_CTL (dev), DP_AUX_CH_CTL_TIME_OUT_400us | (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | (precharge <<DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT ) | (aux_clock_divider <<DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT )); + } }static void vlv_psr_enable_source (struct intel_dp *intel_dp)@@ -355,6 +368,9 @@ 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 ) +intel_psr_activate (intel_dp); }else {vlv_psr_setup_vsc (intel_dp); --1.7.10.4
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 87 lines · Daniel Vetter
Quoted 86 lines · Sonika Jindal
Mainly taking care of some register offsets, otherwise things are similar to hsw. Also, programming ddi aux to use hardcoded values for psr data select.
v2: introduce
EDP_PSR_AUX_BASEmacro (Chris)
v3: Moving to HW tracking for SKL+ platforms, so activating source psr duringpsr_enablingand then avoiding psr entries and exits for each frontbuffer updates.Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 19 +++++++++++++------ drivers/gpu/drm/i915/intel_frontbuffer.c | 7 +++++-- drivers/gpu/drm/i915/intel_psr.c | 18 +++++++++++++++++- 4 files changed, 37 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/i915_drv.h +2
-1@@ -2355,7 +2355,8 @@ struct drm_i915_cmd_table {#define HAS_DDI (dev) (INTEL_INFO(dev)->has_ddi)#define HAS_FPGA_DBG_UNCLAIMED (dev) (INTEL_INFO(dev)->has_fpga_dbg)#define HAS_PSR (dev) (IS_HASWELL(dev) || IS_BROADWELL(dev) || \ - IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) + IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev) || \ + IS_SKYLAKE(dev))#define HAS_RUNTIME_PM (dev) (IS_GEN6(dev) || IS_HASWELL(dev) || \ IS_BROADWELL(dev) || IS_VALLEYVIEW(dev))#define HAS_RC6 (dev) (INTEL_INFO(dev)->gen >= 6)drivers/gpu/drm/i915/i915_reg.h +13
-6@@ -2619,12 +2619,14 @@ enum skl_disp_power_wells {#define EDP_PSR_TP1_TIME_0us (3<<4)#define EDP_PSR_IDLE_FRAME_SHIFT 0 -#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_BASE(dev) + 0x10) -#define EDP_PSR_AUX_DATA1 (dev) (EDP_PSR_BASE(dev) + 0x14) -#define EDP_PSR_AUX_DATA2 (dev) (EDP_PSR_BASE(dev) + 0x18) -#define EDP_PSR_AUX_DATA3 (dev) (EDP_PSR_BASE(dev) + 0x1c) -#define EDP_PSR_AUX_DATA4 (dev) (EDP_PSR_BASE(dev) + 0x20) -#define EDP_PSR_AUX_DATA5 (dev) (EDP_PSR_BASE(dev) + 0x24) +#define EDP_PSR_AUX_BASE (dev) (INTEL_INFO(dev)->gen >= 9 ? \ + 0x64000 : EDP_PSR_BASE(dev)) +#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_AUX_BASE(dev) + 0x10) +#define EDP_PSR_AUX_DATA1 (dev) (EDP_PSR_AUX_BASE(dev) + 0x14) +#define EDP_PSR_AUX_DATA2 (dev) (EDP_PSR_AUX_BASE(dev) + 0x18) +#define EDP_PSR_AUX_DATA3 (dev) (EDP_PSR_AUX_BASE(dev) + 0x1c) +#define EDP_PSR_AUX_DATA4 (dev) (EDP_PSR_AUX_BASE(dev) + 0x20) +#define EDP_PSR_AUX_DATA5 (dev) (EDP_PSR_AUX_BASE(dev) + 0x24)#define EDP_PSR_STATUS_CTL (dev) (EDP_PSR_BASE(dev) + 0x40)#define EDP_PSR_STATUS_STATE_MASK (7<<29)@@ -3771,6 +3773,11 @@ enum skl_disp_power_wells {#define DP_AUX_CH_CTL_PRECHARGE_TEST (1 << 11)#define DP_AUX_CH_CTL_BIT_CLOCK_2X_MASK (0x7ff)#define DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT 0 +#define DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL (1 << 14) +#define DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL (1 << 13) +#define DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL (1 << 12) +#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL_MASK (1f << 5) +#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (c) (((c) - 1) << 5)#define DP_AUX_CH_CTL_SYNC_PULSE_SKL (c) ((c) - 1)/* drivers/gpu/drm/i915/intel_frontbuffer.c +3
-1@@ -156,7 +156,9 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,intel_mark_fb_busy (dev, obj->frontbuffer_bits, ring); -intel_psr_invalidate (dev, obj->frontbuffer_bits); + +if (INTEL_INFO (dev)->gen <9 ) +intel_psr_invalidate (dev, obj->frontbuffer_bits); }/** @@ -182,7 +184,8 @@ void intel_frontbuffer_flush(struct drm_device *dev,intel_mark_fb_busy (dev, frontbuffer_bits,NULL );
Quoted 7 lines
drivers/gpu/drm/i915/intel_frontbuffer.c void intel_frontbuffer_flush(struct drm_device *dev, · line 188
Quoted 3 lines
drivers/gpu/drm/i915/intel_frontbuffer.c +2
-1-intel_psr_flush (dev, frontbuffer_bits); +if (INTEL_INFO (dev)->gen <9 ) +intel_psr_flush (dev, frontbuffer_bits);I'm pretty sure the hw isn't good enough yet to detect everything, unfortunately the testcase is also not quite ready yet. In any case these changes should be moved into the inel_psr_* functions and in a separate patch.
When ubuntu boots up and stops at the login screen, the text I enter comes slowly, looks like psr exit and entry is not very prompt at that time.
But when I try with SW tracking, I see that PSR doesn't get enabled at all at that point! Also, I don't see calls to frontbuffer invalidate and flush at that point. So, with SW tracking too we will have cases where we don't enter psr.
Any inputs on why frontbuffer calls are not received during login screen?
Please note that after login, it works fine if I type something on the terminal or do some other things.
Quoted 47 lines
Also someone needs to re-review the psr igt testcase to make sure it covers everything. Ville could do that too since he's done the fbc testcase.
-DanielQuoted 42 lines
drivers/gpu/drm/i915/intel_frontbuffer.c +0
-0/* * FIXME: Unconditional fbc flushing here is a rather gross hack and drivers/gpu/drm/i915/intel_psr.c +17
-1@@ -173,11 +173,24 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)I915_WRITE (EDP_PSR_AUX_DATA1 (dev) + i,intel_dp_pack_aux (&aux_msg[i],sizeof (aux_msg) - i)); -I915_WRITE (EDP_PSR_AUX_CTL (dev), +if (INTEL_INFO (dev)->gen >=9 ) { +uint32_t val; + + val =I915_READ (EDP_PSR_AUX_CTL (dev)); + val &= ~DP_AUX_CH_CTL_TIME_OUT_MASK ; + val |= DP_AUX_CH_CTL_TIME_OUT_1600us; + val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; + val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); +/* Use hardcoded data values for PSR */ + val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; +I915_WRITE (EDP_PSR_AUX_CTL (dev), val); + }else { +I915_WRITE (EDP_PSR_AUX_CTL (dev), DP_AUX_CH_CTL_TIME_OUT_400us | (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | (precharge <<DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT ) | (aux_clock_divider <<DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT )); + } }static void vlv_psr_enable_source (struct intel_dp *intel_dp)@@ -355,6 +368,9 @@ 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 ) +intel_psr_activate (intel_dp); }else {vlv_psr_setup_vsc (intel_dp);
Quoted 7 lines
Quoted 7 lines
--
1.7.10.4_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 104 lines · sonika
Quoted 87 lines · Daniel Vetter
Quoted 86 lines · Sonika Jindal
Mainly taking care of some register offsets, otherwise things are similar to hsw. Also, programming ddi aux to use hardcoded values for psr data select.
v2: introduce
EDP_PSR_AUX_BASEmacro (Chris)
v3: Moving to HW tracking for SKL+ platforms, so activating source psr duringpsr_enablingand then avoiding psr entries and exits for each frontbuffer updates.Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 19 +++++++++++++------ drivers/gpu/drm/i915/intel_frontbuffer.c | 7 +++++-- drivers/gpu/drm/i915/intel_psr.c | 18 +++++++++++++++++- 4 files changed, 37 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/i915_drv.h +2
-1@@ -2355,7 +2355,8 @@ struct drm_i915_cmd_table {#define HAS_DDI (dev) (INTEL_INFO(dev)->has_ddi)#define HAS_FPGA_DBG_UNCLAIMED (dev) (INTEL_INFO(dev)->has_fpga_dbg)#define HAS_PSR (dev) (IS_HASWELL(dev) || IS_BROADWELL(dev) || \ - IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) + IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev) || \ + IS_SKYLAKE(dev))#define HAS_RUNTIME_PM (dev) (IS_GEN6(dev) || IS_HASWELL(dev) || \ IS_BROADWELL(dev) || IS_VALLEYVIEW(dev))#define HAS_RC6 (dev) (INTEL_INFO(dev)->gen >= 6)drivers/gpu/drm/i915/i915_reg.h +13
-6@@ -2619,12 +2619,14 @@ enum skl_disp_power_wells {#define EDP_PSR_TP1_TIME_0us (3<<4)#define EDP_PSR_IDLE_FRAME_SHIFT 0 -#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_BASE(dev) + 0x10) -#define EDP_PSR_AUX_DATA1 (dev) (EDP_PSR_BASE(dev) + 0x14) -#define EDP_PSR_AUX_DATA2 (dev) (EDP_PSR_BASE(dev) + 0x18) -#define EDP_PSR_AUX_DATA3 (dev) (EDP_PSR_BASE(dev) + 0x1c) -#define EDP_PSR_AUX_DATA4 (dev) (EDP_PSR_BASE(dev) + 0x20) -#define EDP_PSR_AUX_DATA5 (dev) (EDP_PSR_BASE(dev) + 0x24) +#define EDP_PSR_AUX_BASE (dev) (INTEL_INFO(dev)->gen >= 9 ? \ + 0x64000 : EDP_PSR_BASE(dev)) +#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_AUX_BASE(dev) + 0x10) +#define EDP_PSR_AUX_DATA1 (dev) (EDP_PSR_AUX_BASE(dev) + 0x14) +#define EDP_PSR_AUX_DATA2 (dev) (EDP_PSR_AUX_BASE(dev) + 0x18) +#define EDP_PSR_AUX_DATA3 (dev) (EDP_PSR_AUX_BASE(dev) + 0x1c) +#define EDP_PSR_AUX_DATA4 (dev) (EDP_PSR_AUX_BASE(dev) + 0x20) +#define EDP_PSR_AUX_DATA5 (dev) (EDP_PSR_AUX_BASE(dev) + 0x24)#define EDP_PSR_STATUS_CTL (dev) (EDP_PSR_BASE(dev) + 0x40)#define EDP_PSR_STATUS_STATE_MASK (7<<29)@@ -3771,6 +3773,11 @@ enum skl_disp_power_wells {#define DP_AUX_CH_CTL_PRECHARGE_TEST (1 << 11)#define DP_AUX_CH_CTL_BIT_CLOCK_2X_MASK (0x7ff)#define DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT 0 +#define DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL (1 << 14) +#define DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL (1 << 13) +#define DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL (1 << 12) +#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL_MASK (1f << 5) +#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (c) (((c) - 1) << 5)#define DP_AUX_CH_CTL_SYNC_PULSE_SKL (c) ((c) - 1)/* drivers/gpu/drm/i915/intel_frontbuffer.c +3
-1@@ -156,7 +156,9 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,intel_mark_fb_busy (dev, obj->frontbuffer_bits, ring); -intel_psr_invalidate (dev, obj->frontbuffer_bits); + +if (INTEL_INFO (dev)->gen <9 ) +intel_psr_invalidate (dev, obj->frontbuffer_bits); }/** @@ -182,7 +184,8 @@ void intel_frontbuffer_flush(struct drm_device *dev,intel_mark_fb_busy (dev, frontbuffer_bits,NULL );Quoted 7 lines
drivers/gpu/drm/i915/intel_frontbuffer.c void intel_frontbuffer_flush(struct drm_device *dev, · line 188
Quoted 3 lines
drivers/gpu/drm/i915/intel_frontbuffer.c +2
-1-intel_psr_flush (dev, frontbuffer_bits); +if (INTEL_INFO (dev)->gen <9 ) +intel_psr_flush (dev, frontbuffer_bits);I'm pretty sure the hw isn't good enough yet to detect everything, unfortunately the testcase is also not quite ready yet. In any case these changes should be moved into the inel_psr_* functions and in a separate patch.
When ubuntu boots up and stops at the login screen, the text I enter comes slowly, looks like psr exit and entry is not very prompt at that time. But when I try with SW tracking, I see that PSR doesn't get enabled at all at that point!
Also, I don't see calls to frontbuffer invalidate and flush at that point. So, with SW tracking too we will have cases where we don't enter psr. Any inputs on why frontbuffer calls are not received during login screen?
Quoted 3 lines
Please note that after login, it works fine if I type something on the terminal or do some other
things.
I have no idea why or what exactly the ubuntu screen does in it's login function. Just please note that there are _lots_ more desktop environments on linux than just ubunut's flavour of gnome, so we really need to have that psr testcase working (which covers them all) instead of manual testing.
-Daniel
Quoted 55 lines
Quoted 54 lines
Also someone needs to re-review the psr igt testcase to make sure it covers everything. Ville could do that too since he's done the fbc testcase.
-DanielQuoted 49 lines
drivers/gpu/drm/i915/intel_frontbuffer.c +0
-0/* * FIXME: Unconditional fbc flushing here is a rather gross hack and drivers/gpu/drm/i915/intel_psr.c +17
-2@@ -173,11 +173,24 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)I915_WRITE (EDP_PSR_AUX_DATA1 (dev) + i,intel_dp_pack_aux (&aux_msg[i],sizeof (aux_msg) - i)); -I915_WRITE (EDP_PSR_AUX_CTL (dev), +if (INTEL_INFO (dev)->gen >=9 ) { +uint32_t val; + + val =I915_READ (EDP_PSR_AUX_CTL (dev)); + val &= ~DP_AUX_CH_CTL_TIME_OUT_MASK ; + val |= DP_AUX_CH_CTL_TIME_OUT_1600us; + val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; + val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); +/* Use hardcoded data values for PSR */ + val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; +I915_WRITE (EDP_PSR_AUX_CTL (dev), val); + }else { +I915_WRITE (EDP_PSR_AUX_CTL (dev), DP_AUX_CH_CTL_TIME_OUT_400us | (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | (precharge <<DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT ) | (aux_clock_divider <<DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT )); + } }static void vlv_psr_enable_source (struct intel_dp *intel_dp)@@ -355,6 +368,9 @@ 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 ) +intel_psr_activate (intel_dp); }else {vlv_psr_setup_vsc (intel_dp); --1.7.10.4
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Is somebody working on enhancing the psr testcase? -Sonika
-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Tuesday, January 20, 2015 3:20 PM
To: Jindal, Sonika
Cc: Daniel Vetter; intel-gfx; Vivi, Rodrigo
Subject: Re: [Intel-gfx] [PATCH] drm/i915/skl: Enabling PSR on Skylake
Quoted 108 lines · sonika
Quoted 91 lines · Daniel Vetter
Quoted 90 lines · Sonika Jindal
Mainly taking care of some register offsets, otherwise things are similar to hsw. Also, programming ddi aux to use hardcoded values for psr data select.
v2: introduce
EDP_PSR_AUX_BASEmacro (Chris)
v3: Moving to HW tracking for SKL+ platforms, so activating source psr duringpsr_enablingand then avoiding psr entries and exits for each frontbuffer updates.Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 19 +++++++++++++------ drivers/gpu/drm/i915/intel_frontbuffer.c | 7 +++++-- drivers/gpu/drm/i915/intel_psr.c | 18 +++++++++++++++++- 4 files changed, 37 insertions(+), 10 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex 42c69ca..ee5cd3b 100644drivers/gpu/drm/i915/i915_drv.h +2
-1@@ -2355,7 +2355,8 @@ struct drm_i915_cmd_table {#define HAS_DDI (dev) (INTEL_INFO(dev)->has_ddi)#define HAS_FPGA_DBG_UNCLAIMED (dev) (INTEL_INFO(dev)->has_fpga_dbg)#define HAS_PSR (dev) (IS_HASWELL(dev) || IS_BROADWELL(dev) || \ - IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) + IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev) || \ + IS_SKYLAKE(dev))#define HAS_RUNTIME_PM (dev) (IS_GEN6(dev) || IS_HASWELL(dev) || \ IS_BROADWELL(dev) || IS_VALLEYVIEW(dev))#define
HAS_RC6(dev)(INTEL_INFO(dev)->gen >= 6) diff --gita/drivers/gpu/drm/i915/i915_reg.hb/drivers/gpu/drm/i915/i915_reg.hindex a828cf5..068c8da 100644drivers/gpu/drm/i915/i915_reg.h +0
-1@@ -2619,12 +2619,14 @@ enum skl_disp_power_wells {#define EDP_PSR_TP1_TIME_0us (3<<4)#define EDP_PSR_IDLE_FRAME_SHIFT 0 -#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_BASE(dev) + 0x10) -#define
EDP_PSR_AUX_DATA1(dev)(EDP_PSR_BASE(dev)+0x14) -#defineEDP_PSR_AUX_DATA2(dev)(EDP_PSR_BASE(dev)+0x18) -#defineEDP_PSR_AUX_DATA3(dev)(EDP_PSR_BASE(dev)+0x1c) -#defineEDP_PSR_AUX_DATA4(dev)(EDP_PSR_BASE(dev)+0x20) -#defineEDP_PSR_AUX_DATA5(dev)(EDP_PSR_BASE(dev)+0x24)drivers/gpu/drm/i915/i915_reg.h +13
-0+#define EDP_PSR_AUX_BASE (dev) (INTEL_INFO(dev)->gen >= 9 ? \ + 0x64000 : EDP_PSR_BASE(dev)) +#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_AUX_BASE(dev) + 0x10) #define +EDP_PSR_AUX_DATA1(dev) (EDP_PSR_AUX_BASE(dev) + 0x14) #define +EDP_PSR_AUX_DATA2 (dev) (EDP_PSR_AUX_BASE(dev) + 0x18) #define +EDP_PSR_AUX_DATA3(dev) (EDP_PSR_AUX_BASE(dev) + 0x1c) #define +EDP_PSR_AUX_DATA4 (dev) (EDP_PSR_AUX_BASE(dev) + 0x20) #define +EDP_PSR_AUX_DATA5(dev) (EDP_PSR_AUX_BASE(dev) + 0x24)#define EDP_PSR_STATUS_CTL (dev) (EDP_PSR_BASE(dev) + 0x40)#define EDP_PSR_STATUS_STATE_MASK (7<<29)@@ -3771,6 +3773,11 @@ enum skl_disp_power_wells {#define DP_AUX_CH_CTL_PRECHARGE_TEST (1 << 11)#define DP_AUX_CH_CTL_BIT_CLOCK_2X_MASK (0x7ff)#define DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT 0 +#define DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL (1 << 14) +#define DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL (1 << 13) +#define DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL (1 << 12) +#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL_MASK (1f << 5) +#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (c) (((c) - 1) << 5)#define DP_AUX_CH_CTL_SYNC_PULSE_SKL (c) ((c) - 1)/* drivers/gpu/drm/i915/intel_frontbuffer.c +3
-1@@ -156,7 +156,9 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,intel_mark_fb_busy (dev, obj->frontbuffer_bits, ring); -intel_psr_invalidate (dev, obj->frontbuffer_bits); + +if (INTEL_INFO (dev)->gen <9 ) +intel_psr_invalidate (dev, obj->frontbuffer_bits); }/**
drivers/gpu/drm/i915/intel_frontbuffer.c +0
-0@@ -182,7 +184,8 @@ void intel_frontbuffer_flush(struct drm_device *dev,intel_mark_fb_busy (dev, frontbuffer_bits,NULL );Quoted 7 lines
drivers/gpu/drm/i915/intel_frontbuffer.c void intel_frontbuffer_flush(struct drm_device *dev, · line 188
Quoted 3 lines
drivers/gpu/drm/i915/intel_frontbuffer.c +2
-1-intel_psr_flush (dev, frontbuffer_bits); +if (INTEL_INFO (dev)->gen <9 ) +intel_psr_flush (dev, frontbuffer_bits);I'm pretty sure the hw isn't good enough yet to detect everything, unfortunately the testcase is also not quite ready yet. In any case these changes should be moved into the inel_psr_* functions and in a separate patch.
When ubuntu boots up and stops at the login screen, the text I enter comes slowly, looks like psr exit and entry is not very prompt at that time. But when I try with SW tracking, I see that PSR doesn't get enabled at all at that point!
Also, I don't see calls to frontbuffer invalidate and flush at that point. So, with SW tracking too we will have cases where we don't enter psr. Any inputs on why frontbuffer calls are not received during login screen?
Quoted 2 lines
Please note that after login, it works fine if I type something on the terminal or do some other things.
I have no idea why or what exactly the ubuntu screen does in it's login function. Just please note that there are _lots_ more desktop environments on linux than just ubunut's flavour of gnome, so we really need to have that psr testcase working (which covers them all) instead of manual testing. -Daniel
Quoted 47 lines
Quoted 47 lines
Also someone needs to re-review the psr igt testcase to make sure it covers everything. Ville could do that too since he's done the fbc testcase.
-DanielQuoted 42 lines
drivers/gpu/drm/i915/intel_frontbuffer.c +0
-0/* * FIXME: Unconditional fbc flushing here is a rather gross hack and diff --git
a/drivers/gpu/drm/i915/intel_psr.cb/drivers/gpu/drm/i915/intel_psr.c
index dd0e6e0..6d2cdb8 100644drivers/gpu/drm/i915/intel_psr.c +16
-2@@ -173,11 +173,24 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)I915_WRITE (EDP_PSR_AUX_DATA1 (dev) + i,intel_dp_pack_aux (&aux_msg[i],sizeof (aux_msg) - i)); -I915_WRITE (EDP_PSR_AUX_CTL (dev), +if (INTEL_INFO (dev)->gen >=9 ) { +uint32_t val; + + val =I915_READ (EDP_PSR_AUX_CTL (dev)); val &= + ~DP_AUX_CH_CTL_TIME_OUT_MASK ; val |= + DP_AUX_CH_CTL_TIME_OUT_1600us; val &= + ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) << +DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); +/* Use hardcoded data values for PSR */ val &= + ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; +I915_WRITE (EDP_PSR_AUX_CTL (dev), val); }else { +I915_WRITE (EDP_PSR_AUX_CTL (dev), DP_AUX_CH_CTL_TIME_OUT_400us | (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | (precharge <<DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT ) | (aux_clock_divider <<DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT )); + } } static void vlv_psr_enable_source(struct intel_dp *intel_dp) @@ -355,6 +368,9 @@ 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) + intel_psr_activate(intel_dp); } else {vlv_psr_setup_vsc (intel_dp);
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
--
1.7.10.4_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi Sonika, for the login screen my guess is that blinking cursor waiting for password blocks psr entry.
For test cases I started the test case enhancement but my psr work is paused this month for bug maintainance. Any help is welcome. I was planing also to take a look on new Paulo's fbc tests cases to see if we could use some pieces on PSR validation. might be worth to take a look.
But anyway, for HW tracking I would only consider when I use a KDE for a while without missing any screen updates and seeing perf counter increasing. But if you tell this is what happening I trust you and we can add support for that since it is disabled by default and validate that carefully also on SKL when trying to enable it by default everywhere.
I'm going to review the code more carefully later...
Quoted 189 lines · Sonika
Is somebody working on enhancing the psr testcase? -Sonika
-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Tuesday, January 20, 2015 3:20 PM
To: Jindal, Sonika
Cc: Daniel Vetter; intel-gfx; Vivi, Rodrigo
Subject: Re: [Intel-gfx] [PATCH] drm/i915/skl: Enabling PSR on SkylakeQuoted 108 lines · sonika
Quoted 91 lines · Daniel Vetter
Quoted 90 lines · Sonika Jindal
Mainly taking care of some register offsets, otherwise things are similar to hsw. Also, programming ddi aux to use hardcoded values for psr data select.
v2: introduce
EDP_PSR_AUX_BASEmacro (Chris)
v3: Moving to HW tracking for SKL+ platforms, so activating source psr duringpsr_enablingand then avoiding psr entries and exits for each frontbuffer updates.Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 19 +++++++++++++------ drivers/gpu/drm/i915/intel_frontbuffer.c | 7 +++++-- drivers/gpu/drm/i915/intel_psr.c | 18 +++++++++++++++++- 4 files changed, 37 insertions(+), 10 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex 42c69ca..ee5cd3b 100644drivers/gpu/drm/i915/i915_drv.h +2
-1@@ -2355,7 +2355,8 @@ struct drm_i915_cmd_table {#define HAS_DDI (dev) (INTEL_INFO(dev)->has_ddi)#define HAS_FPGA_DBG_UNCLAIMED (dev) (INTEL_INFO(dev)->has_fpga_dbg)#define HAS_PSR (dev) (IS_HASWELL(dev) || IS_BROADWELL(dev) || \ - IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) + IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev) || \ + IS_SKYLAKE(dev))#define HAS_RUNTIME_PM (dev) (IS_GEN6(dev) || IS_HASWELL(dev) || \ IS_BROADWELL(dev) || IS_VALLEYVIEW(dev))#define
HAS_RC6(dev)(INTEL_INFO(dev)->gen >= 6) diff --gita/drivers/gpu/drm/i915/i915_reg.hb/drivers/gpu/drm/i915/i915_reg.hindex a828cf5..068c8da 100644drivers/gpu/drm/i915/i915_reg.h +0
-1@@ -2619,12 +2619,14 @@ enum skl_disp_power_wells {#define EDP_PSR_TP1_TIME_0us (3<<4)#define EDP_PSR_IDLE_FRAME_SHIFT 0 -#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_BASE(dev) + 0x10) -#define
EDP_PSR_AUX_DATA1(dev)(EDP_PSR_BASE(dev)+0x14) -#defineEDP_PSR_AUX_DATA2(dev)(EDP_PSR_BASE(dev)+0x18) -#defineEDP_PSR_AUX_DATA3(dev)(EDP_PSR_BASE(dev)+0x1c) -#defineEDP_PSR_AUX_DATA4(dev)(EDP_PSR_BASE(dev)+0x20) -#defineEDP_PSR_AUX_DATA5(dev)(EDP_PSR_BASE(dev)+0x24)drivers/gpu/drm/i915/i915_reg.h +13
-0+#define EDP_PSR_AUX_BASE (dev) (INTEL_INFO(dev)->gen >= 9 ? \ + 0x64000 : EDP_PSR_BASE(dev)) +#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_AUX_BASE(dev) + 0x10) #define +EDP_PSR_AUX_DATA1(dev) (EDP_PSR_AUX_BASE(dev) + 0x14) #define +EDP_PSR_AUX_DATA2 (dev) (EDP_PSR_AUX_BASE(dev) + 0x18) #define +EDP_PSR_AUX_DATA3(dev) (EDP_PSR_AUX_BASE(dev) + 0x1c) #define +EDP_PSR_AUX_DATA4 (dev) (EDP_PSR_AUX_BASE(dev) + 0x20) #define +EDP_PSR_AUX_DATA5(dev) (EDP_PSR_AUX_BASE(dev) + 0x24)#define EDP_PSR_STATUS_CTL (dev) (EDP_PSR_BASE(dev) + 0x40)#define EDP_PSR_STATUS_STATE_MASK (7<<29)@@ -3771,6 +3773,11 @@ enum skl_disp_power_wells {#define DP_AUX_CH_CTL_PRECHARGE_TEST (1 << 11)#define DP_AUX_CH_CTL_BIT_CLOCK_2X_MASK (0x7ff)#define DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT 0 +#define DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL (1 << 14) +#define DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL (1 << 13) +#define DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL (1 << 12) +#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL_MASK (1f << 5) +#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (c) (((c) - 1) << 5)#define DP_AUX_CH_CTL_SYNC_PULSE_SKL (c) ((c) - 1)/* drivers/gpu/drm/i915/intel_frontbuffer.c +3
-1@@ -156,7 +156,9 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,intel_mark_fb_busy (dev, obj->frontbuffer_bits, ring); -intel_psr_invalidate (dev, obj->frontbuffer_bits); + +if (INTEL_INFO (dev)->gen <9 ) +intel_psr_invalidate (dev, obj->frontbuffer_bits); }/**
drivers/gpu/drm/i915/intel_frontbuffer.c +0
-0@@ -182,7 +184,8 @@ void intel_frontbuffer_flush(struct drm_device *dev,intel_mark_fb_busy (dev, frontbuffer_bits,NULL );Quoted 7 lines
drivers/gpu/drm/i915/intel_frontbuffer.c void intel_frontbuffer_flush(struct drm_device *dev, · line 188
Quoted 3 lines
drivers/gpu/drm/i915/intel_frontbuffer.c +2
-1-intel_psr_flush (dev, frontbuffer_bits); +if (INTEL_INFO (dev)->gen <9 ) +intel_psr_flush (dev, frontbuffer_bits);I'm pretty sure the hw isn't good enough yet to detect everything, unfortunately the testcase is also not quite ready yet. In any case these changes should be moved into the inel_psr_* functions and in a separate patch.
When ubuntu boots up and stops at the login screen, the text I enter comes slowly, looks like psr exit and entry is not very prompt at that time. But when I try with SW tracking, I see that PSR doesn't get enabled at all at that point!
Also, I don't see calls to frontbuffer invalidate and flush at that point. So, with SW tracking too we will have cases where we don't enter psr. Any inputs on why frontbuffer calls are not received during login screen?Quoted 2 lines
Please note that after login, it works fine if I type something on the terminal or do some other things.
I have no idea why or what exactly the ubuntu screen does in it's login function. Just please note that there are _lots_ more desktop environments on linux than just ubunut's flavour of gnome, so we really need to have that psr testcase working (which covers them all) instead of manual testing. -Daniel
Quoted 47 lines
Quoted 47 lines
Also someone needs to re-review the psr igt testcase to make sure it covers everything. Ville could do that too since he's done the fbc testcase.
-DanielQuoted 42 lines
drivers/gpu/drm/i915/intel_frontbuffer.c +0
-0/* * FIXME: Unconditional fbc flushing here is a rather gross hack and diff --git
a/drivers/gpu/drm/i915/intel_psr.cb/drivers/gpu/drm/i915/intel_psr.c
index dd0e6e0..6d2cdb8 100644drivers/gpu/drm/i915/intel_psr.c +16
-2@@ -173,11 +173,24 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)I915_WRITE (EDP_PSR_AUX_DATA1 (dev) + i,intel_dp_pack_aux (&aux_msg[i],sizeof (aux_msg) - i)); -I915_WRITE (EDP_PSR_AUX_CTL (dev), +if (INTEL_INFO (dev)->gen >=9 ) { +uint32_t val; + + val =I915_READ (EDP_PSR_AUX_CTL (dev)); val &= + ~DP_AUX_CH_CTL_TIME_OUT_MASK ; val |= + DP_AUX_CH_CTL_TIME_OUT_1600us; val &= + ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) << +DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); +/* Use hardcoded data values for PSR */ val &= + ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; +I915_WRITE (EDP_PSR_AUX_CTL (dev), val); }else { +I915_WRITE (EDP_PSR_AUX_CTL (dev), DP_AUX_CH_CTL_TIME_OUT_400us | (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | (precharge <<DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT ) | (aux_clock_divider <<DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT )); + } } static void vlv_psr_enable_source(struct intel_dp *intel_dp) @@ -355,6 +368,9 @@ 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) + intel_psr_activate(intel_dp); } else {vlv_psr_setup_vsc (intel_dp);Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
--
1.7.10.4_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 2 lines · Rodrigo Vivi
Hi Sonika, for the login screen my guess is that blinking cursor waiting for password blocks psr entry.
But I thought it is the psr exit which is taking time which is why it takes time to actually show up the characters
Quoted 5 lines
For test cases I started the test case enhancement but my psr work is paused this month for bug maintainance. Any help is welcome. I was planing also to take a look on new Paulo's fbc tests cases to see if we could use some pieces on PSR validation. might be worth to take a look.
Can we test scenarios like delayed psr exits (like the one I mentioned) with test case? If yes, I can work with you offline to enhance the igt.
Quoted 6 lines
But anyway, for HW tracking I would only consider when I use a KDE for a while without missing any screen updates and seeing perf counter increasing. But if you tell this is what happening I trust you and we can add support for that since it is disabled by default and validate that carefully also on SKL when trying to enable it by default everywhere.
Hmm, I have not tested with KDE yet. I have been testing with ubuntu with gnome. And it works very smooth there. I will do more experiments with KDE too.
Quoted 191 lines
I'm going to review the code more carefully later...
Quoted 185 lines · Sonika
Is somebody working on enhancing the psr testcase? -Sonika
-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Tuesday, January 20, 2015 3:20 PM
To: Jindal, Sonika
Cc: Daniel Vetter; intel-gfx; Vivi, Rodrigo
Subject: Re: [Intel-gfx] [PATCH] drm/i915/skl: Enabling PSR on SkylakeQuoted 107 lines · sonika
Quoted 91 lines · Daniel Vetter
Quoted 90 lines · Sonika Jindal
Mainly taking care of some register offsets, otherwise things are similar to hsw. Also, programming ddi aux to use hardcoded values for psr data select.
v2: introduce
EDP_PSR_AUX_BASEmacro (Chris)
v3: Moving to HW tracking for SKL+ platforms, so activating source psr duringpsr_enablingand then avoiding psr entries and exits for each frontbuffer updates.Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 19 +++++++++++++------ drivers/gpu/drm/i915/intel_frontbuffer.c | 7 +++++-- drivers/gpu/drm/i915/intel_psr.c | 18 +++++++++++++++++- 4 files changed, 37 insertions(+), 10 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex 42c69ca..ee5cd3b 100644drivers/gpu/drm/i915/i915_drv.h +2
-1@@ -2355,7 +2355,8 @@ struct drm_i915_cmd_table {#define HAS_DDI (dev) (INTEL_INFO(dev)->has_ddi)#define HAS_FPGA_DBG_UNCLAIMED (dev) (INTEL_INFO(dev)->has_fpga_dbg)#define HAS_PSR (dev) (IS_HASWELL(dev) || IS_BROADWELL(dev) || \ - IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) + IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev) || \ + IS_SKYLAKE(dev))#define HAS_RUNTIME_PM (dev) (IS_GEN6(dev) || IS_HASWELL(dev) || \ IS_BROADWELL(dev) || IS_VALLEYVIEW(dev))#define
HAS_RC6(dev)(INTEL_INFO(dev)->gen >= 6) diff --gita/drivers/gpu/drm/i915/i915_reg.hb/drivers/gpu/drm/i915/i915_reg.hindex a828cf5..068c8da 100644drivers/gpu/drm/i915/i915_reg.h +0
-1@@ -2619,12 +2619,14 @@ enum skl_disp_power_wells {#define EDP_PSR_TP1_TIME_0us (3<<4)#define EDP_PSR_IDLE_FRAME_SHIFT 0 -#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_BASE(dev) + 0x10) -#define
EDP_PSR_AUX_DATA1(dev)(EDP_PSR_BASE(dev)+0x14) -#defineEDP_PSR_AUX_DATA2(dev)(EDP_PSR_BASE(dev)+0x18) -#defineEDP_PSR_AUX_DATA3(dev)(EDP_PSR_BASE(dev)+0x1c) -#defineEDP_PSR_AUX_DATA4(dev)(EDP_PSR_BASE(dev)+0x20) -#defineEDP_PSR_AUX_DATA5(dev)(EDP_PSR_BASE(dev)+0x24)drivers/gpu/drm/i915/i915_reg.h +13
-0+#define EDP_PSR_AUX_BASE (dev) (INTEL_INFO(dev)->gen >= 9 ? \ + 0x64000 : EDP_PSR_BASE(dev)) +#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_AUX_BASE(dev) + 0x10) #define +EDP_PSR_AUX_DATA1(dev) (EDP_PSR_AUX_BASE(dev) + 0x14) #define +EDP_PSR_AUX_DATA2 (dev) (EDP_PSR_AUX_BASE(dev) + 0x18) #define +EDP_PSR_AUX_DATA3(dev) (EDP_PSR_AUX_BASE(dev) + 0x1c) #define +EDP_PSR_AUX_DATA4 (dev) (EDP_PSR_AUX_BASE(dev) + 0x20) #define +EDP_PSR_AUX_DATA5(dev) (EDP_PSR_AUX_BASE(dev) + 0x24)#define EDP_PSR_STATUS_CTL (dev) (EDP_PSR_BASE(dev) + 0x40)#define EDP_PSR_STATUS_STATE_MASK (7<<29)@@ -3771,6 +3773,11 @@ enum skl_disp_power_wells {#define DP_AUX_CH_CTL_PRECHARGE_TEST (1 << 11)#define DP_AUX_CH_CTL_BIT_CLOCK_2X_MASK (0x7ff)#define DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT 0 +#define DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL (1 << 14) +#define DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL (1 << 13) +#define DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL (1 << 12) +#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL_MASK (1f << 5) +#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (c) (((c) - 1) << 5)#define DP_AUX_CH_CTL_SYNC_PULSE_SKL (c) ((c) - 1)/* drivers/gpu/drm/i915/intel_frontbuffer.c +3
-1@@ -156,7 +156,9 @@ void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,intel_mark_fb_busy (dev, obj->frontbuffer_bits, ring); -intel_psr_invalidate (dev, obj->frontbuffer_bits); + +if (INTEL_INFO (dev)->gen <9 ) +intel_psr_invalidate (dev, obj->frontbuffer_bits); }/**
drivers/gpu/drm/i915/intel_frontbuffer.c +0
-0@@ -182,7 +184,8 @@ void intel_frontbuffer_flush(struct drm_device *dev,intel_mark_fb_busy (dev, frontbuffer_bits,NULL );Quoted 7 lines
drivers/gpu/drm/i915/intel_frontbuffer.c void intel_frontbuffer_flush(struct drm_device *dev, · line 188
Quoted 3 lines
drivers/gpu/drm/i915/intel_frontbuffer.c +2
-1-intel_psr_flush (dev, frontbuffer_bits); +if (INTEL_INFO (dev)->gen <9 ) +intel_psr_flush (dev, frontbuffer_bits);I'm pretty sure the hw isn't good enough yet to detect everything, unfortunately the testcase is also not quite ready yet. In any case these changes should be moved into the inel_psr_* functions and in a separate patch.
When ubuntu boots up and stops at the login screen, the text I enter comes slowly, looks like psr exit and entry is not very prompt at that time. But when I try with SW tracking, I see that PSR doesn't get enabled at all at that point!
Also, I don't see calls to frontbuffer invalidate and flush at that point. So, with SW tracking too we will have cases where we don't enter psr. Any inputs on why frontbuffer calls are not received during login screen?Quoted 2 lines
Please note that after login, it works fine if I type something on the terminal or do some other things.
I have no idea why or what exactly the ubuntu screen does in it's login function. Just please note that there are _lots_ more desktop environments on linux than just ubunut's flavour of gnome, so we really need to have that psr testcase working (which covers them all) instead of manual testing. -Daniel
Quoted 47 lines
Quoted 47 lines
Also someone needs to re-review the psr igt testcase to make sure it covers everything. Ville could do that too since he's done the fbc testcase.
-DanielQuoted 42 lines
drivers/gpu/drm/i915/intel_frontbuffer.c +0
-0/* * FIXME: Unconditional fbc flushing here is a rather gross hack and diff --git
a/drivers/gpu/drm/i915/intel_psr.cb/drivers/gpu/drm/i915/intel_psr.c
index dd0e6e0..6d2cdb8 100644drivers/gpu/drm/i915/intel_psr.c +16
-2@@ -173,11 +173,24 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)I915_WRITE (EDP_PSR_AUX_DATA1 (dev) + i,intel_dp_pack_aux (&aux_msg[i],sizeof (aux_msg) - i)); -I915_WRITE (EDP_PSR_AUX_CTL (dev), +if (INTEL_INFO (dev)->gen >=9 ) { +uint32_t val; + + val =I915_READ (EDP_PSR_AUX_CTL (dev)); val &= + ~DP_AUX_CH_CTL_TIME_OUT_MASK ; val |= + DP_AUX_CH_CTL_TIME_OUT_1600us; val &= + ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) << +DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); +/* Use hardcoded data values for PSR */ val &= + ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; +I915_WRITE (EDP_PSR_AUX_CTL (dev), val); }else { +I915_WRITE (EDP_PSR_AUX_CTL (dev), DP_AUX_CH_CTL_TIME_OUT_400us | (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | (precharge <<DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT ) | (aux_clock_divider <<DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT )); + } } static void vlv_psr_enable_source(struct intel_dp *intel_dp) @@ -355,6 +368,9 @@ 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) + intel_psr_activate(intel_dp); } else {vlv_psr_setup_vsc (intel_dp);Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
--
1.7.10.4_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Rodrigo Vivi
Hi Sonika, for the login screen my guess is that blinking cursor waiting for password blocks psr entry.
For test cases I started the test case enhancement but my psr work is paused this month for bug maintainance. Any help is welcome. I was planing also to take a look on new Paulo's fbc tests cases to see if we could use some pieces on PSR validation. might be worth to take a look.
Quoted 6 lines
But anyway, for HW tracking I would only consider when I use a KDE for a while without missing any screen updates and seeing perf counter increasing. But if you tell this is what happening I trust you and we can add support for that since it is disabled by default and validate that carefully also on SKL when trying to enable it by default everywhere.
I'm definitely leaning the other way: Before we take out the sw tracking for some platforms I want the full psr validation to be done (since otherwise no one will do it again and for skl+1 we have the same hilarious saga again). And if we figure out that the hw tracking has indeed become better and is now useful, then we can do the same thing like Paulo's fbc patches and ignore some sw invalidate events selectively. But only when the tests are solid, we're sure we have full coverage and that the hw really works for that use-case.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 16 lines · Daniel Vetter
Quoted 9 lines · Rodrigo Vivi
Hi Sonika, for the login screen my guess is that blinking cursor waiting for password blocks psr entry.
For test cases I started the test case enhancement but my psr work is paused this month for bug maintainance. Any help is welcome. I was planing also to take a look on new Paulo's fbc tests cases to see if we could use some pieces on PSR validation. might be worth to take a look.
Quoted 6 lines
But anyway, for HW tracking I would only consider when I use a KDE for a while without missing any screen updates and seeing perf counter increasing. But if you tell this is what happening I trust you and we can add support for that since it is disabled by default and validate that carefully also on SKL when trying to enable it by default everywhere.
Quoted 9 lines
I'm definitely leaning the other way: Before we take out the sw tracking for some platforms I want the full psr validation to be done (since otherwise no one will do it again and for skl+1 we have the same hilarious saga again). And if we figure out that the hw tracking has indeed become better and is now useful, then we can do the same thing like Paulo's fbc patches and ignore some sw invalidate events selectively. But only when the tests are solid, we're sure we have full coverage and that the hw really works for that use-case.
-Daniel
Ok, I like the idea of selectively ignoring sw invalidates. And then PSR2's HW tracking will still hold good in those cases. I think we can have a module parameter (hw_tracking) instead of checking for platform everywhere.
Please let me know if it sounds better.
-Sonika
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 27 lines · sonika
Quoted 16 lines · Daniel Vetter
Quoted 9 lines · Rodrigo Vivi
Hi Sonika, for the login screen my guess is that blinking cursor waiting for password blocks psr entry.
For test cases I started the test case enhancement but my psr work is paused this month for bug maintainance. Any help is welcome. I was planing also to take a look on new Paulo's fbc tests cases to see if we could use some pieces on PSR validation. might be worth to take a look.
Quoted 6 lines
But anyway, for HW tracking I would only consider when I use a KDE for a while without missing any screen updates and seeing perf counter increasing. But if you tell this is what happening I trust you and we can add support for that since it is disabled by default and validate that carefully also on SKL when trying to enable it by default everywhere.
Quoted 9 lines
I'm definitely leaning the other way: Before we take out the sw tracking for some platforms I want the full psr validation to be done (since otherwise no one will do it again and for skl+1 we have the same hilarious saga again). And if we figure out that the hw tracking has indeed become better and is now useful, then we can do the same thing like Paulo's fbc patches and ignore some sw invalidate events selectively. But only when the tests are solid, we're sure we have full coverage and that the hw really works for that use-case.
-Daniel
Quoted 5 lines
Ok, I like the idea of selectively ignoring sw invalidates. And then PSR2's HW tracking will still hold good
in those cases. I think we can have a module parameter (hw_tracking) instead of checking for platform
everywhere.
I don't think a hw_tracking variable is all that useful, since I expect every platform to work slightly different. If you look at the psr code we already have some platform checks for specific issues (e.g. sprite flips don't invalidate on hsw but do on bdw). Imo much better to just have platform base checks which filter out specific sw-invalidate sources.
Please also look at Paulo's fbc series which adds more information to the invalidate callbacks so that we can filter more precisely. -Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx