|
@@ -7110,18 +7110,11 @@ static bool ironlake_compute_clocks(struct drm_crtc *crtc,
|
|
|
{
|
|
|
struct drm_device *dev = crtc->dev;
|
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
- struct intel_encoder *intel_encoder;
|
|
|
int refclk;
|
|
|
const intel_limit_t *limit;
|
|
|
bool ret, is_lvds = false;
|
|
|
|
|
|
- for_each_encoder_on_crtc(dev, crtc, intel_encoder) {
|
|
|
- switch (intel_encoder->type) {
|
|
|
- case INTEL_OUTPUT_LVDS:
|
|
|
- is_lvds = true;
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
+ is_lvds = intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS);
|
|
|
|
|
|
refclk = ironlake_get_refclk(crtc);
|
|
|
|
|
@@ -7261,23 +7254,13 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
|
|
|
{
|
|
|
struct drm_device *dev = crtc->dev;
|
|
|
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
|
|
|
- int num_connectors = 0;
|
|
|
intel_clock_t clock, reduced_clock;
|
|
|
u32 dpll = 0, fp = 0, fp2 = 0;
|
|
|
bool ok, has_reduced_clock = false;
|
|
|
bool is_lvds = false;
|
|
|
- struct intel_encoder *encoder;
|
|
|
struct intel_shared_dpll *pll;
|
|
|
|
|
|
- for_each_encoder_on_crtc(dev, crtc, encoder) {
|
|
|
- switch (encoder->type) {
|
|
|
- case INTEL_OUTPUT_LVDS:
|
|
|
- is_lvds = true;
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- num_connectors++;
|
|
|
- }
|
|
|
+ is_lvds = intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS);
|
|
|
|
|
|
WARN(!(HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)),
|
|
|
"Unexpected PCH type %d\n", INTEL_PCH_TYPE(dev));
|