diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-04-12 10:07:43 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-04-12 10:07:43 +0200 |
| commit | ebf3f19abbfd041a0e79a523e4dd1f6f6797b783 (patch) | |
| tree | bc9ee354596925a6de8c1a7219cdf1bb975df001 /drivers/gpu/drm/i915/intel_drv.h | |
| parent | a8e9a419c337a655e23b4bab422e85e47ee86c92 (diff) | |
| parent | d455937ed1cff44b9e5567f0ab697ad486429c0f (diff) | |
| download | linux-stable-ebf3f19abbfd041a0e79a523e4dd1f6f6797b783.tar.gz linux-stable-ebf3f19abbfd041a0e79a523e4dd1f6f6797b783.tar.bz2 linux-stable-ebf3f19abbfd041a0e79a523e4dd1f6f6797b783.zip | |
Merge airlied/drm-next into drm-intel-next-queued
Maarten needs both the new connector->atomic_check hook and the
connection_mutex locking changes in the probe helpers to be able to
start merging the connector property conversion to atomic.
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.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 5f6e1aad909d..703605456200 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1365,10 +1365,10 @@ int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp); void vlv_wait_port_ready(struct drm_i915_private *dev_priv, struct intel_digital_port *dport, unsigned int expected_mask); -bool intel_get_load_detect_pipe(struct drm_connector *connector, - struct drm_display_mode *mode, - struct intel_load_detect_pipe *old, - struct drm_modeset_acquire_ctx *ctx); +int intel_get_load_detect_pipe(struct drm_connector *connector, + struct drm_display_mode *mode, + struct intel_load_detect_pipe *old, + struct drm_modeset_acquire_ctx *ctx); void intel_release_load_detect_pipe(struct drm_connector *connector, struct intel_load_detect_pipe *old, struct drm_modeset_acquire_ctx *ctx); |