linux-toradex.git/drivers/gpu/drm/i915/intel_csr.c, branch v4.4.78

drm/i915/skl: Fix DMC load on Skylake J0 and K0

2016-05-11T09:21:27+00:00

commit a41c8882592fb80458959b10e37632ce030b68ca upstream.

The driver does not load firmware for unknown steppings, so these new
steppings must be added to the list.

Cc: Rodrigo Vivi 
Signed-off-by: Mat Martineau 
Reviewed-by: Rodrigo Vivi 
Signed-off-by: Rodrigo Vivi 
Link: http://patchwork.freedesktop.org/patch/msgid/1454023163-25469-1-git-send-email-mathew.j.martineau@linux.intel.com
Cc: Jani Nikula 
Signed-off-by: Greg Kroah-Hartman

drm/i915/skl: Added a check for the hardware status of csr fw before loading.

2015-09-30T08:14:22+00:00

Dmc will restore the csr program except DC9, cold boot,
warm reset, PCI function level reset, and hibernate/suspend.

intel_csr_load_program() function is used to load the firmware
data from kernel memory to csr address space.

All values of csr address space will be zero if it got reset and
the first byte of csr program is always a non-zero if firmware
is loaded successfuly. Based on hardware status will load the
firmware.

Without this condition check if we overwrite the firmware data the
counters exposed for dc5/dc6 (help for debugging) will be nullified.

Note: Above commit message seems to be confused and the real problem
apparently going on is that for suspend-to-idle and system standby the
firmware survives (it's like runtime pm), but it doesn't for
suspend-to-mem and hibernate-to-disk. All the other talking about DC9
and pci reset are irrelevant for the path touched here (only driver
load and system resume functions) and might not be true statements.

v1: Initial version.

v2: Based on review comments from Daniel,
- Added a check to know hardware status and load the firmware if not loaded.

Cc: Daniel Vetter 
Cc: Damien Lespiau 
Cc: Imre Deak 
Cc: Sunil Kamath 
Signed-off-by: Animesh Manna 
Signed-off-by: Vathsala Nagaraju 
Reviewed-by: A.Sunil Kamath 
[danvet: Explain clearly in the code comment when we need to reload
and when not and make it a FIXME. Also deconfuse the commit message
with a note. Also: Make. it. compile.]
Signed-off-by: Daniel Vetter

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next

2015-09-30T06:47:41+00:00

Backmerge to catch up with 4.3. slightly more involved conflict in the
irq code, but nothing beyond adjacent changes.

Signed-off-by: Daniel Vetter

drm/i915: Parametrize CSR_PROGRAM registers

2015-09-23T15:16:33+00:00

Signed-off-by: Ville Syrjälä 
Reviewed-by: Mika Kuoppala 
Signed-off-by: Daniel Vetter

drm/i915/bxt: Stepping info added for bxt.

2015-09-23T07:42:10+00:00

Added stepping info in intel_csr.c which is required to extract
specific firmware from packaged dmc firmware.

Stepping info is aligned with current bspec info.

Cc: Vetter, Daniel 
Cc: Damien Lespiau 
Cc: Imre Deak 
Cc: Sunil Kamath 
Signed-off-by: Animesh Manna 
Reviewed-by: Imre Deak 
Signed-off-by: Daniel Vetter

drm/i915/bxt: Path added of dmc firmware ver1 for BXT.

2015-09-23T07:39:08+00:00

Broxton also has dmc to manage low-power display engine state.
Path of the firmware added in intel_csr.c.

Naming convention followed as _dmc_.bin

v1: Initial version.

v2: Commit description added based on review comment from Sunil.

Cc: Damien Lespiau 
Cc: Rodrigo Vivi 
Cc: Sunil Kamath 
Signed-off-by: Animesh Manna 
Reviewed-by: Rodrigo Vivi 
Signed-off-by: Daniel Vetter

drm/i915: make CSR firmware messages less verbose

2015-09-14T09:12:29+00:00

Use WARN_ONCE in a bunch of places and demote a message that would
continually spam us.

Signed-off-by: Jesse Barnes 
Acked-by: Damien Lespiau 
Acked-by: Chris Wilson 
Signed-off-by: Daniel Vetter

drm/i915: Fix CSR MMIO address check

2015-09-10T07:32:48+00:00

Fix a wrong logical AND (&&) used for the range check of CSR MMIO.

Spotted nicely by gcc -Wlogical-op flag:
  drivers/gpu/drm/i915/intel_csr.c: In function ‘finish_csr_load’:
  drivers/gpu/drm/i915/intel_csr.c:353:41: warning: logical ‘and’ of mutually exclusive tests is always false [-Wlogical-op]

Fixes: eb805623d8b1 ('drm/i915/skl: Add support to load SKL CSR firmware.')
Cc:  # v4.2
Signed-off-by: Takashi Iwai 
Reviewed-by: Daniel Vetter 
Reviewed-by: Animesh Manna 
Signed-off-by: Jani Nikula

drm/i915/gen9: Removed byte swapping for csr firmware

2015-08-05T09:00:04+00:00

This patch contains the changes to remove the byte
swapping logic introduced with old dmc firmware.
While debugging PC10 entry issue for skylake found
with latest dmc firmware version 1.18 without byte
swapping dmc is working fine and able to enter PC10.

Note that apparently this was changed with dmc version 1.0 and earlier
ones indeed are byteswapped like this ...

v1: Initial version.

v2: Corrected firmware size during memcpy(). (Suggested by Sunil)

Cc: Daniel Vetter 
Cc: Damien Lespiau 
Cc: Imre Deak 
Cc: Sunil Kamath 
Signed-off-by: Animesh Manna 
Signed-off-by: Vathsala Nagaraju 
Reviewed-by: A.Sunil Kamath 
[danvet: Add note that this only holds for released dmc firmware.]
Signed-off-by: Daniel Vetter

Merge remote-tracking branch 'airlied/drm-next' into HEAD

2015-06-23T12:01:53+00:00

Backmerge drm-next because the conflict between Ander's atomic fixes
for 4.2 and Maartens future work are getting to unwielding to handle.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i915/intel_ringbuffer.h

Just always take ours, same as git merge -X ours, but done by hand
because I didn't trust git: It's confusing that it doesn't show any
conflicts in the merge diff at all.

Signed-off-by: Daniel Vetter