Commit graph

858,046 commits

Author SHA1 Message Date
Feifei Xu
51bfac71ca drm/amdgpu: Set no-retry as default.
This is to improve performance.

Signed-off-by: Feifei Xu <[email protected]>
Tested-by: Candice Li <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
2019-08-21 22:16:18 -05:00
Xiaojie Yuan
c5fb912653 drm/amdgpu: add firmware header printing for psp fw loading (v2)
firmware header information is printed for direct fw loading but not
added for psp fw loading yet

v2: squash in warning fix (Alex)

Signed-off-by: Xiaojie Yuan <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
2019-08-21 22:16:18 -05:00
Xiaojie Yuan
6c2243efa0 drm/amdgpu: fix debug level for ppt offset/size
Signed-off-by: Xiaojie Yuan <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
2019-08-21 22:15:28 -05:00
Xiaojie Yuan
cc216214ac drm/amdgpu: remove special autoload handling for navi12
s/r list in rlc firmware is ready, so remove the special autoload handling

Signed-off-by: Xiaojie Yuan <[email protected]>
Acked-by: Alex Deucher <[email protected]>
Reviewed-by: Hawking Zhang <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
2019-08-21 22:15:14 -05:00
Nicholas Kazlauskas
01c22997be drm/amd/display: Calculate bpc based on max_requested_bpc
[Why]
The only place where state->max_bpc is updated on the connector is
at the start of atomic check during drm_atomic_connector_check. It
isn't updated when adding the connectors to the atomic state after
the fact. It also doesn't necessarily reflect the right value when
called in amdgpu during mode validation outside of atomic check.

This can cause the wrong bpc to be used even if the max_requested_bpc
is the correct value.

[How]
Don't rely on state->max_bpc reflecting the real bpc value and just
do the min(...) based on display info bpc and max_requested_bpc.

Fixes: 01933ba42d ("drm/amd/display: Use current connector state if NULL when checking bpc")
Signed-off-by: Nicholas Kazlauskas <[email protected]>
Reviewed-by: Leo Li <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
2019-08-21 22:15:13 -05:00
Alex Deucher
b05f65d772 drm/amdgpu/gfx9: update pg_flags after determining if gfx off is possible
We need to set certain power gating flags after we determine
if the firmware version is sufficient to support gfxoff.
Previously we set the pg flags in early init, but we later
we might have disabled gfxoff if the firmware versions didn't
support it.  Move adding the additional pg flags after we
determine whether or not to support gfxoff.

Fixes: 005440066f ("drm/amdgpu: enable gfxoff again on raven series (v2)")
Tested-by: Kai-Heng Feng <[email protected]>
Tested-by: Tom St Denis <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Cc: Kai-Heng Feng <[email protected]>
2019-08-21 22:15:13 -05:00
Chris Wilson
8e40983dec drm/i915/selftests: Fixup a couple of missing serialisation with vma
In commit 70d6894d14 ("drm/i915: Serialize against vma moves")
I managed to miss a couple of i915_vma_move_to_active() that had not
serialised against an async vma pinning. Add the missing
i915_request_await.

Signed-off-by: Chris Wilson <[email protected]>
Cc: Matthew Auld <[email protected]>
Reviewed-by: Matthew Auld <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 22:21:57 +01:00
Xu YiPing
89a565dba1 drm: kirin: Move ade drm init to kirin drm drv
As part of refactoring the kirin driver to better support
different hardware revisions, this patch renames ade_data to
kirin_drm_private, and moves crtc_init and plane_init to
kirin drm drv too. Now that they are generic the functions
can be shared between the kirin620 and (to be added later)
kirin960 specific support code.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: Reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:46 +02:00
Xu YiPing
28cd05eee4 drm: kirin: Pass driver data to crtc init and plane init
As part of refactoring the kirin driver to better support
different hardware revisions, this patch changes the code
via a passed in driver_data pointer, rather than hardcoding
them via ade_driver_data variable.

This will allow those funcitons to be later moved to the
generic kirin_drm_drv.c using alternative driver_data structures
that support other hardware.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: Reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:45 +02:00
Xu YiPing
2e89b4fbca drm: kirin: Add alloc_hw_ctx/clean_hw_ctx ops in driver data
As part of refactoring the kirin driver to better support
different hardware revisions, this patch changes the
alloc/clean_hw_ctx functions to be called via driver_data
specific funciton pointers.

This will allow the ade_drm_init to later be made generic and
moved to kirin_drm_drv.c

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: Reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:45 +02:00
Xu YiPing
27dd04a591 drm: kirin: Make driver_data variable non-global
As part of refactoring the kirin driver to better support
different hardware revisions, this patch changes the driver_data
value to not be a global variable. Instead the driver_data value
is accessed via the of_device_get_match_data() when needed.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: Reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:44 +02:00
Xu YiPing
a8c8af59e4 drm: kirin: Fix dev->driver_data setting
As part of refactoring the kirin driver to better support
different hardware revisions, this patch changes the
dev->driver_data to point to a drm_device, not ade_data.

Thus we set the driver data to drm device after alloc.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: Reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:44 +02:00
Xu YiPing
a51735befe drm: kirin: Rename plane_init and crtc_init
As part of refactoring the kirin driver to better support
different hardware revisions, this patch renames
ade_crtc/plane_init kirin_plane/crtc_init, as they will later be
moved to kirin drm drv and shared with the kirin960 hardware
support.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:43 +02:00
Xu YiPing
d606dc9a63 drm: kirin: Add register connect helper functions in drm init
As part of refactoring the kirin driver to better support
different hardware revisions, this patch adds a flag to the
device specific driver data so that we can conditionally
register the connectors at init.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:42 +02:00
Xu YiPing
1053d01864 drm: kirin: Move drm driver to driver data
As part of refactoring the kirin driver to better support
different hardware revisions, this patch moves the drm_driver
structure to be under device specific driver data.

This will allow us to more easily add support for kirin960
hardware with later patches.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: Reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:42 +02:00
Xu YiPing
49af461139 drm: kirin: Move config max_width and max_height to driver data
As part of refactoring the kirin driver to better support
different hardware revisions, this patch moves the max_width
and max_height values used in kirin_drm_mode_config_inita to
hardware specific driver data.

This will make it easier to add support for new devices
via a new kirin_drm_data structure.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:41 +02:00
Xu YiPing
48fa7c17d1 drm: kirin: Move plane number and primay plane in driver data
As part of refactoring the kirin driver to better support
different hardware revisions, this patch moves the number of
planes and the primary plane value to the kirin_drm_data
structure

This will make it easier to add support for new devices
via a new kirin_drm_data structure.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:40 +02:00
Xu YiPing
bdaf419efe drm: kirin: Move mode config function to driver_data
As part of refactoring the kirin driver to better support
different hardware revisions, this patch moves the mode config
initialization values into the kirin_drm_data structure.

This will make it easier to add support for new devices
via a new kirin_drm_data structure.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:40 +02:00
Xu YiPing
e200d8eb39 drm: kirin: Move channel formats to driver data
As part of refactoring the kirin driver to better support
different hardware revisions, this patch moves the channel
format arrays into the kirin_drm_data structure.

This will make it easier to add support for new devices
via a new kirin_drm_data structure.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:39 +02:00
Xu YiPing
5fb2e411be drm: kirin: Move ade crtc/plane help functions to driver_data
As part of refactoring the kirin driver to better support
different hardware revisions, this patch moves the crtc
and plane funcs/helper_funcs to the struct kirin_drm_data.

This will make it easier to add support for new devices
via a new kirin_drm_data structure.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:39 +02:00
Xu YiPing
7903ba41e9 drm: kirin: Reanme dc_ops to kirin_drm_data
As part of refactoring the kirin driver to better support
different hardware revisions, this patch renames the
struct kirin_dc_ops to struct kirin_drm_data and cleans
up the related variable names.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:38 +02:00
Xu YiPing
c11a03f6eb drm: kirin: Move kirin_crtc, kirin_plane, kirin_format to kirin_drm_drv.h
As part of refactoring the kirin driver to better support
different hardware revisions, this patch moves some shared
structures and helpers to the common kirin_drm_drv.h

These structures will later used by both kirin620 and
future kirin960 driver

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:37 +02:00
John Stultz
529277121b drm: kirin: Move workqueue to ade_hw_ctx structure
The workqueue used to reset the display when we hit an LDI
underflow error is ADE specific, so since this patch series
works to make the kirin_crtc structure more generic, move the
workqueue to the ade_hw_ctx structure instead.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:36 +02:00
Xu YiPing
36f8d22dbc drm: kirin: Move request irq handle in ade hw ctx alloc
As part of refactoring the kirin driver to better support
different hardware revisions, this patch modifies the
initialization routines so the devm_request_irq() function
is called as part of the allocation function.

This will be needed in the future when we will have different
allocation functions to allocate hardware specific hw_ctx
structures, which will setup the vblank irq differently.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:36 +02:00
Xu YiPing
43774b0eed drm: kirin: Dynamically allocate the hw_ctx
As part of refactoring the kirin driver to better support
different hardware revisions, this patch modifies the
initialization function to dynamically allocate the ade_hw_ctx
structure previously kept as part of struct ade_data.

This is done so that later we can have the hw_ctx point to
hardware revision specific ctx structures.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:36 +02:00
Xu YiPing
ada7f67da9 drm: kirin: Rename ade_crtc to kirin_crtc
As part of refactoring the kirin driver to better support
different hardware revisions, this patch renames the
struct ade_crtc to kirin_crtc.

The struct kirin_crtc will later used by both kirin620 and
future kirin960 driver, and will be moved to a common
kirin_drm_drv.h in a future patch

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:35 +02:00
Xu YiPing
0ae622c532 drm: kirin: Rename ade_plane to kirin_plane
As part of refactoring the kirin driver to better support
different hardware revisions, this patch renames the
struct ade_plane to kirin_plane.

The struct kirin_plane will later used by both kirin620 and
future kirin960 driver, and will be moved to a common
kirin_drm_drv.h in a future patch

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:35 +02:00
Xu YiPing
a202da1643 drm: kirin: Remove out_format from ade_crtc
As part of refactoring the kirin driver to better support
different hardware revisions, this patch removes the out_format
field in the struct ade_crtc, which was only ever set to
LDI_OUT_RGB_888.

Thus this patch removes the field and instead directly uses
LDI_OUT_RGB_888.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:34 +02:00
Xu YiPing
e0d8eba5dd drm: kirin: Remove uncessary parameter indirection
In a few functions, we pass in a struct ade_crtc, which we only
use to get to the underlying struct ade_hw_ctx.

Thus this patch refactors the functions to just take the
struct ade_hw_ctx directly.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Xu YiPing <[email protected]>
[jstultz: reworded commit message]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:34 +02:00
John Stultz
9ec16cee89 drm: kirin: Remove unreachable return
The 'return 0' in kirin_drm_platform_probe() is unreachable
code, so remove it.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Suggested by: Xu YiPing <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:33 +02:00
John Stultz
46aa549fd1 drm: kirin: Remove HISI_KIRIN_DW_DSI config option
The CONFIG_HISI_KIRIN_DW_DSI option is only used w/ kirin
driver, so cut out the middleman and condense the config
logic down.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:32 +02:00
Da Lv
ff57c65138 drm: kirin: Fix for hikey620 display offset problem
The original HiKey (620) board has had a long running issue
where when using a 1080p montior, the display would occasionally
blink and come come back with a horizontal offset (usually also
shifting the colors, depending on the value of the offset%4).

After lots of analysis by HiSi developers, they found the issue
was due to when running at 1080p, it was possible to hit the
device memory bandwidth limits, which could cause the DSI signal
to get out of sync.

Unfortunately the DSI logic doesn't have the ability to
automatically recover from this situation, but we can get a an
LDI underflow interrupt when it happens.

To then correct the issue, when we get an LDI underflow irq, we
we can simply suspend and resume the display, which resets the
hardware.

Thus, this patch enables the ldi underflow interrupt, and
initializes a workqueue that is used to suspend/resume the
display to recover. Then when the irq occurs we clear it and
schedule the workqueue to reset display engine.

Cc: Rongrong Zou <[email protected]>
Cc: Xinliang Liu <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: dri-devel <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Acked-by: Xinliang Liu <[email protected]>
Reviewed-by: Sam Ravnborg <[email protected]>
Signed-off-by: Da Lv <[email protected]>
Signed-off-by: Yidong Lin <[email protected]>
[jstultz: Reworded the commit message, checkpatch cleanups]
Signed-off-by: John Stultz <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 19:15:32 +02:00
Xiong Zhang
4776f3529d drm/i915: Don't deballoon unused ggtt drm_mm_node in linux guest
The following call trace may exist in linux guest dmesg when guest i915
driver is unloaded.
[   90.776610] [drm:vgt_deballoon_space.isra.0 [i915]] deballoon space: range [0x0 - 0x0] 0 KiB.
[   90.776621] BUG: unable to handle kernel NULL pointer dereference at 00000000000000c0
[   90.776691] IP: drm_mm_remove_node+0x4d/0x320 [drm]
[   90.776718] PGD 800000012c7d0067 P4D 800000012c7d0067 PUD 138e4c067 PMD 0
[   90.777091] task: ffff9adab60f2f00 task.stack: ffffaf39c0fe0000
[   90.777142] RIP: 0010:drm_mm_remove_node+0x4d/0x320 [drm]
[   90.777573] Call Trace:
[   90.777653]  intel_vgt_deballoon+0x4c/0x60 [i915]
[   90.777729]  i915_ggtt_cleanup_hw+0x121/0x190 [i915]
[   90.777792]  i915_driver_unload+0x145/0x180 [i915]
[   90.777856]  i915_pci_remove+0x15/0x20 [i915]
[   90.777890]  pci_device_remove+0x3b/0xc0
[   90.777916]  device_release_driver_internal+0x157/0x220
[   90.777945]  driver_detach+0x39/0x70
[   90.777967]  bus_remove_driver+0x51/0xd0
[   90.777990]  pci_unregister_driver+0x23/0x90
[   90.778019]  SyS_delete_module+0x1da/0x240
[   90.778045]  entry_SYSCALL_64_fastpath+0x24/0x87
[   90.778072] RIP: 0033:0x7f34312af067
[   90.778092] RSP: 002b:00007ffdea3da0d8 EFLAGS: 00000206
[   90.778297] RIP: drm_mm_remove_node+0x4d/0x320 [drm] RSP: ffffaf39c0fe3dc0
[   90.778344] ---[ end trace f4b1bc8305fc59dd ]---

Four drm_mm_node are used to reserve guest ggtt space, but some of them
may be skipped and not initialised due to space constraints in
intel_vgt_balloon(). If drm_mm_remove_node() is called with
uninitialized drm_mm_node, the above call trace occurs.

This patch check drm_mm_node's validity before calling
drm_mm_remove_node().

Fixes: ff8f797557c7("drm/i915: return the correct usable aperture size under gvt environment")
Cc: [email protected]
Signed-off-by: Xiong Zhang <[email protected]>
Acked-by: Zhenyu Wang <[email protected]>
Reviewed-by: Chris Wilson <[email protected]>
Signed-off-by: Chris Wilson <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 18:03:03 +01:00
Chris Wilson
c71ccbe263 drm/i915/gtt: Add some range asserts
These should have been validated in the upper layers, but for sanity's
sake, repeat them.

Signed-off-by: Chris Wilson <[email protected]>
Reviewed-by: Mika Kuoppala <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 17:58:54 +01:00
Ville Syrjälä
1b9bd09630 drm/i915: Do not create a new max_bpc prop for MST connectors
We're not allowed to create new properties after device registration
so for MST connectors we need to either create the max_bpc property
earlier, or we reuse one we already have. Let's do the latter apporach
since the corresponding SST connector already has the prop and its
min/max are correct also for the MST connector.

The problem was highlighted by commit 4f5368b554 ("drm/kms:
Catch mode_object lifetime errors") which results in the following
spew:
[ 1330.878941] WARNING: CPU: 2 PID: 1554 at drivers/gpu/drm/drm_mode_object.c:45 __drm_mode_object_add+0xa0/0xb0 [drm]
...
[ 1330.879008] Call Trace:
[ 1330.879023]  drm_property_create+0xba/0x180 [drm]
[ 1330.879036]  drm_property_create_range+0x15/0x30 [drm]
[ 1330.879048]  drm_connector_attach_max_bpc_property+0x62/0x80 [drm]
[ 1330.879086]  intel_dp_add_mst_connector+0x11f/0x140 [i915]
[ 1330.879094]  drm_dp_add_port.isra.20+0x20b/0x440 [drm_kms_helper]
...

Cc: [email protected]
Cc: Lyude Paul <[email protected]>
Cc: [email protected]
Cc: Daniel Vetter <[email protected]>
Cc: Sean Paul <[email protected]>
Fixes: 5ca0ef8a56 ("drm/i915: Add max_bpc property for DP MST")
Signed-off-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: José Roberto de Souza <[email protected]>
Reviewed-by: Lyude Paul <[email protected]>
2019-08-21 19:40:55 +03:00
Chris Wilson
a20ab592d1 drm/i915/execlists: Set priority hint prior to submission
Since we now run process_csb() outside of the engine->active.lock, we
can process a CS-event immediately upon our ELSP write. As we currently
inspect the pending queue *after* the ELSP write, there is an
opportunity for a CS-event to update the pending queue before we can
read it, making ourselves chases an invalid pointer.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111427
Fixes: df40306902 ("drm/i915/execlists: Lift process_csb() out of the irq-off spinlock")
Signed-off-by: Chris Wilson <[email protected]>
Cc: Mika Kuoppala <[email protected]>
Reviewed-by: Mika Kuoppala <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 17:32:27 +01:00
Chris Wilson
6846895fde drm/i915: Replace PIN_NONFAULT with calls to PIN_NOEVICT
When under severe stress for GTT mappable space, the LRU eviction model
falls off a cliff. We spend all our time scanning the much larger
non-mappable area searching for something within the mappable zone we can
evict. Turn this on its head by only using the full vma for the object if
it is already pinned in the mappable zone or there is sufficient *free*
space to accommodate it (prioritizing speedy reuse). If there is not,
immediately fall back to using small chunks (tilerow for GTT mmap, single
pages for pwrite/relocation) and using random eviction before doing a full
search.

Testcase: igt/gem_concurrent_blt
References: https://bugs.freedesktop.org/show_bug.cgi?id=110848
Signed-off-by: Chris Wilson <[email protected]>
Reviewed-by: Matthew Auld <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 14:07:54 +01:00
Thierry Reding
019cbd4a4f drm/nouveau: Initialize GEM object before TTM object
TTM assumes that drivers initialize the embedded GEM object before
calling the ttm_bo_init() function. This is not currently the case
in the Nouveau driver. Fix this by splitting up nouveau_bo_new()
into nouveau_bo_alloc() and nouveau_bo_init() so that the GEM can
be initialized before TTM BO initialization when necessary.

Fixes: b96f3e7c80 ("drm/ttm: use gem vma_node")
Acked-by: Gerd Hoffmann <[email protected]>
Acked-by: Ben Skeggs <[email protected]>
Signed-off-by: Thierry Reding <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/20190814093524.GA31345@ulmo
2019-08-21 13:38:28 +02:00
Chris Wilson
783877458f drm/i915/gtt: Include asm/smp.h
We need asm/smp.h for wbinvd_on_all_cpus()

Reported-by: [email protected]
Signed-off-by: Chris Wilson <[email protected]>
Cc: Matthew Auld <[email protected]>
Reviewed-by: Matthew Auld <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 11:31:24 +01:00
Jani Nikula
e63eacf768 drm/i915/hdmi: make hdcp2_msg_data const
It's static const data, make it so.

Cc: Ramalingam C <[email protected]>
Reviewed-by: Ramalingam C <[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 13:12:02 +03:00
Jani Nikula
032048db14 drm/i915/hdmi: stylistic cleanup around hdcp2_msg_data
Split struct declaration and array definition. Fix indents and
whitespace. No functional changes.

Cc: Ramalingam C <[email protected]>
Reviewed-by: Ramalingam C <[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 13:11:58 +03:00
Jani Nikula
e8465e1c6e drm/i915/dp: make hdcp2_dp_msg_data const
It's static const data, make it so.

Cc: Ramalingam C <[email protected]>
Reviewed-by: Ramalingam C <[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 13:11:54 +03:00
Jani Nikula
3be3a877cc drm/i915/dp: avoid shadowing variables
Everything seems to be all right, but shadowing is to be avoided.

Cc: Ramalingam C <[email protected]>
Reviewed-by: Ramalingam C <[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 13:11:50 +03:00
Jani Nikula
57bf7f43ba drm/i915/dp: stylistic cleanup around hdcp2_msg_data
Split struct declaration and array definition. Fix indents and
whitespace. No functional changes.

Cc: Ramalingam C <[email protected]>
Reviewed-by: Ramalingam C <[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 13:11:34 +03:00
Chris Wilson
ff17501013 drm/i915/gtt: Relax assertion for pt_used
When inserting the final level PTE, we check that we are not overflowing
the page table (checking that pt_used does not exceed the size of the
table). However, we have to allow for every other PTE to be pinned by a
simultaneous removal thread (as on remove we bump the pt_used counter
before adjusting the table).

Signed-off-by: Chris Wilson <[email protected]>
Cc: Mika Kuoppala <[email protected]>
Reviewed-by: Mika Kuoppala <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-21 09:17:11 +01:00
Dave Airlie
5f680625d9 drm-misc-next for 5.4:
UAPI Changes:
 
 Cross-subsystem Changes:
 
 Core Changes:
   - dma-buf: add reservation_object_fences helper, relax
              reservation_object_add_shared_fence, remove
              reservation_object seq number (and then
              restored)
   - dma-fence: Shrinkage of the dma_fence structure,
                Merge dma_fence_signal and dma_fence_signal_locked,
                Store the timestamp in struct dma_fence in a union with
                cb_list
 
 Driver Changes:
   - More dt-bindings YAML conversions
   - More removal of drmP.h includes
   - dw-hdmi: Support get_eld and various i2s improvements
   - gm12u320: Few fixes
   - meson: Global cleanup
   - panfrost: Few refactors, Support for GPU heap allocations
   - sun4i: Support for DDC enable GPIO
   - New panels: TI nspire, NEC NL8048HL11, LG Philips LB035Q02,
                 Sharp LS037V7DW01, Sony ACX565AKM, Toppoly TD028TTEC1
                 Toppoly TD043MTEA1
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCXVqvpwAKCRDj7w1vZxhR
 xa3RAQDzAnt5zeesAxX4XhRJzHoCEwj2PJj9Re6xMJ9PlcfcvwD+OS+bcB6jfiXV
 Ug9IBd/DqjlmD9G9MxFxfSV946rksAw=
 =8uv4
 -----END PGP SIGNATURE-----

Merge tag 'drm-misc-next-2019-08-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for 5.4:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
  - dma-buf: add reservation_object_fences helper, relax
             reservation_object_add_shared_fence, remove
             reservation_object seq number (and then
             restored)
  - dma-fence: Shrinkage of the dma_fence structure,
               Merge dma_fence_signal and dma_fence_signal_locked,
               Store the timestamp in struct dma_fence in a union with
               cb_list

Driver Changes:
  - More dt-bindings YAML conversions
  - More removal of drmP.h includes
  - dw-hdmi: Support get_eld and various i2s improvements
  - gm12u320: Few fixes
  - meson: Global cleanup
  - panfrost: Few refactors, Support for GPU heap allocations
  - sun4i: Support for DDC enable GPIO
  - New panels: TI nspire, NEC NL8048HL11, LG Philips LB035Q02,
                Sharp LS037V7DW01, Sony ACX565AKM, Toppoly TD028TTEC1
                Toppoly TD043MTEA1

Signed-off-by: Dave Airlie <[email protected]>
[airlied: fixup dma_resv rename fallout]

From: Maxime Ripard <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/20190819141923.7l2adietcr2pioct@flea
2019-08-21 16:44:41 +10:00
Ville Syrjälä
4eaceea3a0 drm/i915: Fix DP-MST crtc_mask
Each fake MST encoder is tied to a specific pipe. Fix the encoder's
crtc_mask to reflect that fact.

Signed-off-by: Ville Syrjälä <[email protected]>
Reviewed-by: Dhinakaran Pandiyan <[email protected]>
Reviewed-by: Ville Syrjälä <[email protected]>
Signed-off-by: Lucas De Marchi <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-20 12:53:13 -07:00
Lucas De Marchi
d318cedf81 drm/i915/tgl: update DMC firmware to 2.04
2 important fixes:
  - vblank counter is now working
  - PSR1 is working

Cc: Jose Souza <[email protected]>
Cc: Anusha Srivatsa <[email protected]>
Signed-off-by: Lucas De Marchi <[email protected]>
Reviewed-by: Anusha Srivatsa <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-20 12:49:29 -07:00
José Roberto de Souza
9288d74f3f drm/i915/tgl: Move transcoders to pipes' powerwells
When trying to read registers from transcoder C and D while PG3 is ON it
causes unclaimed access warnings. Adding the powerwells for the pipes
fixes the issue, but doesn't match the spec.

Signed-off-by: José Roberto de Souza <[email protected]>
Signed-off-by: Lucas De Marchi <[email protected]>
Reviewed-by: Imre Deak <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-20 12:49:17 -07:00
Michel Thierry
465242ee36 drm/i915/tgl: add support for reading the timestamp frequency
There are no changes with respect to GEN11, which Paulo wrote.

This gets rid of the "Missing switch case in read_timestamp_frequency"
message at boot for Tiger Lake.

[ Lucas: BSpec: 10742 and 9024, but there's a mismatch on the values.
  Let's say a glitch in the spec. Tested locally and it works. ]

Cc: Paulo Zanoni <[email protected]>
Cc: Lionel Landwerlin <[email protected]>
Signed-off-by: Michel Thierry <[email protected]>
Reviewed-by: Lucas De Marchi <[email protected]>
Signed-off-by: Lucas De Marchi <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2019-08-20 12:48:57 -07:00