leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: Use atomic state for load detect in crt.

Browse Source 
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1455697119-31416-3-git-send-email-maarten.lankhorst@linux.intel.com
This commit is contained in:
Maarten Lankhorst 2016-02-17 09:18:36 +01:00
parent edde361711
commit c8ecb2f162
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/intel_crt.c
View File

@ -480,11 +480,10 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)
} }
static enum drm_connector_status static enum drm_connector_status
intel_crt_load_detect(struct intel_crt *crt) intel_crt_load_detect(struct intel_crt *crt, uint32_t pipe)
{ {
struct drm_device *dev = crt->base.base.dev; struct drm_device *dev = crt->base.base.dev;
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
uint32_t pipe = to_intel_crtc(crt->base.base.crtc)->pipe;
uint32_t save_bclrpat; uint32_t save_bclrpat;
uint32_t save_vtotal; uint32_t save_vtotal;
uint32_t vtotal, vactive; uint32_t vtotal, vactive;
@ -653,7 +652,8 @@ intel_crt_detect(struct drm_connector *connector, bool force)
if (intel_crt_detect_ddc(connector)) if (intel_crt_detect_ddc(connector))
status = connector_status_connected; status = connector_status_connected;
else if (INTEL_INFO(dev)->gen < 4) else if (INTEL_INFO(dev)->gen < 4)
status = intel_crt_load_detect(crt); status = intel_crt_load_detect(crt,
to_intel_crtc(connector->state->crtc)->pipe);
else else
status = connector_status_unknown; status = connector_status_unknown;
intel_release_load_detect_pipe(connector, &tmp, &ctx); intel_release_load_detect_pipe(connector, &tmp, &ctx);