diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-07-30 12:45:11 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-07-30 12:45:11 +1000 |
| commit | e5dafc0da04567bb8d4adce00fcbde250608e394 (patch) | |
| tree | 6c30fe623fad2bc59a866c48017c9f07bcc9b31c /drivers/gpu/drm/tegra/sor.c | |
| parent | dcd14dd957f02ef679c61325a2221a0574bdcab3 (diff) | |
| parent | 8c10342cb48f3140d9abeadcfd2fa6625d447282 (diff) | |
Merge tag 'topic/drm-misc-2015-07-28' of git://anongit.freedesktop.org/drm-intel into drm-next
More drm-misc, mostly fine-tuning of atomic helpers. They're mostly
driver-wide interface changes of the helpers and I need them for i915
work, so I plan to pull this tag into drm-intel-next too.
* tag 'topic/drm-misc-2015-07-28' of git://anongit.freedesktop.org/drm-intel:
drm/atomic: Update legacy DPMS state during modesets, v3.
drm: Make the connector dpms callback return a value, v2.
drm/atomic: pass old crtc state to atomic_begin/flush.
drm/atomic: add connectors_changed to separate it from mode_changed, v2
drm: Fix DP_TEST_COUNT_MASK
Diffstat (limited to 'drivers/gpu/drm/tegra/sor.c')
| -rw-r--r-- | drivers/gpu/drm/tegra/sor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index 7591d8901f9a..ee8ad0d4a0f2 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -866,8 +866,9 @@ static void tegra_sor_debugfs_exit(struct tegra_sor *sor) sor->debugfs_files = NULL; } -static void tegra_sor_connector_dpms(struct drm_connector *connector, int mode) +static int tegra_sor_connector_dpms(struct drm_connector *connector, int mode) { + return 0; } static enum drm_connector_status |