diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-07-15 21:23:50 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-07-15 21:23:50 -0400 |
| commit | 877fa9a42ddc087dc46a3a3aac18db8adde2bdf1 (patch) | |
| tree | c5189830c8d3fed08e92deda8681f0676aaea8a5 /drivers/gpu/host1x/intr.h | |
| parent | e2b80bac213cdfd443df9b6e1c769f98d0553c0c (diff) | |
| parent | 64ea25c3bc86c05c7da6c683b86663f4c90158d6 (diff) | |
Merge tag 'drm/tegra/for-4.8-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next
drm/tegra: Changes for v4.8-rc1
This set of changes contains a bunch of cleanups to the host1x driver as
well as the addition of a pin controller for DPAUX, which is required by
boards to configure the DPAUX pads in AUX mode (for DisplayPort) or I2C
mode (for HDMI and DDC).
Included is also a bit of rework of the SOR driver in preparation to add
DisplayPort support as well as some refactoring and cleanup.
Finally, all output drivers are converted to runtime PM, which greatly
simplifies the handling of clocks and resets.
* tag 'drm/tegra/for-4.8-rc1' of git://anongit.freedesktop.org/tegra/linux: (35 commits)
drm/tegra: sor: Reject HDMI 2.0 modes
drm/tegra: sor: Prepare for generic PM domain support
drm/tegra: dsi: Prepare for generic PM domain support
drm/tegra: sor: Make XBAR configurable per SoC
drm/tegra: sor: Use sor1_src clock to set parent for HDMI
dt-bindings: display: tegra: Add source clock for SOR
drm/tegra: sor: Implement sor1_brick clock
drm/tegra: sor: Implement runtime PM
drm/tegra: hdmi: Implement runtime PM
drm/tegra: dsi: Implement runtime PM
drm/tegra: dc: Implement runtime PM
drm/tegra: hdmi: Enable audio over HDMI
drm/tegra: sor: Do not support deep color modes
drm/tegra: sor: Extract tegra_sor_mode_set()
drm/tegra: sor: Split out tegra_sor_apply_config()
drm/tegra: sor: Rename tegra_sor_calc_config()
drm/tegra: sor: Factor out tegra_sor_set_parent_clock()
drm/tegra: dpaux: Add pinctrl support
dt-bindings: Add bindings for Tegra DPAUX pinctrl driver
drm/tegra: Prepare DPAUX for supporting generic PM domains
...
Diffstat (limited to 'drivers/gpu/host1x/intr.h')
| -rw-r--r-- | drivers/gpu/host1x/intr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/host1x/intr.h b/drivers/gpu/host1x/intr.h index 2b8adf016a05..1370c2bb75b8 100644 --- a/drivers/gpu/host1x/intr.h +++ b/drivers/gpu/host1x/intr.h | |||
| @@ -75,7 +75,7 @@ struct host1x_waitlist { | |||
| 75 | * | 75 | * |
| 76 | * This is a non-blocking api. | 76 | * This is a non-blocking api. |
| 77 | */ | 77 | */ |
| 78 | int host1x_intr_add_action(struct host1x *host, u32 id, u32 thresh, | 78 | int host1x_intr_add_action(struct host1x *host, unsigned int id, u32 thresh, |
| 79 | enum host1x_intr_action action, void *data, | 79 | enum host1x_intr_action action, void *data, |
| 80 | struct host1x_waitlist *waiter, void **ref); | 80 | struct host1x_waitlist *waiter, void **ref); |
| 81 | 81 | ||
| @@ -84,7 +84,7 @@ int host1x_intr_add_action(struct host1x *host, u32 id, u32 thresh, | |||
| 84 | * You must call this if you passed non-NULL as ref. | 84 | * You must call this if you passed non-NULL as ref. |
| 85 | * @ref the ref returned from host1x_intr_add_action() | 85 | * @ref the ref returned from host1x_intr_add_action() |
| 86 | */ | 86 | */ |
| 87 | void host1x_intr_put_ref(struct host1x *host, u32 id, void *ref); | 87 | void host1x_intr_put_ref(struct host1x *host, unsigned int id, void *ref); |
| 88 | 88 | ||
| 89 | /* Initialize host1x sync point interrupt */ | 89 | /* Initialize host1x sync point interrupt */ |
| 90 | int host1x_intr_init(struct host1x *host, unsigned int irq_sync); | 90 | int host1x_intr_init(struct host1x *host, unsigned int irq_sync); |