drm/i915: Non-upstream ChromeOS patches from 3.8
Subsystems (2)
Hello All-
I'm trying to determine if the ChromeOS-only patches being carried by Google still make sense and are the right way to do things in the 3.11+ world, and Jesse asked me to forward the patches to the list for evaluation and potential upstreaming.
Thanks!
-James
[PATCH] drm/i915: Only apply the adaptive backlight modulation when [PATCH] drm/i915: Add a try limit to avoid infinite loops [PATCH] drm/i915: Add a timeout to a potentially infinite loop [PATCH] i915: Use 120MHz LVDS SSC clock for gen5/gen6/gen7 [PATCH] drm/i915: Make intel_dp_aux_native_read timeout [PATCH] drm/i915: Honor i915_min_freq post resume
[PATCH] Wake up DP sinks for DPCD read-based detection. [PATCH] Restrict DP sink wake up to non-EDP.
[PATCH] Fix display underruns on Pineview with 2048x1280 VGA display. [PATCH] CHROMIUM: drivers: i915: select non-alternate SSC frequency [PATCH] CHROMIUM: drivers: i915: Default backlight PWM frequency [PATCH] CHROMIUM: enable i915 power-saving render C-state 6 by [PATCH] CHROMIUM: drm/i915: Enable LVDS downclocking [PATCH] CHROMIUM: drm/i915: Reeneable FB compression and semaphores [PATCH] CHROMIUM: drm/i915: Adjust the down threshold. [PATCH] CHROMIUM: drm/i915: Adjust the RPS thresholds [PATCH] CHROMIUM: drm/i915: Move the backlight accessor functions in [PATCH] CHROMIUM: drm/i915: Add backlight support for Link [PATCH] CHROMIUM: drm/i915: set enable_rc6 to per-chip default. [PATCH] CHROMIUM: gpu: i915: optimize vblank timeout [PATCH] CHROMIUM: i915: Allow 0 level when turning on backlight. [PATCH] CHROMIUM: drm/i915: Check the current edp backlight state [PATCH] CHROMIUM: drm/i915: Workaround disappearing AVI Infoframe on [PATCH] CHROMIUM: Partial revert of
[PATCH] CHROMIUM: drm/i915: bounds check execbuffer relocations [PATCH] CHROMIUM: drm/i915: Improve RC6p stability
[PATCH] CHROMIUM: drm/i915/intel_i2c: enable 400kHz GMBUS for [PATCH] CHROMIUM: drm/i915/intel_i2c: Allow 400khz for cyapa [PATCH] CHROMIUM: drm/i915/intel_i2c: Allow 400khz for atmel mxt bl [PATCH] CHROMIUM: drm/i915: fix resume
[PATCH] CHROMIUM: drm/i915: Fix warning
[PATCH] CHROMIUM: drm/i915: Initialize the backlight when reported [PATCH] CHROMIUM: drm/i915: Don't evict bound object in the shrinker [PATCH] CHROMIUM: drm/i915/intel_drv: reduce wait_for polling time [PATCH] CHROMIUM: drm/i915: tune the RC6 timeout for stability [PATCH] CHROMIUM: drm/i915: repin bound framebuffers on resume [PATCH] CHROMIUM: i915: fix max backlight in normal mode [PATCH] CHROMIUM: drm/i915: Tune the rc6 value again [PATCH] CHROMIUM: drm/i915: Work around PPT chipsets wakeup delays [PATCH] CHROMIUM: drm/i915: set lower RC6_THRESHOLD for HSW [PATCH] CHROMIUM: drm/i915: set linetime WM based on target_clock [PATCH] CHROMIUM: drivers: i915: intel_hdmi deleted unused variable [PATCH] CHROMIUM: drm/i915: Increase the wakeup up delay for PPT [PATCH] CHROMIUM: drm/i915: Don't load boot context at init time on
PATCH 1/1 CHROMIUM: drm/i915: Add backlight support for Link
From: Stéphane Marchesin <[email protected]>
This adds device-specific backlight support for Link, and also enables adaptive backlight by default there.
BUG=chrome-os-partner:13276,chrome-os-partner:15248 TEST=by hand
Change-Id: I9ef546bba9f121657a653aa9cfc6a80bbde55cb0
Reviewed-on: https://gerrit.chromium.org/gerrit/36976
Commit-Ready: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 17 + drivers/gpu/drm/i915/i915_irq.c | 4 +- drivers/gpu/drm/i915/i915_reg.h | 22 ++ drivers/gpu/drm/i915/intel_adaptive_backlight.c | 401 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 24 ++ drivers/gpu/drm/i915/intel_drv.h | 3 + drivers/gpu/drm/i915/intel_fixedpoint.h | 143 +++++++++ drivers/gpu/drm/i915/intel_modes.c | 48 +++ drivers/gpu/drm/i915/intel_panel.c | 38 +++ 10 files changed, 700 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/i915/intel_adaptive_backlight.c create mode 100644 drivers/gpu/drm/i915/intel_fixedpoint.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -16,6 +16,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \ i915_gem_tiling.o \ i915_sysfs.o \ i915_trace_points.o \ + intel_adaptive_backlight.o \ intel_display.o \ intel_crt.o \ intel_lvds.o \
drivers/gpu/drm/i915/i915_drv.h +17 -0
@@ -711,6 +711,13 @@ typedef struct drm_i915_private {void (*disable_backlight)(struct drm_device *dev);void (*enable_backlight)(struct drm_device *dev,enum pipe pipe); +/* Adaptive backlight */ +bool adaptive_backlight_enabled; +int backlight_correction_level; +int backlight_correction_count; +int backlight_correction_direction; +int adaptive_backlight_panel_gamma;/* as 16.16 fixed point */ +/* Feature bits from the VBIOS */ unsigned int int_tv_support:1; unsigned int lvds_dither:1;
@@ -922,6 +929,9 @@ typedef struct drm_i915_private {struct drm_property *broadcast_rgb_property;struct drm_property *force_audio_property; +struct drm_property *adaptive_backlight_property; +struct drm_property *panel_gamma_property; +bool hw_contexts_disabled;uint32_t hw_context_size;
@@ -1627,6 +1637,13 @@ extern int i915_restore_state(struct drm_device *dev);void i915_setup_sysfs (struct drm_device *dev_priv);void i915_teardown_sysfs (struct drm_device *dev_priv); +/* intel_adaptive_backlight.c */ +extern void intel_adaptive_backlight (struct drm_device *dev,int pipe); +extern void intel_adaptive_backlight_enable (struct drm_i915_private *dev_priv); +extern void intel_adaptive_backlight_disable (struct drm_i915_private *dev_priv, +struct drm_connector *connector); +extern void intel_adaptive_backlight_setup (struct drm_device *dev); +/* intel_i2c.c */ extern int intel_setup_gmbus (struct drm_device *dev);extern void intel_teardown_gmbus (struct drm_device *dev);
drivers/gpu/drm/i915/i915_irq.c +3 -1
@@ -707,8 +707,10 @@ static irqreturn_t ivybridge_irq_handler(int irq, void *arg)intel_opregion_gse_intr (dev);for (i =0 ; i <3 ; i++) { -if (de_iir & (DE_PIPEA_VBLANK_IVB << (5 * i))) +if (de_iir & (DE_PIPEA_VBLANK_IVB << (5 * i))) {drm_handle_vblank (dev, i); +intel_adaptive_backlight (dev, i); + }if (de_iir & (DE_PLANEA_FLIP_DONE_IVB << (5 * i))) {intel_prepare_page_flip (dev, i);intel_finish_page_flip_plane (dev, i);
drivers/gpu/drm/i915/i915_reg.h +22 -0
@@ -1960,6 +1960,28 @@#define BLC_PWM_CPU_CTL2 0x48250#define BLC_PWM_CPU_CTL 0x48254 +#define BLM_HIST_CTL 0x48260 +#define ENH_HIST_ENABLE (1<<31) +#define ENH_MODIF_TBL_ENABLE (1<<30) +#define ENH_PIPE_A_SELECT (0<<29) +#define ENH_PIPE_B_SELECT (1<<29) +#define ENH_PIPE (pipe) _PIPE(pipe, ENH_PIPE_A_SELECT, ENH_PIPE_B_SELECT) +#define HIST_MODE_YUV (0<<24) +#define HIST_MODE_HSV (1<<24) +#define ENH_MODE_DIRECT (0<<13) +#define ENH_MODE_ADDITIVE (1<<13) +#define ENH_MODE_MULTIPLICATIVE (2<<13) +#define BIN_REGISTER_SET (1<<11) +#define ENH_NUM_BINS 32 + +#define BLM_HIST_ENH 0x48264 + +#define BLM_HIST_GUARD_BAND 0x48268 +#define BLM_HIST_INTR_ENABLE (1<<31) +#define BLM_HIST_EVENT_STATUS (1<<30) +#define BLM_HIST_INTR_DELAY_MASK (0xFF<<22) +#define BLM_HIST_INTR_DELAY_SHIFT 22 +/* PCH CTL1 is totally different, all but the below bits are reserved. CTL2 is * like the normal CTL from gen4 and earlier. Hooray for confusing naming. */ #define BLC_PWM_PCH_CTL1 0xc8250
drivers/gpu/drm/i915/intel_adaptive_backlight.c new file +401 -0
401 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp.c +24 -0
@@ -2442,6 +2442,23 @@ intel_dp_set_property(struct drm_connector *connector, goto done; } +if (property == dev_priv->adaptive_backlight_property) { + dev_priv->adaptive_backlight_enabled = !!val; + +if (dev_priv->adaptive_backlight_enabled) +intel_adaptive_backlight_enable (dev_priv); +else +intel_adaptive_backlight_disable (dev_priv, connector); + + goto done_nomodeset; + } + +if (property == dev_priv->panel_gamma_property) { + dev_priv->adaptive_backlight_panel_gamma = (u32 )val *65536 /100 ; + + goto done_nomodeset; + } +return -EINVAL ; done:
@@ -2451,6 +2468,7 @@ done: crtc->x, crtc->y, crtc->fb); } +done_nomodeset:return 0 ; }
@@ -2575,6 +2593,12 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connect DRM_MODE_SCALE_ASPECT); intel_connector->panel.fitting_mode =DRM_MODE_SCALE_ASPECT ; } + +if ((INTEL_INFO (connector->dev)->gen ==7 ) && + (connector->connector_type == DRM_MODE_CONNECTOR_eDP)) { +intel_attach_adaptive_backlight_property (connector); +intel_attach_panel_gamma_property (connector); + } } static void
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -423,6 +423,9 @@ int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter);extern void intel_attach_force_audio_property (struct drm_connector *connector);extern void intel_attach_broadcast_rgb_property (struct drm_connector *connector); +extern void +intel_attach_adaptive_backlight_property (struct drm_connector *connector); +extern void intel_attach_panel_gamma_property (struct drm_connector *connector);extern void intel_crt_init (struct drm_device *dev); extern void intel_hdmi_init(struct drm_device *dev,
drivers/gpu/drm/i915/intel_fixedpoint.h new file +143 -0
143 lines not on this page · raw message
drivers/gpu/drm/i915/intel_modes.c +48 -0
54 lines not on this page · raw message
drivers/gpu/drm/i915/intel_panel.c +38 -0
@@ -30,6 +30,7 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/dmi.h> #include <linux/moduleparam.h> #include "intel_drv.h" #include "i915_drv.h"
@@ -392,6 +393,23 @@ set_level:intel_panel_actually_set_backlight (dev, dev_priv->backlight_level); } +static int intel_link_backlight (const struct dmi_system_id *id) +{ +DRM_DEBUG_KMS ("Using Link backlight\n" ); +return 1 ; +} + +static const struct dmi_system_id link_dmi_table[] = { + { + .callback = intel_link_backlight, + .ident ="Link" , + .matches = { +DMI_MATCH (DMI_PRODUCT_NAME ,"Link" ), + }, + }, + { } +}; +static void intel_panel_init_backlight (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -404,6 +422,26 @@ static void intel_panel_init_backlight(struct drm_device *dev) dev_priv->backlight_level = dev_priv->get_backlight (dev); dev_priv->backlight_enabled = dev_priv->backlight_level !=0 ; + +if (dmi_check_system (link_dmi_table)) { +struct drm_connector *connector; +bool found = false; +/* Find the connector */ +list_for_each_entry (connector, + &dev->mode_config.connector_list, + head) +if (connector->connector_type == + DRM_MODE_CONNECTOR_eDP) { + found = true; +break ; + } + +if (found) { +intel_adaptive_backlight_setup (dev); +intel_attach_adaptive_backlight_property (connector); +intel_attach_panel_gamma_property (connector); + } + } }enum drm_connector_status
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: Partial revert of 24929352481f085c5f85d4d4cbc919ddf106d381
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
This is a partial revert of:
drm/i915: read out the modeset hw state at load and resume time which fixes modeset on boot on alex on 3.8.
BUG=chromium-os:38961
TEST=boot alex with 3.8, see a picture
Change-Id: Id6efac800f4007ded759d237af5643d94ad839c3
--- drivers/gpu/drm/i915/intel_display.c | 105 ++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 50 deletions(-)
drivers/gpu/drm/i915/intel_display.c +55 -50
@@ -7514,6 +7514,60 @@ free_work:return ret; } +static void intel_sanitize_modesetting (struct drm_device *dev, +int pipe,int plane) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +u32 reg, val; +int i; + +/* Clear any frame start delays used for debugging left by the BIOS */ +for_each_pipe (i) { + reg =PIPECONF (i); +I915_WRITE (reg,I915_READ (reg) & ~PIPECONF_FRAME_START_DELAY_MASK ); + } + +if (HAS_PCH_SPLIT (dev)) +return ; + +/* Who knows what state these registers were left in by the BIOS or +* grub? +* +* If we leave the registers in a conflicting state (e.g. with the +* display plane reading from the other pipe than the one we intend +* to use) then when we attempt to teardown the active mode, we will +* not disable the pipes and planes in the correct order -- leaving +* a plane reading from a disabled pipe and possibly leading to +* undefined behaviour. +*/ + + reg =DSPCNTR (plane); + val =I915_READ (reg); + +if ((val &DISPLAY_PLANE_ENABLE ) ==0 ) +return ; +if (!!(val &DISPPLANE_SEL_PIPE_MASK ) == pipe) +return ; + +/* This display plane is active and attached to the other CPU pipe. */ + pipe = !pipe; + +/* Disable the plane and wait for it to stop reading from the pipe. */ +intel_disable_plane (dev_priv, plane, pipe); +intel_disable_pipe (dev_priv, pipe); +} + +static void intel_crtc_reset (struct drm_crtc *crtc) +{ +struct drm_device *dev = crtc->dev; +struct intel_crtc *intel_crtc =to_intel_crtc (crtc); + +/* We need to fix up any BIOS configuration that conflicts with +* our expectations. +*/ +intel_sanitize_modesetting (dev, intel_crtc->pipe, intel_crtc->plane); +} +static struct drm_crtc_helper_funcs intel_helper_funcs = { .mode_set_base_atomic = intel_pipe_set_base_atomic, .load_lut = intel_crtc_load_lut,
@@ -8296,6 +8350,7 @@ out_config: }static const struct drm_crtc_funcs intel_crtc_funcs = { + .reset = intel_crtc_reset, .cursor_set = intel_crtc_cursor_set, .cursor_move = intel_crtc_cursor_move, .gamma_set = intel_crtc_gamma_set,
@@ -9040,25 +9095,6 @@ static void intel_enable_pipe_a(struct drm_device *dev) } -static bool -intel_check_plane_mapping (struct intel_crtc *crtc) -{ -struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; -u32 reg, val; - -if (dev_priv->num_pipe ==1 ) -return true; - - reg =DSPCNTR (!crtc->plane); - val =I915_READ (reg); - -if ((val &DISPLAY_PLANE_ENABLE ) && - (!!(val &DISPPLANE_SEL_PIPE_MASK ) == crtc->pipe)) -return false; - -return true; -} -static void intel_sanitize_crtc (struct intel_crtc *crtc) {struct drm_device *dev = crtc->base.dev;
@@ -9069,37 +9105,6 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc) reg =PIPECONF (crtc->cpu_transcoder);I915_WRITE (reg,I915_READ (reg) & ~PIPECONF_FRAME_START_DELAY_MASK ); -/* We need to sanitize the plane -> pipe mapping first because this will -* disable the crtc (and hence change the state) if it is wrong. Note -* that gen4+ has a fixed plane -> pipe mapping. */ -if (INTEL_INFO (dev)->gen <4 && !intel_check_plane_mapping (crtc)) { -struct intel_connector *connector; -bool plane; - -DRM_DEBUG_KMS ("[CRTC:%d] wrong plane connection detected!\n" , - crtc->base.base.id); - -/* Pipe has the wrong plane attached and the plane is active. -* Temporarily change the plane mapping and disable everything -* ... */ - plane = crtc->plane; - crtc->plane = !plane; - dev_priv->display.crtc_disable (&crtc->base); - crtc->plane = plane; - -/* ... and break all links. */ -list_for_each_entry (connector, &dev->mode_config.connector_list, - base.head) { -if (connector->encoder->base.crtc != &crtc->base) -continue ; - -intel_connector_break_all_links (connector); - } - -WARN_ON (crtc->active); - crtc->base.enabled = false; - } -if (dev_priv->quirks &QUIRK_PIPEA_FORCE && crtc->pipe ==PIPE_A && !crtc->active) {/* BIOS forgot to enable pipe A, this mostly happens after
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915: bounds check execbuffer relocations
In reply to [email protected]From: Kees Cook <[email protected]>
It is possible to wrap the counter used to allocate the buffer for relocation copies. This could lead to heap writing overflows.
BUG=chromium-os:39733
TEST=link build, PoC fails
[sending upstream]
Reviewed-on: https://gerrit.chromium.org/gerrit/45118
--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/i915_gem_execbuffer.c +4 -0
@@ -706,6 +706,7 @@ validate_exec_list(struct drm_i915_gem_exec_object2 *exec, int count) {int i; +int total =0 ;for (i =0 ; i < count; i++) {char __user *ptr = (char __user *)(uintptr_t )exec[i].relocs_ptr;
@@ -715,6 +716,9 @@ validate_exec_list(struct drm_i915_gem_exec_object2 *exec,if (exec[i].relocation_count >INT_MAX /sizeof (struct drm_i915_gem_relocation_entry ))return -EINVAL ; +if (exec[i].relocation_count >INT_MAX - total) +return -EINVAL ; + total += exec[i].relocation_count; length = exec[i].relocation_count *sizeof (struct drm_i915_gem_relocation_entry );
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915: Improve RC6p stability
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
When the CPU is loaded and the GPU tries to switch RC6p modes, the GPU sometimes gets stuck in RC6p mode and doesn't come out of it. I suspect that our voltage rail is too weak and sometimes falls behind.
This change throttles down the number of RC6p transitions we do to appease it.
The change also disables clock gating which seems to help. Upstream commit which does that is 0f846f81a154cc1818416918d22939bda73da194 (drm/i915: disable RCBP and VDS unit clock gating on SNB and VL)
I tested this on multiple Link machines for hours. The number of RC6 problems went down from ~ one every 15 minutes to ~ one every 25 hours. So this is not a complete solution, but I suspect there might be another, more difficult to reproduce, problem. In any case it reduces the issue significantly, to the point where we might be able to forget about it.
I measured the power usage on idle before/after this patch and saw no difference. Obviously when the GPU load varies, it will consume more power since it now takes more time to adapt.
Also note that not all machines seem to react equally. Some crash fairly often, and some less often. So this will improve the situation to different extents for different people.
BUG=chrome-os-partner:16886,chrome-os-partner:11474
TEST=ran the factory stress test (RunIn.Stress) on multiple Link machines for TEST=about 100 hours, saw only 4 RC6 crashes.
Change-Id: I1135d90e2a155424388d23c6e0879a210b4a0146 [sonnyrao: 3.8: parts upstream, move RC6p_THRESHOLD change to intel_pm.c]
Reviewed-on: https://gerrit.chromium.org/gerrit/42084
Commit-Queue: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -2573,7 +2573,7 @@ static void gen6_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC_SLEEP ,0 );I915_WRITE (GEN6_RC1e_THRESHOLD,1000 );I915_WRITE (GEN6_RC6_THRESHOLD ,50000 ); -I915_WRITE (GEN6_RC6p_THRESHOLD,100000 ); +I915_WRITE (GEN6_RC6p_THRESHOLD,150000 );I915_WRITE (GEN6_RC6pp_THRESHOLD,64000 );/* unused */ /* Check if we are enabling RC6 */
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915/intel_i2c: enable 400kHz GMBUS for atmel_mxt devices
In reply to [email protected]From: Daniel Kurtz <[email protected]>
i915 gmbus writes at 400kHz should now work properly.
So, enable 400kHz and the native gmbus algorithm by default, but limit to known high speed devices:
* atmel_mxt devices on vga ddc
* atmel_mxt devices (app mode and bootloader) on panel ddc
After further testing, this can be enabled for all devices and ddc adapters.
BUG=chromium-os:26118,chrome-os-partner:8547,chrome-os-partner:8732 TEST=compiles clean; i915 driver successfully communicates to i2c devices
on the vga and panel ddc adapters.
Tested using an atmel i2c touchpad and atmel_mxt_ts driver.
TEST=place valid atmel mxt firmware at /lib/firmware/maxtouch.fw
time echo 1 > update_fw
Check that firmware update succeeds, and that the time is less than 18s. time echo 1 > update_fw
real 0m17.923s
user 0m0.000s
sys 0m0.188s
This is a squash of three commits onto v3.4-rc5+danvet/intel-drm-next:
Change-Id: Id911a732409b06a4b0a654270d548929e2887582
Reviewed-on: https://gerrit.chromium.org/gerrit/17938
Change-Id: Ide237fbe6c33b17395d8398af1b691db69eb3036
Reviewed-on: https://gerrit.chromium.org/gerrit/18425
Change-Id: Ic5741b98b30c522acd3bee0a92041e08993e950e
Reviewed-on: https://gerrit.chromium.org/gerrit/21833
--- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_i2c.c | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -865,6 +865,7 @@#define GMBUS_RATE_50KHZ (1<<8)#define GMBUS_RATE_400KHZ (2<<8)/* reserved on Pineview */ #define GMBUS_RATE_1MHZ (3<<8)/* reserved on Pineview */ +#define GMBUS_RATE_MASK (3<<8)#define GMBUS_HOLD_EXT (1<<7)/* 300ns hold time, rsvd on Pineview */ #define GMBUS_PORT_DISABLED 0#define GMBUS_PORT_SSC 1
@@ -875,6 +876,7 @@#define GMBUS_PORT_DPD 6/* HDMID */ #define GMBUS_PORT_RESERVED 7/* 7 reserved */ #define GMBUS_NUM_PORTS (GMBUS_PORT_DPD - GMBUS_PORT_SSC + 1) +#define GMBUS_PORT_MASK 7#define GMBUS1 0x5104/* command/status */ #define GMBUS_SW_CLR_INT (1<<31)#define GMBUS_SW_RDY (1<<30)
drivers/gpu/drm/i915/intel_i2c.c +9 -1
@@ -332,6 +332,7 @@ gmbus_xfer(struct i2c_adapter *adapter,struct drm_i915_private *dev_priv = bus->dev_priv;int i, reg_offset;int ret =0 ; +u32 gmbus0;mutex_lock (&dev_priv->gmbus_mutex);
@@ -342,7 +343,14 @@ gmbus_xfer(struct i2c_adapter *adapter, reg_offset = dev_priv->gpio_mmio_base; -I915_WRITE (GMBUS0 + reg_offset, bus->reg0); +/* Hack to use 400kHz only for atmel_mxt i2c devices on ddc ports */ + gmbus0 = bus->reg0; +if (((gmbus0 &GMBUS_PORT_MASK ) ==GMBUS_PORT_VGADDC && + msgs[0 ].addr ==0x4b ) || + ((gmbus0 &GMBUS_PORT_MASK ) ==GMBUS_PORT_PANEL && + (msgs[0 ].addr ==0x4a || msgs[0 ].addr ==0x26 ))) + gmbus0 = (gmbus0 & ~GMBUS_RATE_MASK ) |GMBUS_RATE_400KHZ ; +I915_WRITE (GMBUS0 + reg_offset, gmbus0);for (i =0 ; i < num; i++) {u32 gmbus2;
Signature · 1 line
1.8.3.2
PATCH 1/1 CHROMIUM: drm/i915/intel_i2c: Allow 400khz for cyapa
In reply to [email protected]From: Benson Leung <[email protected]>
Allow 400khz mode on port2, VGADDC address 0x67 for cyapa i2c touchpads. This will improve firmware update speed.
BUG=chrome-os-partner:9798
TEST=time echo 1 > /sys/bus/i2c/devices/2-0067/update_fw Check that the update firmware succeeds, and the time taken was:
real 0m13.823s
user 0m0.000s
sys 0m0.121s
Reviewed-on: https://gerrit.chromium.org/gerrit/22990
--- drivers/gpu/drm/i915/intel_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_i2c.c +2 -2
@@ -343,10 +343,10 @@ gmbus_xfer(struct i2c_adapter *adapter, reg_offset = dev_priv->gpio_mmio_base; -/* Hack to use 400kHz only for atmel_mxt i2c devices on ddc ports */ +/* Hack to use 400kHz only for touch i2c devices on ddc ports */ gmbus0 = bus->reg0;if (((gmbus0 &GMBUS_PORT_MASK ) ==GMBUS_PORT_VGADDC && - msgs[0 ].addr ==0x4b ) || + (msgs[0 ].addr ==0x4b || msgs[0 ].addr ==0x67 )) || ((gmbus0 &GMBUS_PORT_MASK ) ==GMBUS_PORT_PANEL && (msgs[0 ].addr ==0x4a || msgs[0 ].addr ==0x26 ))) gmbus0 = (gmbus0 & ~GMBUS_RATE_MASK ) |GMBUS_RATE_400KHZ ;
Signature · 1 line
1.8.3.2
PATCH 1/1 CHROMIUM: drm/i915/intel_i2c: Allow 400khz for atmel mxt bl on VGADDC
In reply to [email protected]From: Benson Leung <[email protected]>
The atmel_mxt_ts bootloader mode can support 400khz operation successfully. Enable it for bootloader at address 0x25 on the VGADDC adapter.
BUG=chrome-os-partner:9994
TEST=place valid atmel mxt firmware at /lib/firmware/maxtouch.fw time echo 1 > update_fw
Check that firmware update succeeds, and that the time is less than 9s. time echo 1 > update_fw
real 0m8.450s
user 0m0.001s
sys 0m0.100s
Reviewed-on: https://gerrit.chromium.org/gerrit/23760
--- drivers/gpu/drm/i915/intel_i2c.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_i2c.c +4 -2
@@ -346,10 +346,12 @@ gmbus_xfer(struct i2c_adapter *adapter,/* Hack to use 400kHz only for touch i2c devices on ddc ports */ gmbus0 = bus->reg0;if (((gmbus0 &GMBUS_PORT_MASK ) ==GMBUS_PORT_VGADDC && - (msgs[0 ].addr ==0x4b || msgs[0 ].addr ==0x67 )) || + (msgs[0 ].addr ==0x4b || msgs[0 ].addr ==0x67 || + msgs[0 ].addr ==0x25 )) || ((gmbus0 &GMBUS_PORT_MASK ) ==GMBUS_PORT_PANEL && - (msgs[0 ].addr ==0x4a || msgs[0 ].addr ==0x26 ))) + (msgs[0 ].addr ==0x4a || msgs[0 ].addr ==0x26 ))) { gmbus0 = (gmbus0 & ~GMBUS_RATE_MASK ) |GMBUS_RATE_400KHZ ; + }I915_WRITE (GMBUS0 + reg_offset, gmbus0);for (i =0 ; i < num; i++) {
Signature · 1 line
1.8.3.2
PATCH 1/1 CHROMIUM: drm/i915: fix resume
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
i915 resume relies on vt switch in kernel 3.8.
This is wrong on systems which don't vt switch, like Chrome OS. Instead, we just save and restore the state properly across suspend/resume by:
- not disabling everthying on suspend
- forcing a modeset on resume
- forcing a restore of the cursor state
BUG=chromium:221562
TEST=display is on after resume and I see a cursor
Change-Id: I4b59e91ac4770b847aa0821d1fd5394d7176af3c
Reviewed-on: https://gerrit.chromium.org/gerrit/50922
Commit-Queue: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.c | 5 ++--- drivers/gpu/drm/i915/intel_display.c | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -3
@@ -483,8 +483,6 @@ static int i915_drm_freeze(struct drm_device *dev)cancel_delayed_work_sync (&dev_priv->rps.delayed_resume_work); -intel_modeset_disable (dev); -drm_irq_uninstall (dev); }
@@ -563,7 +561,8 @@ static int __i915_drm_thaw(struct drm_device *dev)mutex_unlock (&dev->struct_mutex);intel_modeset_init_hw (dev); -intel_modeset_setup_hw_state (dev, false); +intel_modeset_setup_hw_state (dev, true); +drm_irq_install (dev); }
drivers/gpu/drm/i915/intel_display.c +4 -0
@@ -9367,6 +9367,10 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, crtc =to_intel_crtc (dev_priv->pipe_to_crtc_mapping[pipe]);intel_set_mode (&crtc->base, &crtc->base.mode, crtc->base.x, crtc->base.y, crtc->base.fb); + +/* Force-cycle the cursor */ + crtc->cursor_visible = false; +intel_crtc_update_cursor (crtc, true); }i915_redisable_vga (dev);
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915: Fix warning
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
intel_crtc_update_cursor takes a drm_crtc but we were passing an intel_crtc. Fix the warning by passing the base class.
BUG=none
TEST=compiles and runs on link
Change-Id: I487ef1984f7957b47bcc6e3edada8911224d8771
Reviewed-on: https://gerrit.chromium.org/gerrit/51383
Commit-Queue: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -9370,7 +9370,7 @@ void intel_modeset_setup_hw_state(struct drm_device *dev,/* Force-cycle the cursor */ crtc->cursor_visible = false; -intel_crtc_update_cursor (crtc, true); +intel_crtc_update_cursor (&crtc->base, true); }i915_redisable_vga (dev);
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915: Initialize the backlight when reported max is 0
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
The i915 driver stopped doing this in 3.8. Chrome OS machines rely on this initialization since they don't have a VBIOS.
BUG=chromium:242552
TEST=by hand on a stumpy which doesn't run the vbios: the backlight is non-zero
Change-Id: Ia76238a1e93e89a4f1434e88edb431225062f0e1
Reviewed-on: https://gerrit.chromium.org/gerrit/56134
Commit-Queue: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/intel_panel.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_panel.c +1 -5
@@ -508,11 +508,7 @@ int intel_panel_setup_backlight(struct drm_connector *connector)memset (&props,0 ,sizeof (props)); props.type =BACKLIGHT_RAW ; - props.max_brightness =_intel_panel_get_max_backlight (dev); -if (props.max_brightness ==0 ) { -DRM_DEBUG_DRIVER ("Failed to get maximum backlight value\n" ); -return -ENODEV ; - } + props.max_brightness =intel_panel_get_max_backlight (dev); dev_priv->backlight = backlight_device_register("intel_backlight", &connector->kdev, dev,
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915/intel_drv: reduce wait_for polling time
In reply to [email protected]From: Daniel Kurtz <[email protected]>
Currently, 400kHz i2c transactions on i915 ddc adapters are gated by long polling loops in the wait_for() macro.
For the case where the polling loops sleep, make them tighter by converting a msleep(1) to usleep_range(50, 100);
A better solution might be to eliminate this polling entirely, and use the i915 interrupts to detect state transitions instead of polling.
BUG=chromium:246465
TEST=i2c reads over ddc succeed. On a scope, single transactions no
longer have large gaps.
Change-Id: I96cef50ed8a3d0ad8a3c6fa6f079234242fa17d3
Reviewed-on: https://gerrit.chromium.org/gerrit/17937
Commit-Ready: Daniel Kurtz <[email protected]>
Reviewed-on: https://gerrit.chromium.org/gerrit/57458
Commit-Queue: Yufeng Shen <[email protected]>
--- drivers/gpu/drm/i915/intel_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -42,7 +42,7 @@break ; \ } \if (W &&drm_can_sleep ()) { \ -msleep (W ); \ +usleep_range (W *50 ,W *100 ); \ }else { \cpu_relax (); \ } \
Signature · 1 line
1.8.3.2
PATCH 1/1 CHROMIUM: drm/i915: Don't evict bound object in the shrinker
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
Before swapping, the shrinker gets called on all drivers to try and reclaim some memory before resorting to disk access. For i915, the shrinker will eventually try to move objects out of the GTT to make them swappable. However when this happens too often, this will have two negative effects:
- once we have exhausted all the purgeable objects, the remaining objects will start bouncing in and out of the GTT as the rendering drags them in and the shrinker pulls them out
- the i915 shrinker needs to wait on the CPU for the GPU to complete pending rendering, which kills all asynchronicity
Those two things will slow down the system significantly as soon as we start hitting the shrinker. So in this patch, we change the shrinker to stop evicting in-use GTT objects. This avoids both issues.
BUG=none
TEST=compiles and runs, seems to behave better under memory pressure
Change-Id: Iadb3c28575aae015f0f4b7c16f02e1e7ec6ef95a
Reviewed-on: https://gerrit.chromium.org/gerrit/57367
Commit-Queue: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/i915_gem.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +8 -2
@@ -4402,8 +4402,14 @@ i915_gem_inactive_shrink(struct shrinker *shrinker, struct shrink_control *sc)if (nr_to_scan >0 ) nr_to_scan -=__i915_gem_shrink (dev_priv, nr_to_scan, false); -if (nr_to_scan >0 ) -i915_gem_shrink_all (dev_priv); + +/* We don't want to shrink all objects. When the shrinker is +* called too often, this causes bouncing of GEM objects in +* and out of the GTT, as well as GPU synchronization which +* slows the system to a crawl. +*/ +/*if (nr_to_scan > 0) +i915_gem_shrink_all(dev_priv);*/ } cnt =0 ;
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915: tune the RC6 timeout for stability
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
It's basically the same deal as the RC6+ issues on ivy bridge
(https://gerrit.chromium.org/gerrit/#/c/42655/) except this time with RC6 on sandy bridge. Like last time the core of the issue is that the existing timings don't work 100% with our voltage regulator, so once in a couple suspend/resumes the kernel will print a warning message about the GPU not getting out of RC6.
Luckily this time the shared timings are already working (from the ivy bridge work) so we only need to adjust the one RC6-specific timing, GEN6_RC6_THRESHOLD.
Just like with the RC6+ change, I couldn't see any measurable power difference with an idle lumpy.
BUG=chromium:235116
TEST=ran the power_Resume a bunch on stumpy, didn't see an RC6 error TEST=tested lumpy for power regressions on idle
Change-Id: I0e1be040e0e156cd38d6c396e237d4a01a16a6a2
Reviewed-on: https://gerrit.chromium.org/gerrit/57868
Commit-Queue: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -2572,7 +2572,7 @@ static void gen6_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC_SLEEP ,0 );I915_WRITE (GEN6_RC1e_THRESHOLD,1000 ); -I915_WRITE (GEN6_RC6_THRESHOLD ,50000 ); +I915_WRITE (GEN6_RC6_THRESHOLD ,150000 );I915_WRITE (GEN6_RC6p_THRESHOLD,150000 );I915_WRITE (GEN6_RC6pp_THRESHOLD,64000 );/* unused */
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915: repin bound framebuffers on resume
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
During suspend/resume all fences are reset, including their pin count which is reset to 0. However a framebuffer can be bound across suspend/resume, which means that after the buffer is unbound on resume, the pin count for the buffer will be negative. Since the fence pin count is now negative when available and zero when in use, the buffer's fence will get recycled when the fence is in use which is the opposite of what we want. The adverse effect is that since the fence is recycled the tiling mode goes away while the buffer is being displayed and we get lines/screens of garbage.
To fix this, we reallocate and repin the fences for all bound fbs on resume, which ensures the pin count is right.
v2: Only repin the fence pin count, not the gem buffer pin count
BUG=chromium:219172,chromium:225056
TEST=by hand, suspend/resume on alex, the artifacts are gone
Reviewed-on: https://gerrit.chromium.org/gerrit/47933
Reviewed-on: https://gerrit.chromium.org/gerrit/57379
--- drivers/gpu/drm/i915/i915_drv.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +27 -0
@@ -452,6 +452,32 @@ bool i915_semaphore_is_enabled(struct drm_device *dev)return 1 ; } +/* Repin all fbs which are currently bound to a crtc on resume */ +static void i915_repin_bound_fbs (struct drm_device *dev) +{ +struct drm_crtc *crtc; +struct drm_i915_gem_object *obj; +int ret; + +list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { +if (!crtc || !crtc->fb) +continue ; + obj =to_intel_framebuffer (crtc->fb)->obj; +if (!obj) +continue ; + +/* Install a fence for tiled scan-out. */ +if (obj->tiling_mode !=I915_TILING_NONE ) { + ret =i915_gem_object_get_fence (obj); +if (ret) +DRM_ERROR ("Couldn't get a fence\n" ); +else +i915_gem_object_pin_fence (obj); + } + + } +} +static int i915_drm_freeze (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -550,6 +576,7 @@ static int __i915_drm_thaw(struct drm_device *dev) error =i915_gem_init_hw (dev);mutex_unlock (&dev->struct_mutex); +i915_repin_bound_fbs (dev);intel_modeset_init_hw (dev);intel_modeset_setup_hw_state (dev, true);
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: i915: fix max backlight in normal mode
In reply to [email protected]From: Sonny Rao <[email protected]>
Fix the setting of max backlight value in the case where there's no VBIOS. The earlier port of CHROMIUM: drivers: i915: Default backlight PWM frequency missed this case.
BUG=chromium:244616
TEST=test lumpy at max brightness and make sure the backlight stays on
Reviewed-on: https://gerrit.chromium.org/gerrit/58337
--- drivers/gpu/drm/i915/intel_panel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_panel.c +1 -1
@@ -224,7 +224,7 @@ u32 intel_panel_get_max_backlight(struct drm_device *dev)* default backlight PWM settings. */ i915_set_default_max_backlight (dev); - max =i915_read_blc_pwm_ctl (dev); + max =_intel_panel_get_max_backlight (dev); }DRM_DEBUG_DRIVER ("max backlight PWM = %d\n" , max);
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915: Tune the rc6 value again
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
Apparently 150k doesn't work on snb. After probing the snb I have here, 125k is the max that the hardware seems to work with, and luckily it seems stable after 50 power_Resume runs. So let's use that.
BUG=chromium:251989
TEST=see rc6 residency go up in /sys/kernel/debug/dri/0/i915_drpc_info
Change-Id: Id78546f939c3d321760e2c32a894cb5ef4118998
Reviewed-on: https://gerrit.chromium.org/gerrit/59359
Commit-Queue: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -2572,7 +2572,7 @@ static void gen6_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC_SLEEP ,0 );I915_WRITE (GEN6_RC1e_THRESHOLD,1000 ); -I915_WRITE (GEN6_RC6_THRESHOLD ,150000 ); +I915_WRITE (GEN6_RC6_THRESHOLD ,125000 );I915_WRITE (GEN6_RC6p_THRESHOLD,150000 );I915_WRITE (GEN6_RC6pp_THRESHOLD,64000 );/* unused */
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915: Work around PPT chipsets wakeup delays
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
Right after resume, panther point chipsets seem to ignore all register writes. But if you wait a bit and retry, everything works fine. I empirically measured that the window where it is flakey lasts around 25ms, so let's sleep 30ms after turning on the PCH clock.
BUG=chrome-os-partner:20542
TEST=by hand: resume parrot a couple times, everything works as expected
Change-Id: I3281ff8ef5f43f6f73088a47500a557839acbdc0
Reviewed-on: https://gerrit.chromium.org/gerrit/60164
Commit-Queue: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/i915/intel_display.c +9 -0
@@ -4833,6 +4833,15 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)POSTING_READ (PCH_DREF_CONTROL );udelay (200 ); } + +/* +* On resume, the PPT PCH doesn't seem to work right away, and +* sometimes ignores register read/writes until it's completely up. +* Waiting 30ms seems to be long enough to avoid this. +*/ +if (dev_priv->pch_id ==INTEL_PCH_PPT_DEVICE_ID_TYPE ) +msleep (30 ); + }/* Sequence to enable CLKOUT_DP for FDI usage and configure PCH FDI I/O. */
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915: set lower RC6_THRESHOLD for HSW
In reply to [email protected]From: Sameer Nanda <[email protected]>
On Sandybridge/Ivybridge platforms, a higher RC6_THRESHOLD is required for stability reasons. On Haswell, however, this higher setting is resulting in an additional ~800mW of power consumption in light GPU usage scenarios such as blinking cursor. Lowering RC6_THRESHOLD to 50000 on Haswell does not seem to cause stability issues.
Therefore, on SNB/IVB keep the higher threshold for stability reasons, but on HSW use the default 50000 threshold for power saving reasons.
BUG=chrome-os-partner:20744
TEST=1. On SNB (lumpy) and IVB (link) systems, "intel_reg_read 0xa0b8" command should return 0x1E848.
2. On Haswell systems, "intel_reg_read 0xa0b8" command should return 0xC350.
Reviewed-on: https://gerrit.chromium.org/gerrit/61302
--- drivers/gpu/drm/i915/intel_pm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +4 -1
@@ -3166,7 +3166,10 @@ static void gen6_enable_rps(struct drm_device *dev)I915_WRITE (GEN6_RC_SLEEP ,0 );I915_WRITE (GEN6_RC1e_THRESHOLD,1000 ); -I915_WRITE (GEN6_RC6_THRESHOLD ,125000 ); +if (INTEL_INFO (dev)->gen <=6 ||IS_IVYBRIDGE (dev)) +I915_WRITE (GEN6_RC6_THRESHOLD ,125000 ); +else +I915_WRITE (GEN6_RC6_THRESHOLD ,50000 );I915_WRITE (GEN6_RC6p_THRESHOLD,150000 );I915_WRITE (GEN6_RC6pp_THRESHOLD,64000 );/* unused */
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drivers: i915: intel_hdmi deleted unused variable
In reply to [email protected]From: Paul Taysom <[email protected]>
drivers/gpu/drm/i915/intel_hdmi.c:785:27: warning: unused variable 'adjusted_mode' [-Wunused-variable]
Deleted unused variable, adjusted_mode.
BUG=chromium:237705
TEST=compile kernel and look for warnings.
Change-Id: I9407b3a54ebba0a7fba0f6e0d1db75ca45cd8acd
Reviewed-on: https://gerrit.chromium.org/gerrit/61996
Commit-Queue: Paul Taysom <[email protected]>
--- drivers/gpu/drm/i915/intel_hdmi.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/intel_hdmi.c +0 -1
@@ -782,7 +782,6 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, {struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&encoder->base);struct drm_device *dev = encoder->base.dev; -struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode;if (intel_hdmi->color_range) pipe_config->limited_color_range = true;
Signature · 1 line
1.8.3.2
PATCH 1/1 CHROMIUM: drm/i915: set linetime WM based on target_clock
In reply to [email protected]From: Sameer Nanda <[email protected]>
This is a regression from the initial i915 PC7 sandbox branch to the one that finally got merged. It is resulting in increased power draw of ~1W due to low PC7 residency. Pulling this in as a CHROMIUM fix for now till it gets resolved upstream.
BUG=chrome-os-partner:20840
TEST=Run "intel_reg_read 0x45270" command on a falco. It should come back with "0x45270 : 0x1C00A7".
Reviewed-on: https://gerrit.chromium.org/gerrit/61667
--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -2335,7 +2335,7 @@ hsw_compute_linetime_wm(struct drm_device *dev, struct drm_crtc *crtc)/* The WM are computed with base on how long it takes to fill a single * row at the given clock rate, multiplied by 8. * */ - linetime =DIV_ROUND_CLOSEST (mode->htotal *1000 *8 , mode->clock); + linetime =DIV_ROUND_CLOSEST (mode->htotal *1000 *8 , target_clock); ips_linetime =DIV_ROUND_CLOSEST (mode->htotal *1000 *8 ,intel_ddi_get_cdclk_freq (dev_priv));
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915: Increase the wakeup up delay for PPT
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
This is basically increasing the delay added by commit:
commit 1d20c4fb51f18461f385ab7f039f695d37b15958
Author: Stéphane Marchesin <[email protected]> Date: Wed Jun 26 15:17:11 2013 -0700
CHROMIUM: drm/i915: Work around PPT chipsets wakeup delays
As it seems the previous delay wasn't enough.
BUG=chrome-os-partner:21306
TEST=still works on parrot, but couldn't repro the original bug
Change-Id: I08d79f41ce1ddf0b6bcd0c620f19f7eb6dbe86c0
Reviewed-on: https://gerrit.chromium.org/gerrit/63399
Commit-Queue: Mohammed Habibulla <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -4837,10 +4837,10 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)/* * On resume, the PPT PCH doesn't seem to work right away, and * sometimes ignores register read/writes until it's completely up. -* Waiting 30ms seems to be long enough to avoid this. +* Waiting 60ms seems to be long enough to avoid this. */ if (dev_priv->pch_id ==INTEL_PCH_PPT_DEVICE_ID_TYPE ) -msleep (30 ); +msleep (60 ); }
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915: Don't load boot context at init time on SNB
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
This breaks video decode on SNB, so let's not do it.
BUG=chromium:260836
TEST=by hand, video works after resume
Change-Id: I059b022ba1379599f219ad0828e3b4d0e0195f0b
Reviewed-on: https://gerrit.chromium.org/gerrit/65431
Commit-Queue: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/intel_pm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +3 -2
@@ -4268,8 +4268,9 @@ static void gen6_init_clock_gating(struct drm_device *dev) ILK_DPFDUNIT_CLOCK_GATE_ENABLE);/* WaMbcDriverBootEnable */ -I915_WRITE (GEN6_MBCTL ,I915_READ (GEN6_MBCTL ) | -GEN6_MBCTL_ENABLE_BOOT_FETCH ); +/* This breaks video on resume */ +/* I915_WRITE(GEN6_MBCTL, I915_READ(GEN6_MBCTL) | +GEN6_MBCTL_ENABLE_BOOT_FETCH);*/ for_each_pipe (pipe) { I915_WRITE(DSPCNTR(pipe),
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Only apply the adaptive backlight modulation when it is enabled.
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
Otherwise things go very, very dark.
BUG=chromium-os:33854
TEST=by hand
Change-Id: I3122447a255652ba5c98863664c0f60e1859c490
Reviewed-on: https://gerrit.chromium.org/gerrit/31293
Commit-Ready: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/intel_panel.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_panel.c +3 -0
@@ -289,6 +289,9 @@ static void intel_panel_actually_set_backlight(struct drm_device *dev, u32 levelstruct drm_i915_private *dev_priv = dev->dev_private;u32 tmp; +if (dev_priv->adaptive_backlight_enabled) + level = level * dev_priv->backlight_correction_level >>8 ; +DRM_DEBUG_DRIVER ("set backlight PWM = %d\n" , level); level =intel_panel_compute_brightness (dev, level);
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Add a try limit to avoid infinite loops
In reply to [email protected]From: Chris Wolfe <[email protected]>
Unfortunately some combinations of hardware seem to generate successful communications on the aux channel, which always report deferred. As a result native_write can wind up in an infinite loop.
This hack adds a large (~10ms) retry limit to avoid a kernel panic, while hopefully minimizing the impact on working hardware.
BUG=chromium-os:34840
TEST=Manually connect DP to VGA adapter to problem system. Added display
powers up and works normally, rather than black screen and reboot.
Change-Id: Ib1b0001ca8004e65c9c5e353dbdb5e252fd88438
Reviewed-on: https://gerrit.chromium.org/gerrit/34203
Commit-Ready: Chris Wolfe <[email protected]>
--- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +6 -1
@@ -491,6 +491,7 @@ intel_dp_aux_native_write(struct intel_dp *intel_dp,uint8_t msg[20 ];int msg_bytes;uint8_t ack; +int try;intel_dp_check_edp (intel_dp);if (send_bytes >16 )
@@ -501,7 +502,7 @@ intel_dp_aux_native_write(struct intel_dp *intel_dp, msg[3 ] = send_bytes -1 ;memcpy (&msg[4 ], send, send_bytes); msg_bytes = send_bytes +4 ; -for (;;) { +for (try =0 ; try <100 ; try++) { ret =intel_dp_aux_ch (intel_dp, msg, msg_bytes, &ack,1 );if (ret <0 )return ret;
@@ -512,6 +513,10 @@ intel_dp_aux_native_write(struct intel_dp *intel_dp,else return -EIO ; } +if (try ==100 ) { +DRM_ERROR ("too many retries, giving up\n" ); +return -EREMOTEIO ; + }return send_bytes; }
Signature · 1 line
1.8.3.2
Re: [PATCH] drm/i915: Add a try limit to avoid infinite loops
Quoted 46 lines · On Thu, Aug 15, 2013 at 05:30:27PM -0700, [email protected] wrote:
From: Chris Wolfe <[email protected]>
Unfortunately some combinations of hardware seem to generate successful communications on the aux channel, which always report deferred. As a result
native_writecan wind up in an infinite loop.This hack adds a large (~10ms) retry limit to avoid a kernel panic, while hopefully minimizing the impact on working hardware.
Signed-off-by [email protected]BUG=chromium-os:34840
TEST=Manually connect DP to VGA adapter to problem system. Added display
powers up and works normally, rather than black screen and reboot.Change-Id: Ib1b0001ca8004e65c9c5e353dbdb5e252fd88438
Reviewed-on: https://gerrit.chromium.org/gerrit/34203
Commit-Ready: Chris Wolfe <[email protected]>Reviewed-by Chris Wolfe <[email protected]>Tested-by Chris Wolfe <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_dp.c +2
-1@@ -491,6 +491,7 @@ intel_dp_aux_native_write(struct intel_dp *intel_dp,uint8_t msg[20 ];int msg_bytes;uint8_t ack; +int try;intel_dp_check_edp (intel_dp);if (send_bytes >16 )@@ -501,7 +502,7 @@ intel_dp_aux_native_write(struct intel_dp *intel_dp, msg[3 ] = send_bytes -1 ;memcpy (&msg[4 ], send, send_bytes); msg_bytes = send_bytes +4 ; -for (;;) { +for (try =0 ; try <100 ; try++) { ret =intel_dp_aux_ch (intel_dp, msg, msg_bytes, &ack,1 );if (ret <0 )return ret;
drivers/gpu/drm/i915/intel_dp.c intel_dp_aux_native_write(struct intel_dp *intel_dp, · line 519
Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c +4
-0@@ -512,6 +513,10 @@ intel_dp_aux_native_write(struct intel_dp *intel_dp,else return -EIO ; } +if (try ==100 ) { +DRM_ERROR ("too many retries, giving up\n" ); +return -EREMOTEIO ; + }
If we break out here, we need to reset the hw somewhere as it will still have the last command in the out queue.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
PATCH 1/1 drm/i915: Add a timeout to a potentially infinite loop
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
BUG=chromium:148595
TEST=by hand, connect a mac DP to VGA adapter, machine doesn't reboot.
Change-Id: I29d518a7e2d906291d75da58a0d4a7c6296658cc
Reviewed-on: https://gerrit.chromium.org/gerrit/33489
Commit-Ready: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/intel_dp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +8 -2
@@ -345,7 +345,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,int recv_bytes;uint32_t status;uint32_t aux_clock_divider; -int try, precharge; +int try, aux_ch_try, precharge;if (IS_HASWELL (dev)) {switch (intel_dig_port->port) {
@@ -428,7 +428,10 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,DP_AUX_CH_CTL_DONE |DP_AUX_CH_CTL_TIME_OUT_ERROR | DP_AUX_CH_CTL_RECEIVE_ERROR); -for (;;) { +/* Wait 1 ms then timeout, it should be sufficient since the +* timeout above is 400us +*/ +for (aux_ch_try =0 ; aux_ch_try <10 ; aux_ch_try++) { status =I915_READ (ch_ctl);if ((status &DP_AUX_CH_CTL_SEND_BUSY ) ==0 )break ;
@@ -448,6 +451,9 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,if (status &DP_AUX_CH_CTL_DONE )break ; } +/* If after 5 tries we're still busy, give up. */ +if ((status &DP_AUX_CH_CTL_SEND_BUSY ) !=0 ) +return -EIO ;if ((status &DP_AUX_CH_CTL_DONE ) ==0 ) {DRM_ERROR ("dp_aux_ch not done status 0x%08x\n" , status);
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 i915: Use 120MHz LVDS SSC clock for gen5/gen6/gen7
In reply to [email protected]From: Duncan Laurie <[email protected]>
We had been using a DMI table workaround to select the right frequency for devices, but this is fragile and must be updated with every new platform.
Instead the default case when VBT is missing is changed to use 120MHz clock for LVDS SSC for these generations.
The docs for 2010-Core, SandyBridge, and IvyBridge all indicate that the reference frequency for LVDS is 120MHz:
"2010 Core"
http://intellinuxgraphics.org/IHD_OS_Vol3_Part3r2.pdf
page 38
Reference Frequency: 120MHz for CRT and LVDS. 100MHz for the FDI.
"2011 SandyBridge"
http://intellinuxgraphics.org/documentation/SNB/IHD_OS_Vol3_Part3.pdf
page 33
Reference Frequency: 120MHz for CRT, HDMI, LVDS. 100MHz for the FDI.
"2012 IvyBridge"
http://intellinuxgraphics.org/documentation/IVB/IHD_OS_Vol3_Part4.pdf
page 27
Reference Frequency: 120 MHz for CRT, HDMI, LVDS, 100MHz for the FDI.
BUG=chrome-os-partner:11744
TEST=manual: boot on Lumpy and Parrot with and without VBIOS
Reviewed-on: https://gerrit.chromium.org/gerrit/28274
--- drivers/gpu/drm/i915/intel_bios.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/intel_bios.c +3 -12
@@ -631,17 +631,6 @@ parse_device_mapping(struct drm_i915_private *dev_priv,return ; } -static const struct dmi_system_id lvds_do_not_use_alternate_frequency[] = { - { - .callback =NULL , - .ident ="Lumpy" , - .matches = { -DMI_MATCH (DMI_PRODUCT_NAME ,"Lumpy" ), - } - }, - { } -}; -static void init_vbt_defaults (struct drm_i915_private *dev_priv) {
@@ -662,7 +651,9 @@ init_vbt_defaults(struct drm_i915_private *dev_priv)/* Default to using SSC */ dev_priv->lvds_use_ssc =1 ; -if (dmi_check_system (lvds_do_not_use_alternate_frequency)) + +/* Core/SandyBridge/IvyBridge use 120MHz reference clock for LVDS */ +if (HAS_PCH_SPLIT (dev)) dev_priv->lvds_ssc_freq =intel_bios_ssc_frequency (dev,0 );else dev_priv->lvds_ssc_freq =intel_bios_ssc_frequency (dev,1 );
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Make intel_dp_aux_native_read timeout
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
Some adapters return DEFER indefinitely, which results in being stuck in the kernel, which triggers the watchdog, which reboots. To avoid this, limit to 100 tries, after which we return an error and pring a message.
BUG=chrome-os-partner:15612
TEST=by hand, use the apple miniDP to dual-link adapter, plug a 30 inch TEST=monitor, the machine shouldn't reboot spontaneously (the monitor still TEST=won't work, but that is a separate bug).
Change-Id: I842f6edd0da3b67eab8613410bf61474fc40ba7a
Reviewed-on: https://gerrit.chromium.org/gerrit/39888
Commit-Ready: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/intel_dp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +5 -1
@@ -545,6 +545,7 @@ intel_dp_aux_native_read(struct intel_dp *intel_dp,int reply_bytes;uint8_t ack;int ret; +int try;intel_dp_check_edp (intel_dp); msg[0 ] =AUX_NATIVE_READ <<4 ;
@@ -555,7 +556,7 @@ intel_dp_aux_native_read(struct intel_dp *intel_dp, msg_bytes =4 ; reply_bytes = recv_bytes +1 ; -for (;;) { +for (try =0 ; try <100 ; try++) { ret =intel_dp_aux_ch (intel_dp, msg, msg_bytes, reply, reply_bytes);if (ret ==0 )
@@ -572,6 +573,9 @@ intel_dp_aux_native_read(struct intel_dp *intel_dp,else return -EIO ; } + +DRM_ERROR ("too many retries, giving up\n" ); +return -EREMOTEIO ; } static int
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Honor i915_min_freq post resume
In reply to [email protected]From: Sameer Nanda <[email protected]>
The i915_min_freq setting was not getting honored on the resume path. Fixed it.
BUG=chrome-os-partner:16439
TEST="cat /sys/kernel/debug/dri/0/i915_min_freq" and remember the value returned. Do a suspend/resume cycle. cat the i915_min_freq file again, it must return the same value as read earlier.
Reviewed-on: https://gerrit.chromium.org/gerrit/41461
--- drivers/gpu/drm/i915/intel_pm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +2 -1
@@ -30,6 +30,7 @@#include "intel_drv.h" #include "../../../platform/x86/intel_ips.h" #include <linux/module.h> +#include <linux/kernel.h> #define FORCEWAKE_ACK_TIMEOUT_MS 2
@@ -2637,7 +2638,7 @@ static void gen6_enable_rps(struct drm_device *dev)DRM_DEBUG_DRIVER ("Failed to set the min frequency\n" ); } -gen6_set_rps (dev_priv->dev, (gt_perf_status &0xff00 ) >>8 ); +gen6_set_rps (dev_priv->dev, (u8 )max ((gt_perf_status &0xff00 ) >>8 ,10u ));/* requires MSI enabled */ I915_WRITE (GEN6_PMIER ,GEN6_PM_DEFERRED_EVENTS );
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 Fix display underruns on Pineview with 2048x1280 VGA display.
In reply to [email protected]From: Stuart Abercrombie <[email protected]>
Higher dot clocks were working because pixel doubling was enabled.
Lower the apparently arbitrary threshold so it's enabled for 2048x1280.
Intel hasn't felt moved to document any of this, so this is purely empirical.
The original threshold was introduced here:
http://cgit.freedesktop.org/~anholt/xf86-video-intel/commit/?id=8fcf9a81179ee8577ddab5e904c58fbfd14cf59c
Change-Id: I1eff5db3f26fc2e7953edae9422047353f66f475
Reviewed-on: https://gerrit.chromium.org/gerrit/49896
Commit-Queue: Stuart Abercrombie <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -4805,14 +4805,14 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, dspcntr |=DISPPLANE_SEL_PIPE_B ;if (pipe ==0 &&INTEL_INFO (dev)->gen <4 ) { -/* Enable pixel doubling when the dot clock is > 90% of the (display) +/* Enable pixel doubling when the dot clock is > 85% of the (display) * core speed. * * XXX: No double-wide on 915GM pipe B. Is that the only reason for the * pipe == 0 check? */ if (mode->clock > - dev_priv->display.get_display_clock_speed (dev) *9 /10 ) + dev_priv->display.get_display_clock_speed (dev) *17 /20 ) pipeconf |=PIPECONF_DOUBLE_WIDE ;else pipeconf &= ~PIPECONF_DOUBLE_WIDE ;
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drivers: i915: Default backlight PWM frequency
In reply to [email protected]From: Simon Que <[email protected]>
If the firmware did not initialize the backlight PWM registers, set up a default PWM frequency of 200 Hz. This is determined using the following formula:
freq = refclk / (128 * pwm_max)
The PWM register allows the max PWM value to be set. So we want to use the formula, where freq = 200:
pwm_max = refclk / (128 * freq)
This patch will, in the case of missing PWM register initialization values, look for the reference clock frequency. Based on that, it sets an appropriate max PWM value for a frequency of 200 Hz.
If no refclk frequency is found, the max PWM will be zero, which results in no change to the PWM registers.
BUG=chrome-os-partner:5570
TEST=x86 backlight works smoothly w/o dev mode
Reviewed-on: https://gerrit.chromium.org/gerrit/11629
--- drivers/gpu/drm/i915/intel_panel.c | 39 ++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_panel.c +33 -6
@@ -35,6 +35,12 @@#define PCI_LBPC 0xf4/* legacy/combination backlight modes */ +/* These are used to calculate a reasonable default when firmware has not +* configured a maximum PWM frequency, with 200Hz as the current default target. +*/ +#define DEFAULT_BACKLIGHT_PWM_FREQ 200 +#define BACKLIGHT_REFCLK_DIVISOR 128 +void intel_fixed_panel_mode (struct drm_display_mode *fixed_mode,struct drm_display_mode *adjusted_mode)
@@ -130,13 +136,34 @@ static int is_backlight_combination_mode(struct drm_device *dev)return 0 ; } +static void i915_set_default_max_backlight (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +u32 refclk_freq_mhz =0 ; +u32 max_pwm; + +if (HAS_PCH_SPLIT (dev_priv->dev)) + refclk_freq_mhz =I915_READ (PCH_RAWCLK_FREQ ) &RAWCLK_FREQ_MASK ; +else if (dev_priv->lvds_use_ssc) + refclk_freq_mhz = dev_priv->lvds_ssc_freq; + + max_pwm = refclk_freq_mhz *1000000 / + (BACKLIGHT_REFCLK_DIVISOR *DEFAULT_BACKLIGHT_PWM_FREQ ); + +if (HAS_PCH_SPLIT (dev_priv->dev)) + dev_priv->regfile.saveBLC_PWM_CTL2 = max_pwm <<16 ; +else if (IS_PINEVIEW (dev_priv->dev)) + dev_priv->regfile.saveBLC_PWM_CTL = max_pwm <<17 ; +else + dev_priv->regfile.saveBLC_PWM_CTL = max_pwm <<16 ; +} +static u32 i915_read_blc_pwm_ctl (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;u32 val; -/* Restore the CTL value if it lost, e.g. GPU reset */ - +/* Restore the CTL value if it was lost, e.g. GPU reset */ if (HAS_PCH_SPLIT (dev_priv->dev)) { val =I915_READ (BLC_PWM_PCH_CTL2 );if (dev_priv->regfile.saveBLC_PWM_CTL2 ==0 ) {
@@ -191,11 +218,11 @@ u32 intel_panel_get_max_backlight(struct drm_device *dev) max =_intel_panel_get_max_backlight (dev);if (max ==0 ) { -/* XXX add code here to query mode clock or hardware clock -* and program max PWM appropriately. +/* If backlight PWM registers have not been set, set them to +* default backlight PWM settings. */ -pr_warn_once ("fixme: max PWM is zero\n" ); -return 1 ; +i915_set_default_max_backlight (dev); + max =i915_read_blc_pwm_ctl (dev); }DRM_DEBUG_DRIVER ("max backlight PWM = %d\n" , max);
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915: Reeneable FB compression and semaphores for kernel 3.2
In reply to [email protected]From: Simon Que <[email protected]>
marcheu added these changes in kernel 3.0:
https://gerrit.chromium.org/gerrit/12367
https://gerrit.chromium.org/gerrit/12368
They were undone in kernel 3.2. This patch restores them.
BUG=chromium-os:27468
TEST=power_x86Settings autotest passes with kernel 3.2
Reviewed-on: https://gerrit.chromium.org/gerrit/18687
--- drivers/gpu/drm/i915/i915_drv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +4 -4
@@ -58,10 +58,10 @@ module_param_named(powersave, i915_powersave, int, 0600);MODULE_PARM_DESC (powersave,"Enable powersavings, fbc, downclocking, etc. (default: true)" ); -int i915_semaphores__read_mostly =-1 ; +int i915_semaphores__read_mostly =1 ;module_param_named (semaphores, i915_semaphores, int,0600 );MODULE_PARM_DESC (semaphores, -"Use semaphores for inter-ring sync (default: -1 (use per-chip defaults))" ); +"Use semaphores for inter-ring sync (default: true)" );int i915_enable_rc6__read_mostly =1 ;module_param_named (i915_enable_rc6, i915_enable_rc6, int,0600 );
@@ -72,11 +72,11 @@ MODULE_PARM_DESC(i915_enable_rc6,"For example, 3 would enable rc6 and deep rc6, and 7 would enable everything. " "default: -1 (use per-chip default)"); -int i915_enable_fbc__read_mostly =-1 ; +int i915_enable_fbc__read_mostly =1 ;module_param_named (i915_enable_fbc, i915_enable_fbc, int,0600 );MODULE_PARM_DESC (i915_enable_fbc,"Enable frame buffer compression for power savings " -"(default: -1 (use per-chip default))" ); +"(default: true)" );unsigned int i915_lvds_downclock__read_mostly =1 ;module_param_named (lvds_downclock, i915_lvds_downclock, int,0400 );
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] CHROMIUM: drm/i915: Reeneable FB compression and semaphores for kernel 3.2
Quoted 7 lines · On Thu, Aug 15, 2013 at 05:30:39PM -0700, [email protected] wrote:
From: Simon Que <[email protected]>
marcheu added these changes in kernel 3.0:
https://gerrit.chromium.org/gerrit/12367
https://gerrit.chromium.org/gerrit/12368They were undone in kernel 3.2. This patch restores them.
They were disabled with good reason.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
PATCH 1/1 CHROMIUM: drm/i915: Adjust the down threshold.
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
The thresholds for GPU reclocking are highly asymetrical. This creates an interesting phenomenon on Chrome startup where the clock ramps up very quickly, and then the blinking cursor is enough to keep it up. Obviously having the max GPU clock on the login screen is very bad for thermals.
With this change, the clock goes back to its minimum frequency after a couple of seconds.
BUG=chrome-os-partner:11009
TEST=checked that a blinking cursor lets the GPU clock go back to 350Mhz
Change-Id: I3b8de74864907abdb3c7c4aeb0ab4fcf2eaf0b2c
Reviewed-on: https://gerrit.chromium.org/gerrit/26641
Commit-Ready: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -2612,7 +2612,7 @@ static void gen6_enable_rps(struct drm_device *dev) dev_priv->rps.min_delay << 16);I915_WRITE (GEN6_RP_UP_THRESHOLD ,59400 ); -I915_WRITE (GEN6_RP_DOWN_THRESHOLD ,245000 ); +I915_WRITE (GEN6_RP_DOWN_THRESHOLD ,100000 );I915_WRITE (GEN6_RP_UP_EI ,66000 );I915_WRITE (GEN6_RP_DOWN_EI ,350000 );
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] CHROMIUM: drm/i915: Adjust the down threshold.
Quoted 9 lines · On Thu, Aug 15, 2013 at 05:30:40PM -0700, [email protected] wrote:
From: Stéphane Marchesin <[email protected]>
The thresholds for GPU reclocking are highly asymetrical. This creates an interesting phenomenon on Chrome startup where the clock ramps up very quickly, and then the blinking cursor is enough to keep it up. Obviously having the max GPU clock on the login screen is very bad for thermals.
With this change, the clock goes back to its minimum frequency after a couple of seconds.
You can drop the RPS changes as Stéphane has been feeding these back once he found (semi?) stable values.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
PATCH 1/1 CHROMIUM: drm/i915: Adjust the RPS thresholds
In reply to [email protected]From: Sean Paul <[email protected]>
Lower the RPS thresholds and make them symmetric. This patch increases the rate of change of the GPU clock, allowing it to clock up more quickly, and more importantly, clock down when necessary. The problem this patch solves is that a heavy workload would inflate the clock, and then the clock would stick high when the workload went away because the down threshold was too high. This should improve our thermals and power.
BUG=chrome-os-partner:11009
TEST=Tested with the PBS koala video, play it along with a GL demo to get the clock up to 1150MHz. Remove the GL demo workload and ensure the clock goes back down to 350MHz.
Reviewed-on: https://gerrit.chromium.org/gerrit/27184
--- drivers/gpu/drm/i915/intel_pm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +2 -2
@@ -2611,8 +2611,8 @@ static void gen6_enable_rps(struct drm_device *dev) dev_priv->rps.max_delay <<24 | dev_priv->rps.min_delay << 16); -I915_WRITE (GEN6_RP_UP_THRESHOLD ,59400 ); -I915_WRITE (GEN6_RP_DOWN_THRESHOLD ,100000 ); +I915_WRITE (GEN6_RP_UP_THRESHOLD ,0x4000 ); +I915_WRITE (GEN6_RP_DOWN_THRESHOLD ,0x4000 );I915_WRITE (GEN6_RP_UP_EI ,66000 );I915_WRITE (GEN6_RP_DOWN_EI ,350000 );
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 Wake up DP sinks for DPCD read-based detection.
In reply to [email protected]From: Stuart Abercrombie <[email protected]>
When in DPMS sleep state the Apple mini DP->VGA adapter doesn't respond. This led to no external display on boot.
v2: Avoid DPCD check and keep AUX awake for EDID read.
BUG=chrome-os-partner:17063
TEST=Straight DP and various adapters on mini-DP and DP platforms.
Change-Id: I90bea73006ae9c99464b0b5bc57f3803918313a8
Reviewed-on: https://gerrit.chromium.org/gerrit/42583
Commit-Queue: Stuart Abercrombie <[email protected]>
--- drivers/gpu/drm/i915/intel_dp.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +26 -6
@@ -1290,14 +1290,10 @@ static void ironlake_edp_pll_off(struct intel_dp *intel_dp) }/* If the sink supports it, try to set the power state appropriately */ -void intel_dp_sink_dpms (struct intel_dp *intel_dp,int mode) +static void intel_dp_do_sink_dpms (struct intel_dp *intel_dp,int mode) {int ret, i; -/* Should have a valid DPCD by this point */ -if (intel_dp->dpcd[DP_DPCD_REV ] <0x11 ) -return ; -if (mode !=DRM_MODE_DPMS_ON ) { ret =intel_dp_aux_native_write_1 (intel_dp,DP_SET_POWER ,DP_SET_POWER_D3 );
@@ -1319,6 +1315,16 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode) } } +/* If we have a valid DPCD, set the power state. */ +void intel_dp_sink_dpms (struct intel_dp *intel_dp,int mode) +{ +/* Should have a valid DPCD by this point */ +if (intel_dp->dpcd[DP_DPCD_REV ] <0x11 ) +return ; + +intel_dp_do_sink_dpms (intel_dp, mode); +} +static bool intel_dp_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe) {
@@ -2330,6 +2336,12 @@ intel_dp_detect(struct drm_connector *connector, bool force) intel_dp->has_audio = false; +/* Ensure the sink is awake for DPCD/EDID reads. */ +if (connector->dpms !=DRM_MODE_DPMS_ON ) { +/* Bypass DPCD check, since we obtain it during detection. */ +intel_dp_do_sink_dpms (intel_dp,DRM_MODE_DPMS_ON ); + } +if (HAS_PCH_SPLIT (dev)) status =ironlake_dp_detect (intel_dp);else
@@ -2339,8 +2351,11 @@ intel_dp_detect(struct drm_connector *connector, bool force) 32, 1, dpcd_hex_dump, sizeof(dpcd_hex_dump), false);DRM_DEBUG_KMS ("DPCD: %s\n" , dpcd_hex_dump); -if (status != connector_status_connected) +if (status != connector_status_connected) { +if (connector->dpms !=DRM_MODE_DPMS_ON ) +intel_dp_do_sink_dpms (intel_dp, connector->dpms);return status; + }intel_dp_probe_oui (intel_dp);
@@ -2356,6 +2371,11 @@ intel_dp_detect(struct drm_connector *connector, bool force)if (intel_encoder->type !=INTEL_OUTPUT_EDP ) intel_encoder->type =INTEL_OUTPUT_DISPLAYPORT ; + +/* Restore the sink state */ +if (connector->dpms !=DRM_MODE_DPMS_ON ) +intel_dp_do_sink_dpms (intel_dp, connector->dpms); +return connector_status_connected; }
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] Wake up DP sinks for DPCD read-based detection.
drivers/gpu/drm/i915/intel_dp.c intel_dp_detect(struct drm_connector *connector, bool force) · line 2339
Quoted 8 lines · On Thu, Aug 15, 2013 at 05:30:32PM -0700, [email protected] wrote:
static bool intel_dp_get_hw_state(struct
intel_encoder*encoder,drivers/gpu/drm/i915/intel_dp.c +1
-0enum pipe *pipe) {@@ -2330,6 +2336,12 @@ intel_dp_detect(struct drm_connector *connector, bool force) intel_dp->has_audio = false; +/* Ensure the sink is awake for DPCD/EDID reads. */
I would try using the force parameter to return the last known status to avoid the extra busy work.
Quoted 32 lines
drivers/gpu/drm/i915/intel_dp.c +14
-1+if (connector->dpms !=DRM_MODE_DPMS_ON ) { +/* Bypass DPCD check, since we obtain it during detection. */ +intel_dp_do_sink_dpms (intel_dp,DRM_MODE_DPMS_ON ); + } +if (HAS_PCH_SPLIT (dev)) status =ironlake_dp_detect (intel_dp);else @@ -2339,8 +2351,11 @@ intel_dp_detect(struct drm_connector *connector, bool force) 32, 1, dpcd_hex_dump, sizeof(dpcd_hex_dump), false);DRM_DEBUG_KMS ("DPCD: %s\n" , dpcd_hex_dump); -if (status != connector_status_connected) +if (status != connector_status_connected) { +if (connector->dpms !=DRM_MODE_DPMS_ON ) +intel_dp_do_sink_dpms (intel_dp, connector->dpms);return status; + }intel_dp_probe_oui (intel_dp);@@ -2356,6 +2371,11 @@ intel_dp_detect(struct drm_connector *connector, bool force)if (intel_encoder->type !=INTEL_OUTPUT_EDP ) intel_encoder->type =INTEL_OUTPUT_DISPLAYPORT ; + +/* Restore the sink state */ +if (connector->dpms !=DRM_MODE_DPMS_ON ) +intel_dp_do_sink_dpms (intel_dp, connector->dpms); +return connector_status_connected; }
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
PATCH 1/1 CHROMIUM: drivers: i915: select non-alternate SSC frequency for some systems
In reply to [email protected]From: Simon Que <[email protected]>
When initializing VBT default values, the alternate BIOS SSC frequency is selected. This patch allows the non-alternate frequency to be selected as a default, for specified systems. There is a DMI match list for systems that are to use the non-alternate frequency. Currently, only Lumpy is on the list.
BUG=chrome-os-partner:5525
TEST=Run on Lumpy with dev switch off. The display should be working, even if the backlight is not -- something should be visible.
Reviewed-on: https://gerrit.chromium.org/gerrit/11339
--- drivers/gpu/drm/i915/intel_bios.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_bios.c +15 -1
@@ -631,6 +631,17 @@ parse_device_mapping(struct drm_i915_private *dev_priv,return ; } +static const struct dmi_system_id lvds_do_not_use_alternate_frequency[] = { + { + .callback =NULL , + .ident ="Lumpy" , + .matches = { +DMI_MATCH (DMI_PRODUCT_NAME ,"Lumpy" ), + } + }, + { } +}; +static void init_vbt_defaults (struct drm_i915_private *dev_priv) {
@@ -651,7 +662,10 @@ init_vbt_defaults(struct drm_i915_private *dev_priv)/* Default to using SSC */ dev_priv->lvds_use_ssc =1 ; - dev_priv->lvds_ssc_freq =intel_bios_ssc_frequency (dev,1 ); +if (dmi_check_system (lvds_do_not_use_alternate_frequency)) + dev_priv->lvds_ssc_freq =intel_bios_ssc_frequency (dev,0 ); +else + dev_priv->lvds_ssc_freq =intel_bios_ssc_frequency (dev,1 );DRM_DEBUG_KMS ("Set default to SSC at %dMHz\n" , dev_priv->lvds_ssc_freq); }
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: enable i915 power-saving render C-state 6 by default.
In reply to [email protected]From: Todd Broch <[email protected]>
BUG=chrome-os-partner:6768
TEST=manual,
- boot kernel
1. cat /sys/module/i915/parameters/i915_enable_rc6
- should equal 1
2. start powertop, goto 'Idle Stats' tab
- make sure that the Package c-states (C6, C7) are entered at some non-trivial percentage when system is idle
Reviewed-on: https://gerrit.chromium.org/gerrit/12280
--- drivers/gpu/drm/i915/i915_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -2
@@ -63,8 +63,8 @@ module_param_named(semaphores, i915_semaphores, int, 0600);MODULE_PARM_DESC (semaphores,"Use semaphores for inter-ring sync (default: -1 (use per-chip defaults))" ); -int i915_enable_rc6__read_mostly =-1 ; -module_param_named (i915_enable_rc6, i915_enable_rc6, int,0400 ); +int i915_enable_rc6__read_mostly =1 ; +module_param_named (i915_enable_rc6, i915_enable_rc6, int,0600 );MODULE_PARM_DESC (i915_enable_rc6,"Enable power-saving render C-state 6. " "Different stages can be selected via bitmask values "
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] CHROMIUM: enable i915 power-saving render C-state 6 by default.
Quoted 11 lines · On Thu, Aug 15, 2013 at 05:30:37PM -0700, [email protected] wrote:
From: Todd Broch <[email protected]>
BUG=chrome-os-partner:6768
TEST=manual,
- boot kernel
1. cat/sys/module/i915/parameters/i915_enable_rc6
- should equal 1
2. start powertop, goto 'Idle Stats' tab
- make sure that the Package c-states (C6, C7) are entered at some non-trivial percentage when system is idle
Quoted 4 lines
Signed-off-by Todd Broch <[email protected]>Change-Id Ib557a14e3cf20b55a6670808e681ef21b1e0ed1bReviewed-on: https://gerrit.chromium.org/gerrit/12280
Reviewed-by Stéphane Marchesin <[email protected]>
Drop this patch. This is incorrect against upstream. -Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
PATCH 1/1 CHROMIUM: drm/i915: Enable LVDS downclocking
In reply to [email protected]From: Sean Paul <[email protected]>
Enable LVDS downclocking in the intel i915 graphics driver. This will save approximately 200mW when the screen is idle.
BUG=chromium-os:9803
TEST=Tested on alex and lumpy
Change-Id: I6fe403c8d9d520901a01549ad6b5eff80de318f3
Reviewed-on: https://gerrit.chromium.org/gerrit/14815
Commit-Ready: Sean Paul <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -78,7 +78,7 @@ MODULE_PARM_DESC(i915_enable_fbc,"Enable frame buffer compression for power savings " "(default: -1 (use per-chip default))"); -unsigned int i915_lvds_downclock__read_mostly =0 ; +unsigned int i915_lvds_downclock__read_mostly =1 ;module_param_named (lvds_downclock, i915_lvds_downclock, int,0400 );MODULE_PARM_DESC (lvds_downclock, "Use panel (LVDS/eDP) downclocking for power savings "
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915: Move the backlight accessor functions in dev_priv
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
This abstracts those functions, so that we can plug-in platform-specific alternatives.
BUG=chrome-os-partner:3276,chrome-os-partner:15248 TEST=by hand: compiles, works
Change-Id: I29dd15722ffed8f5813b34bf0ce4431ce0524cc2
Reviewed-on: https://gerrit.chromium.org/gerrit/36974
Commit-Ready: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.h | 8 +++++++- drivers/gpu/drm/i915/intel_dp.c | 4 ++-- drivers/gpu/drm/i915/intel_drv.h | 3 --- drivers/gpu/drm/i915/intel_lvds.c | 4 ++-- drivers/gpu/drm/i915/intel_modes.c | 1 + drivers/gpu/drm/i915/intel_panel.c | 25 +++++++++++++++++-------- 6 files changed, 29 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +7 -1
@@ -704,6 +704,13 @@ typedef struct drm_i915_private {struct drm_display_mode *lfp_lvds_vbt_mode;/* if any */ struct drm_display_mode *sdvo_lvds_vbt_mode;/* if any */ +/* Backlight driver */ +u32 (*get_backlight)(struct drm_device *dev); +u32 (*get_max_backlight)(struct drm_device *dev); +void (*set_backlight)(struct drm_device *dev,u32 level); +void (*disable_backlight)(struct drm_device *dev); +void (*enable_backlight)(struct drm_device *dev,enum pipe pipe); +/* Feature bits from the VBIOS */ unsigned int int_tv_support:1; unsigned int lvds_dither:1;
@@ -915,7 +922,6 @@ typedef struct drm_i915_private {struct drm_property *broadcast_rgb_property;struct drm_property *force_audio_property; -bool hw_contexts_disabled;uint32_t hw_context_size;
drivers/gpu/drm/i915/intel_dp.c +2 -2
@@ -1196,7 +1196,7 @@ void ironlake_edp_backlight_on(struct intel_dp *intel_dp)I915_WRITE (PCH_PP_CONTROL , pp);POSTING_READ (PCH_PP_CONTROL ); -intel_panel_enable_backlight (dev, pipe); + dev_priv->enable_backlight (dev, pipe); }void ironlake_edp_backlight_off (struct intel_dp *intel_dp)
@@ -1208,7 +1208,7 @@ void ironlake_edp_backlight_off(struct intel_dp *intel_dp)if (!is_edp (intel_dp))return ; -intel_panel_disable_backlight (dev); + dev_priv->disable_backlight (dev);DRM_DEBUG_KMS ("\n" ); pp =ironlake_get_pp_control (dev_priv);
drivers/gpu/drm/i915/intel_drv.h +0 -3
@@ -488,9 +488,6 @@ extern void intel_pch_panel_fitting(struct drm_device *dev,extern u32 intel_panel_get_max_backlight (struct drm_device *dev);extern void intel_panel_set_backlight (struct drm_device *dev,u32 level);extern int intel_panel_setup_backlight (struct drm_connector *connector); -extern void intel_panel_enable_backlight (struct drm_device *dev, -enum pipe pipe); -extern void intel_panel_disable_backlight (struct drm_device *dev);extern void intel_panel_destroy_backlight (struct drm_device *dev);extern enum drm_connector_status intel_panel_detect (struct drm_device *dev);
drivers/gpu/drm/i915/intel_lvds.c +2 -2
@@ -136,7 +136,7 @@ static void intel_enable_lvds(struct intel_encoder *encoder)if (wait_for ((I915_READ (stat_reg) &PP_ON ) !=0 ,1000 ))DRM_ERROR ("timed out waiting for panel to power on\n" ); -intel_panel_enable_backlight (dev, intel_crtc->pipe); + dev_priv->enable_backlight (dev, intel_crtc->pipe); }static void intel_disable_lvds (struct intel_encoder *encoder)
@@ -156,7 +156,7 @@ static void intel_disable_lvds(struct intel_encoder *encoder) stat_reg =PP_STATUS ; } -intel_panel_disable_backlight (dev); + dev_priv->disable_backlight (dev);I915_WRITE (ctl_reg,I915_READ (ctl_reg) & ~POWER_TARGET_ON );if (wait_for ((I915_READ (stat_reg) &PP_ON ) ==0 ,1000 ))
drivers/gpu/drm/i915/intel_modes.c +1 -0
@@ -126,3 +126,4 @@ intel_attach_broadcast_rgb_property(struct drm_connector *connector)drm_object_attach_property (&connector->base, prop,0 ); } +
drivers/gpu/drm/i915/intel_panel.c +17 -8
@@ -32,6 +32,7 @@#include <linux/moduleparam.h> #include "intel_drv.h" +#include "i915_drv.h" #define PCI_LBPC 0xf4/* legacy/combination backlight modes */
@@ -245,7 +246,7 @@ static u32 intel_panel_compute_brightness(struct drm_device *dev, u32 val)if (i915_panel_invert_brightness >0 || dev_priv->quirks &QUIRK_INVERT_BRIGHTNESS ) -return intel_panel_get_max_backlight (dev) - val; +return dev_priv->get_max_backlight (dev) - val;return val; }
@@ -294,7 +295,7 @@ static void intel_panel_actually_set_backlight(struct drm_device *dev, u32 levelreturn intel_pch_panel_set_backlight (dev, level);if (is_backlight_combination_mode (dev)) { -u32 max =intel_panel_get_max_backlight (dev); +u32 max = dev_priv->get_max_backlight (dev);u8 lbpc; lbpc = level *0xfe / max +1 ;
@@ -318,7 +319,7 @@ void intel_panel_set_backlight(struct drm_device *dev, u32 level)intel_panel_actually_set_backlight (dev, level); } -void intel_panel_disable_backlight (struct drm_device *dev) +static void intel_panel_disable_backlight (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -340,13 +341,13 @@ void intel_panel_disable_backlight(struct drm_device *dev) } } -void intel_panel_enable_backlight (struct drm_device *dev, -enum pipe pipe) +static void intel_panel_enable_backlight (struct drm_device *dev, +enum pipe pipe) {struct drm_i915_private *dev_priv = dev->dev_private;if (dev_priv->backlight_level ==0 ) - dev_priv->backlight_level =intel_panel_get_max_backlight (dev); + dev_priv->backlight_level = dev_priv->get_max_backlight (dev);if (INTEL_INFO (dev)->gen >=4 ) {uint32_t reg, tmp;
@@ -395,7 +396,13 @@ static void intel_panel_init_backlight(struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; - dev_priv->backlight_level =intel_panel_get_backlight (dev); + dev_priv->get_backlight = intel_panel_get_backlight; + dev_priv->get_max_backlight = intel_panel_get_max_backlight; + dev_priv->set_backlight = intel_panel_set_backlight; + dev_priv->disable_backlight = intel_panel_disable_backlight; + dev_priv->enable_backlight = intel_panel_enable_backlight; + + dev_priv->backlight_level = dev_priv->get_backlight (dev); dev_priv->backlight_enabled = dev_priv->backlight_level !=0 ; }
@@ -425,7 +432,9 @@ intel_panel_detect(struct drm_device *dev)static int intel_panel_update_status (struct backlight_device *bd) {struct drm_device *dev =bl_get_data (bd); -intel_panel_set_backlight (dev, bd->props.brightness); +struct drm_i915_private *dev_priv = dev->dev_private; + + dev_priv->set_backlight (dev, bd->props.brightness);return 0 ; }
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915: set enable_rc6 to per-chip default.
In reply to [email protected]From: Todd Broch <[email protected]>
BUG=chrome-os-partner:10516
TEST=manual,
1. Run on several platforms. Measure RAPL power @idle.
2. Check for general platform stability
Reviewed-on: https://gerrit.chromium.org/gerrit/29677
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -63,7 +63,7 @@ module_param_named(semaphores, i915_semaphores, int, 0600);MODULE_PARM_DESC (semaphores,"Use semaphores for inter-ring sync (default: true)" ); -int i915_enable_rc6__read_mostly =1 ; +int i915_enable_rc6__read_mostly =-1 ;module_param_named (i915_enable_rc6, i915_enable_rc6, int,0600 );MODULE_PARM_DESC (i915_enable_rc6, "Enable power-saving render C-state 6. "
Signature · 1 line
1.8.3.2
PATCH 1/1 CHROMIUM: gpu: i915: optimize vblank timeout
In reply to [email protected]From: Vincent Palatin <[email protected]>
On the resume path, wait_for_vblank is called 4 times and waits until its timeout. To reduce the delays on that path, let's compute the maximum vblank delay instead of always using the arbitrary 50 ms value.
BUG=chrome-os-partner:13364
TEST=On Link, measure resume time and see a 130ms improvement.
Change-Id: I88231de43573432b6d71255f622eb9860fe3c28d
Reviewed-on: https://gerrit.chromium.org/gerrit/34624
Commit-Ready: Vincent Palatin <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +4 -1
@@ -967,6 +967,9 @@ void intel_wait_for_vblank(struct drm_device *dev, int pipe) {struct drm_i915_private *dev_priv = dev->dev_private;int pipestat_reg =PIPESTAT (pipe); +struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe]; +int timeout = crtc->hwmode.vrefresh ? +DIV_ROUND_UP (1000 , crtc->hwmode.vrefresh) :50 ;if (INTEL_INFO (dev)->gen >=5 ) {ironlake_wait_for_vblank (dev, pipe);
@@ -992,7 +995,7 @@ void intel_wait_for_vblank(struct drm_device *dev, int pipe)/* Wait for vblank interrupt bit to set */ if (wait_for (I915_READ (pipestat_reg) &PIPE_VBLANK_INTERRUPT_STATUS , -50 )) + timeout))DRM_DEBUG_KMS ("vblank wait timed out\n" ); }
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: i915: Allow 0 level when turning on backlight.
In reply to [email protected]From: Daniel Erat <[email protected]>
Previously, the i915 panel driver would set the backlight to its maximum level if the level was 0 when turning the display on. We don't need this (powerd already does it), and removing it avoids a potential race where we jump to 100% brightness when the brightness-up key is pressed due to Chrome turning on the display before powerd sets a non-zero level.
BUG=chromium-os:31795,chromium-os:32447,chromium-os:35481 TEST=manual: no bright flash when increasing the backlight
from 0% on lumpy or resuming from suspend
CQ-DEPEND=I26f11562df8e01927c0220cddd91e665fe087be9 CQ-DEPEND=Ia961baae656044c3713fb967d8ad173d317c4217
Reviewed-on: https://gerrit.chromium.org/gerrit/36135
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_panel.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -700,6 +700,7 @@ typedef struct drm_i915_private {/* LVDS info */ int backlight_level;/* restore backlight to this value */ +bool backlight_level_has_been_set;bool backlight_enabled;struct drm_display_mode *lfp_lvds_vbt_mode;/* if any */ struct drm_display_mode *sdvo_lvds_vbt_mode;/* if any */
drivers/gpu/drm/i915/intel_panel.c +8 -1
@@ -319,6 +319,8 @@ void intel_panel_set_backlight(struct drm_device *dev, u32 level)struct drm_i915_private *dev_priv = dev->dev_private; dev_priv->backlight_level = level; +if (level >0 ) + dev_priv->backlight_level_has_been_set = true;if (dev_priv->backlight_enabled)intel_panel_actually_set_backlight (dev, level); }
@@ -350,7 +352,11 @@ static void intel_panel_enable_backlight(struct drm_device *dev, {struct drm_i915_private *dev_priv = dev->dev_private; -if (dev_priv->backlight_level ==0 ) +/* Increase the level from 0 unless someone in userspace has requested a +* nonzero level at least once already -- in that case, we assume that +* they know what they're doing and will raise the level themselves. */ +if (dev_priv->backlight_level ==0 && + !dev_priv->backlight_level_has_been_set) dev_priv->backlight_level = dev_priv->get_max_backlight (dev);if (INTEL_INFO (dev)->gen >=4 ) {
@@ -424,6 +430,7 @@ static void intel_panel_init_backlight(struct drm_device *dev) dev_priv->enable_backlight = intel_panel_enable_backlight; dev_priv->backlight_level = dev_priv->get_backlight (dev); + dev_priv->backlight_level_has_been_set = false; dev_priv->backlight_enabled = dev_priv->backlight_level !=0 ;if (dmi_check_system (link_dmi_table)) {
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915: Check the current edp backlight state before changing it.
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
This speeds up boot and suspend/resume times.
BUG=chrome-os-partner:13364
TEST=by hand
Change-Id: I8d7b7a22c50bcf32828d492e123ce301cefa297d
Reviewed-on: https://gerrit.chromium.org/gerrit/37047
Commit-Ready: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +6 -1
@@ -1195,6 +1195,10 @@ void ironlake_edp_backlight_on(struct intel_dp *intel_dp)return ;DRM_DEBUG_KMS ("\n" ); + pp =ironlake_get_pp_control (dev_priv); +if (pp &EDP_BLC_ENABLE ) +return ; +/* * If we enable the backlight right away following a panel power * on, we may see slight flicker as the panel syncs with the eDP
@@ -1202,7 +1206,6 @@ void ironlake_edp_backlight_on(struct intel_dp *intel_dp)* allowing it to appear. */ msleep (intel_dp->backlight_on_delay); - pp =ironlake_get_pp_control (dev_priv); pp |=EDP_BLC_ENABLE ;I915_WRITE (PCH_PP_CONTROL , pp);POSTING_READ (PCH_PP_CONTROL );
@@ -1223,6 +1226,8 @@ void ironlake_edp_backlight_off(struct intel_dp *intel_dp)DRM_DEBUG_KMS ("\n" ); pp =ironlake_get_pp_control (dev_priv); +if (!(pp &EDP_BLC_ENABLE )) +return ; pp &= ~EDP_BLC_ENABLE ;I915_WRITE (PCH_PP_CONTROL , pp);POSTING_READ (PCH_PP_CONTROL );
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 CHROMIUM: drm/i915: Workaround disappearing AVI Infoframe on resume
In reply to [email protected]From: Stéphane Marchesin <[email protected]>
The AVI Infoframe disappears on SNB after suspend/resume. This patch works around what seems to be a hardware issue by doing a dummy register write on DPMS calls.
BUG=chrome-os-partner:16054
TEST=with the HDMI analyzer: suspend/resume parrot, verify that TEST=the AVI infoframe is still here
Change-Id: I7cb880408db3cd279d09cb7a53f6787c14e03027
Reviewed-on: https://gerrit.chromium.org/gerrit/37596
Commit-Ready: Stéphane Marchesin <[email protected]>
--- drivers/gpu/drm/i915/intel_hdmi.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/i915/intel_hdmi.c +6 -0
@@ -746,6 +746,12 @@ static void intel_disable_hdmi(struct intel_encoder *encoder)I915_WRITE (intel_hdmi->sdvox_reg, temp);POSTING_READ (intel_hdmi->sdvox_reg); } + +/* Workaround for disappearing AVI Infoframe on SNB on resume */ +if (HAS_PCH_SPLIT (dev)) { +I915_WRITE (_VIDEO_DIP_CTL_A,I915_READ (_VIDEO_DIP_CTL_A)); +I915_WRITE (_VIDEO_DIP_CTL_B,I915_READ (_VIDEO_DIP_CTL_B)); + } } static int intel_hdmi_mode_valid(struct drm_connector *connector,
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 Restrict DP sink wake up to non-EDP.
In reply to [email protected]From: Stuart Abercrombie <[email protected]>
Doing it on EDP was producing a kernel warning with screen power down.
BUG=chrome-os-partner:17893
TEST=No warning with screen power down. Apple mini DP->VGA adapter still works.
Change-Id: I769c31b43753c7ced7cb0b2f0d50fc96c2486779 [sonnyrao: 3.8: fixup for 3.8]
Reviewed-on: https://gerrit.chromium.org/gerrit/45814
Commit-Queue: Stuart Abercrombie <[email protected]>
--- drivers/gpu/drm/i915/intel_dp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +3 -3
@@ -2337,7 +2337,7 @@ intel_dp_detect(struct drm_connector *connector, bool force) intel_dp->has_audio = false;/* Ensure the sink is awake for DPCD/EDID reads. */ -if (connector->dpms !=DRM_MODE_DPMS_ON ) { +if (!is_edp (intel_dp) && connector->dpms !=DRM_MODE_DPMS_ON ) {/* Bypass DPCD check, since we obtain it during detection. */ intel_dp_do_sink_dpms (intel_dp,DRM_MODE_DPMS_ON ); }
@@ -2352,7 +2352,7 @@ intel_dp_detect(struct drm_connector *connector, bool force)DRM_DEBUG_KMS ("DPCD: %s\n" , dpcd_hex_dump);if (status != connector_status_connected) { -if (connector->dpms !=DRM_MODE_DPMS_ON ) +if (!is_edp (intel_dp) && connector->dpms !=DRM_MODE_DPMS_ON )intel_dp_do_sink_dpms (intel_dp, connector->dpms);return status; }
@@ -2373,7 +2373,7 @@ intel_dp_detect(struct drm_connector *connector, bool force) intel_encoder->type =INTEL_OUTPUT_DISPLAYPORT ;/* Restore the sink state */ -if (connector->dpms !=DRM_MODE_DPMS_ON ) +if (!is_edp (intel_dp) && connector->dpms !=DRM_MODE_DPMS_ON )intel_dp_do_sink_dpms (intel_dp, connector->dpms);return connector_status_connected;
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · On Thu, Aug 15, 2013 at 05:30:25PM -0700, [email protected] wrote:
Hello All-
I'm trying to determine if the ChromeOS-only patches being carried by Google still make sense and are the right way to do things in the 3.11+ world, and Jesse asked me to forward the patches to the list for evaluation and potential upstreaming.
I've quickly read through the pile here and there's a few things we need to look at. But one thing which makes assessing the patches here a bit a pain is that often there's a fixup later on again. E.g. rc6 is tuned in about 5-6 different patches. There's also a bunch of patches to fix up warnings introduced in earlier ones
So can you please go through this and squash in the fixups into the relevant original patches and resubmit? Please keep the commit messages around in case there's interesting stuff in there like when a tuning value changes again.
Thanks, Daniel
Quoted 55 lines
Thanks!
-James
[PATCH] drm/i915: Only apply the adaptive backlight modulation when [PATCH] drm/i915: Add a try limit to avoid infinite loops [PATCH] drm/i915: Add a timeout to a potentially infinite loop [PATCH] i915: Use 120MHz LVDS SSC clock for gen5/gen6/gen7 [PATCH] drm/i915: Make
intel_dp_aux_native_readtimeout [PATCH] drm/i915: Honori915_min_freqpost resume
[PATCH] Wake up DP sinks for DPCD read-based detection. [PATCH] Restrict DP sink wake up to non-EDP.
[PATCH] Fix display underruns on Pineview with 2048x1280 VGA display. [PATCH] CHROMIUM: drivers: i915: select non-alternate SSC frequency [PATCH] CHROMIUM: drivers: i915: Default backlight PWM frequency [PATCH] CHROMIUM: enable i915 power-saving render C-state 6 by [PATCH] CHROMIUM: drm/i915: Enable LVDS downclocking [PATCH] CHROMIUM: drm/i915: Reeneable FB compression and semaphores [PATCH] CHROMIUM: drm/i915: Adjust the down threshold. [PATCH] CHROMIUM: drm/i915: Adjust the RPS thresholds [PATCH] CHROMIUM: drm/i915: Move the backlight accessor functions in [PATCH] CHROMIUM: drm/i915: Add backlight support for Link [PATCH] CHROMIUM: drm/i915: setenable_rc6to per-chip default. [PATCH] CHROMIUM: gpu: i915: optimize vblank timeout [PATCH] CHROMIUM: i915: Allow 0 level when turning on backlight. [PATCH] CHROMIUM: drm/i915: Check the current edp backlight state [PATCH] CHROMIUM: drm/i915: Workaround disappearing AVI Infoframe on [PATCH] CHROMIUM: Partial revert of
[PATCH] CHROMIUM: drm/i915: bounds check execbuffer relocations [PATCH] CHROMIUM: drm/i915: Improve RC6p stability
[PATCH] CHROMIUM: drm/i915/intel_i2c: enable 400kHz GMBUS for [PATCH] CHROMIUM: drm/i915/intel_i2c: Allow 400khz for cyapa [PATCH] CHROMIUM: drm/i915/intel_i2c: Allow 400khz for atmel mxt bl [PATCH] CHROMIUM: drm/i915: fix resume
[PATCH] CHROMIUM: drm/i915: Fix warning
[PATCH] CHROMIUM: drm/i915: Initialize the backlight when reported [PATCH] CHROMIUM: drm/i915: Don't evict bound object in the shrinker [PATCH] CHROMIUM: drm/i915/intel_drv: reducewait_forpolling time [PATCH] CHROMIUM: drm/i915: tune the RC6 timeout for stability [PATCH] CHROMIUM: drm/i915: repin bound framebuffers on resume [PATCH] CHROMIUM: i915: fix max backlight in normal mode [PATCH] CHROMIUM: drm/i915: Tune the rc6 value again [PATCH] CHROMIUM: drm/i915: Work around PPT chipsets wakeup delays [PATCH] CHROMIUM: drm/i915: set lowerRC6_THRESHOLDfor HSW [PATCH] CHROMIUM: drm/i915: set linetime WM based ontarget_clock[PATCH] CHROMIUM: drivers: i915:intel_hdmideleted unused variable [PATCH] CHROMIUM: drm/i915: Increase the wakeup up delay for PPT [PATCH] CHROMIUM: drm/i915: Don't load boot context at init time on_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Jani Nikula
maintainerQuoted 10 lines · Daniel Vetter
Quoted 6 lines · On Thu, Aug 15, 2013 at 05:30:25PM -0700, [email protected] wrote:
Hello All-
I'm trying to determine if the ChromeOS-only patches being carried by Google still make sense and are the right way to do things in the 3.11+ world, and Jesse asked me to forward the patches to the list for evaluation and potential upstreaming.
I've quickly read through the pile here and there's a few things we need to look at.
Ditto, and agreed.
Quoted 2 lines
But one thing which makes assessing the patches here a bit a pain is that often there's a fixup later on again.
Another pain is that sometimes the fixup is first, i.e. the series does not seem to be in the right order.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Quoted 8 lines · Jani Nikula
Quoted 6 lines · Daniel Vetter
Quoted 5 lines · On Thu, Aug 15, 2013 at 05:30:25PM -0700, [email protected] wrote:
Hello All-
I'm trying to determine if the ChromeOS-only patches being carried by Google still make sense and are the right way to do things in the 3.11+ world, and Jesse asked me to forward the patches to the list for
evaluation
Quoted 5 lines
Quoted 4 lines
Quoted 1 line
and potential upstreaming.
I've quickly read through the pile here and there's a few things we need to look at.
Quoted 7 lines
Ditto, and agreed.
Quoted 2 lines
But one thing which makes assessing the patches here a bit a pain is that often there's a fixup later on again.
Another pain is that sometimes the fixup is first, i.e. the series does not seem to be in the right order.
One of the issues is that it's not truly a series, but rather individual patches
dating back through 2011 - I thought I had gotten git-send-email to push them
out in chronological order, but maybe I was less successful than I thought. :)
I'll see what I can do in regards to squishing some of these down - I have fairly
limited knowledge when it comes to the i915 driver, so it may not end up perfect, but I'll give it a go. :)
Thanks!
-James
Quoted 8 lines
BR,
Jani.--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx