summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_crtc_internal.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2019-05-20 08:32:11 -0700
committerTony Lindgren <tony@atomide.com>2019-05-20 08:32:11 -0700
commitf29f24b5568fd6169e0363c78f1a80db38d0e7e9 (patch)
tree835abaf6e1bb95b9d388f4249f355618e9da1489 /drivers/gpu/drm/drm_crtc_internal.h
parent1ba12322e2f0934383f111a5e695702aaf46b812 (diff)
parent34b1b8061de3215208db9accfe60cc3f5b40178f (diff)
downloadtalos-op-linux-f29f24b5568fd6169e0363c78f1a80db38d0e7e9.tar.gz
talos-op-linux-f29f24b5568fd6169e0363c78f1a80db38d0e7e9.zip
Merge branch 'fixes-dra7' into fixes
Diffstat (limited to 'drivers/gpu/drm/drm_crtc_internal.h')
-rw-r--r--drivers/gpu/drm/drm_crtc_internal.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
index 216f2a9ee3d4..0719a235d6cc 100644
--- a/drivers/gpu/drm/drm_crtc_internal.h
+++ b/drivers/gpu/drm/drm_crtc_internal.h
@@ -214,6 +214,7 @@ int drm_atomic_connector_commit_dpms(struct drm_atomic_state *state,
struct drm_connector *connector,
int mode);
int drm_atomic_set_property(struct drm_atomic_state *state,
+ struct drm_file *file_priv,
struct drm_mode_object *obj,
struct drm_property *prop,
uint64_t prop_value);
OpenPOWER on IntegriCloud