summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_drv.h
diff options
context:
space:
mode:
authorMatt Roper <matthew.d.roper@intel.com>2015-01-22 16:51:27 -0800
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-01-27 09:57:10 +0100
commit2545e4a6c8f5ae819635403390d940b595c26241 (patch)
tree782e419393274453ff92d9c7c9ba27838ffa5bc1 /drivers/gpu/drm/i915/intel_drv.h
parentc6f95f279330aa24f486bff610fdc274b2bbfebb (diff)
downloadlinux-2545e4a6c8f5ae819635403390d940b595c26241.tar.gz
linux-2545e4a6c8f5ae819635403390d940b595c26241.tar.bz2
linux-2545e4a6c8f5ae819635403390d940b595c26241.zip
drm/i915: Add atomic_get_property entrypoint for connectors (v2)
Even though we only support atomic plane updates at the moment, we still need to add an .atomic_get_property() entrypoint for connectors before we allow the driver to flip on the DRIVER_ATOMIC bit. As soon as that bit gets set, the DRM core will start adding atomic connector properties (in addition to the plane properties we care about at the moment), so we need to be able to handle the new way the DRM core will interact with us. For simplicity, we just lookup driver-specific connector properties in the usual shadow array maintained by the core. Once we get real atomic modeset support for crtc's and planes, this code should be re-written to pull the data out of crtc/connector state structures. v2: Fix intel_dvo and intel_dsi that I missed on the first pass (Ander) Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 18f167b49575..28b846e2e15a 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1254,6 +1254,10 @@ int intel_atomic_check(struct drm_device *dev,
int intel_atomic_commit(struct drm_device *dev,
struct drm_atomic_state *state,
bool async);
+int intel_connector_atomic_get_property(struct drm_connector *connector,
+ const struct drm_connector_state *state,
+ struct drm_property *property,
+ uint64_t *val);
/* intel_atomic_plane.c */
struct intel_plane_state *intel_create_plane_state(struct drm_plane *plane);