|
@@ -10245,13 +10245,10 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
|
|
|
{
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
|
|
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
|
|
|
- enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
|
|
|
+ enum transcoder cpu_transcoder;
|
|
|
struct drm_display_mode *mode;
|
|
|
struct intel_crtc_state *pipe_config;
|
|
|
- int htot = I915_READ(HTOTAL(cpu_transcoder));
|
|
|
- int hsync = I915_READ(HSYNC(cpu_transcoder));
|
|
|
- int vtot = I915_READ(VTOTAL(cpu_transcoder));
|
|
|
- int vsync = I915_READ(VSYNC(cpu_transcoder));
|
|
|
+ u32 htot, hsync, vtot, vsync;
|
|
|
enum pipe pipe = intel_crtc->pipe;
|
|
|
|
|
|
mode = kzalloc(sizeof(*mode), GFP_KERNEL);
|
|
@@ -10279,6 +10276,13 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
|
|
|
i9xx_crtc_clock_get(intel_crtc, pipe_config);
|
|
|
|
|
|
mode->clock = pipe_config->port_clock / pipe_config->pixel_multiplier;
|
|
|
+
|
|
|
+ cpu_transcoder = pipe_config->cpu_transcoder;
|
|
|
+ htot = I915_READ(HTOTAL(cpu_transcoder));
|
|
|
+ hsync = I915_READ(HSYNC(cpu_transcoder));
|
|
|
+ vtot = I915_READ(VTOTAL(cpu_transcoder));
|
|
|
+ vsync = I915_READ(VSYNC(cpu_transcoder));
|
|
|
+
|
|
|
mode->hdisplay = (htot & 0xffff) + 1;
|
|
|
mode->htotal = ((htot & 0xffff0000) >> 16) + 1;
|
|
|
mode->hsync_start = (hsync & 0xffff) + 1;
|