From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/i915/dp: Fix alt mode handling. Date: Tue, 13 Mar 2018 16:27:17 +0200 Message-ID: <20180313142717.GX5453@intel.com> References: <20180313131143.GV5453@intel.com> <20180313135235.13686-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 830586E2B2 for ; Tue, 13 Mar 2018 14:27:24 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20180313135235.13686-1-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Maarten Lankhorst Cc: Paulo Zanoni , Jani Nikula , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCBNYXIgMTMsIDIwMTggYXQgMDI6NTI6MzVQTSArMDEwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gT24gZmktY25sLXkzIHdlIGhhdmUgMiBtb2RlcyB0aGF0IGRpZmZlciBvbmx5 IGJ5IGNydGNfY2xvY2suIFRoaXMgbWVhbnMKPiB0aGF0IGlmIHdlIHJlcXVlc3QgdGhlIG5vcm1h bCBtb2RlLCB3ZSBhdXRvbWF0aWNhbGx5IGdldCB0aGUgZG93bmNsb2NrZWQKPiBtb2RlLgo+IAo+ IFRoaXMgY2FuIGJlIHNlZW4gZHVyaW5nIGJvb3Q6Cj4gW2RybTpkcm1faGVscGVyX3Byb2JlX3Np bmdsZV9jb25uZWN0b3JfbW9kZXNdIFtDT05ORUNUT1I6MTAxOmVEUC0xXSBwcm9iZWQgbW9kZXMg Ogo+IFtkcm06ZHJtX21vZGVfZGVidWdfcHJpbnRtb2RlbGluZV0gTW9kZWxpbmUgMTAyOiIzODQw eDIxNjAiIDYwIDUzMzI1MCAzODQwIDM4ODggMzkyMCA0MDAwIDIxNjAgMjE2MyAyMTY4IDIyMjIg MHg0OCAweGEKPiBbZHJtOmRybV9tb2RlX2RlYnVnX3ByaW50bW9kZWxpbmVdIE1vZGVsaW5lIDEw MzoiMzg0MHgyMTYwIiA0OCA0MjY2MDAgMzg0MCAzODg4IDM5MjAgNDAwMCAyMTYwIDIxNjMgMjE2 OCAyMjIyIDB4NDAgMHhhCj4gLi4uCj4gW2RybTppbnRlbF9kdW1wX3BpcGVfY29uZmlnIFtpOTE1 XV0gW0NSVEM6NTE6cGlwZSBBXVttb2Rlc2V0XQo+IFtkcm06aW50ZWxfZHVtcF9waXBlX2NvbmZp ZyBbaTkxNV1dIG91dHB1dF90eXBlczogRURQICgweDEwMCkKPiBbZHJtOmludGVsX2R1bXBfcGlw ZV9jb25maWcgW2k5MTVdXSBjcHVfdHJhbnNjb2RlcjogRURQLCBwaXBlIGJwcDogMjQsIGRpdGhl cmluZzogMAo+IFtkcm06aW50ZWxfZHVtcF9waXBlX2NvbmZpZyBbaTkxNV1dIGRwIG1fbjogbGFu ZXM6IDQ7IGdtY2hfbTogNDk3MDI1MCwgZ21jaF9uOiA4Mzg4NjA4LCBsaW5rX206IDgyODM3NSwg bGlua19uOiAxMDQ4NTc2LCB0dTogNjQKPiBbZHJtOmludGVsX2R1bXBfcGlwZV9jb25maWcgW2k5 MTVdXSBkcCBtMl9uMjogbGFuZXM6IDQ7IGdtY2hfbTogNDk3MDI1MCwgZ21jaF9uOiA4Mzg4NjA4 LCBsaW5rX206IDgyODM3NSwgbGlua19uOiAxMDQ4NTc2LCB0dTogNjQKPiBbZHJtOmludGVsX2R1 bXBfcGlwZV9jb25maWcgW2k5MTVdXSBhdWRpbzogMCwgaW5mb2ZyYW1lczogMAo+IFtkcm06aW50 ZWxfZHVtcF9waXBlX2NvbmZpZyBbaTkxNV1dIHJlcXVlc3RlZCBtb2RlOgo+IFtkcm06ZHJtX21v ZGVfZGVidWdfcHJpbnRtb2RlbGluZV0gTW9kZWxpbmUgMDoiMzg0MHgyMTYwIiA2MCA1MzMyNTAg Mzg0MCAzODg4IDM5MjAgNDAwMCAyMTYwIDIxNjMgMjE2OCAyMjIyIDB4NDggMHhhCj4gW2RybTpp bnRlbF9kdW1wX3BpcGVfY29uZmlnIFtpOTE1XV0gYWRqdXN0ZWQgbW9kZToKPiBbZHJtOmRybV9t b2RlX2RlYnVnX3ByaW50bW9kZWxpbmVdIE1vZGVsaW5lIDA6IjM4NDB4MjE2MCIgNDggNDI2NjAw IDM4NDAgMzg4OCAzOTIwIDQwMDAgMjE2MCAyMTYzIDIxNjggMjIyMiAweDQwIDB4YQo+IAo+IEFk ZCBhIGludGVsX2VkcF9jaG9vc2VfbW9kZSBoZWxwZXIgdGhhdCBwaWNrcyB0aGUgbW9kZS4KPiAK PiBJZiB0aGVyZSBpcyBubyBhbHQgbW9kZSwgaXQgYWx3YXlzIHBpY2tzIHRoZSBkZWZhdWx0IG1v ZGUuCj4gSWYgdGhlIGFsdCBtb2RlIGlzIGlkZW50aWNhbCB0byB0aGUgZGVmYXVsdCBtb2RlLCBp dCBwaWNrcyB0aGUgbW9kZQo+IGJhc2VkIG9uIHdoYXQgbW9kZSBpcyBjbG9zZXN0IHRvIHRoZSBy ZXF1ZXN0IGNsb2NrLgo+IElmIHRoZSBhbHQgbW9kZSBkaWZmZXJzLCBpdCBvbmx5IHBpY2tzIHRo ZSBhbHQgbW9kZSBvbiBleGFjdCBtYXRjaC4KPiAKPiBUZXN0Y2FzZToga21zX3BhbmVsX2ZpdHRp bmcuYXRvbWljLWZhc3RzZXQKPiBTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFh cnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgo+IEZpeGVzOiBkYzkxMWY1YmQ4YWEgKCJk cm0vaTkxNS9lZHA6IEFsbG93IGFsdGVybmF0ZSBmaXhlZCBtb2RlIGZvciBlRFAgaWYgYXZhaWxh YmxlLiIpCj4gQ2M6IERhdmlkIFdlaW5laGFsbCA8ZGF2aWQud2VpbmVoYWxsQGxpbnV4LmludGVs LmNvbT4KPiBDYzogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgo+IENjOiBQ YXVsbyBaYW5vbmkgPHBhdWxvLnIuemFub25pQGludGVsLmNvbT4KPiBDYzogSmFuaSBOaWt1bGEg PGphbmkubmlrdWxhQGludGVsLmNvbT4KPiBDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+Cj4gQ2M6IEppbSBCcmlkZSA8amltLmJyaWRlQGxpbnV4LmludGVsLmNvbT4K PiBDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgo+ IENjOiA8c3RhYmxlQHZnZXIua2VybmVsLm9yZz4gIyB2NC4xNCsKPiBCdWd6aWxsYTogaHR0cHM6 Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1NDY5Cj4gUmVmZXJlbmNl czogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1NDU2Cj4g LS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgfCAzOSArKysrKysrKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDIxIGluc2VydGlv bnMoKyksIDE4IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwo+IGluZGV4 IDlhNGE1MWU3OWZhMS4uMDc1OTgxODQyYTdmIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RwLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5j Cj4gQEAgLTE2NzEsMjEgKzE2NzEsMjUgQEAgc3RhdGljIGludCBpbnRlbF9kcF9jb21wdXRlX2Jw cChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAo+ICAJcmV0dXJuIGJwcDsKPiAgfQo+ICAKPiAt c3RhdGljIGJvb2wgaW50ZWxfZWRwX2NvbXBhcmVfYWx0X21vZGUoc3RydWN0IGRybV9kaXNwbGF5 X21vZGUgKm0xLAo+IC0JCQkJICAgICAgIHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptMikKPiAr c3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICoKPiAraW50ZWxfZWRwX2Nob29z ZV9tb2RlKGNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpyZXEsCj4gKwkJICAgICAgY29u c3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmRlZiwKPiArCQkgICAgICBjb25zdCBzdHJ1Y3Qg ZHJtX2Rpc3BsYXlfbW9kZSAqYWx0KQo+ICB7Cj4gLQlib29sIGJyZXMgPSBmYWxzZTsKPiArCWlm ICghYWx0KQo+ICsJCXJldHVybiBkZWY7Cj4gIAo+IC0JaWYgKG0xICYmIG0yKQo+IC0JCWJyZXMg PSAobTEtPmhkaXNwbGF5ID09IG0yLT5oZGlzcGxheSAmJgo+IC0JCQltMS0+aHN5bmNfc3RhcnQg PT0gbTItPmhzeW5jX3N0YXJ0ICYmCj4gLQkJCW0xLT5oc3luY19lbmQgPT0gbTItPmhzeW5jX2Vu ZCAmJgo+IC0JCQltMS0+aHRvdGFsID09IG0yLT5odG90YWwgJiYKPiAtCQkJbTEtPnZkaXNwbGF5 ID09IG0yLT52ZGlzcGxheSAmJgo+IC0JCQltMS0+dnN5bmNfc3RhcnQgPT0gbTItPnZzeW5jX3N0 YXJ0ICYmCj4gLQkJCW0xLT52c3luY19lbmQgPT0gbTItPnZzeW5jX2VuZCAmJgo+IC0JCQltMS0+ dnRvdGFsID09IG0yLT52dG90YWwpOwo+IC0JcmV0dXJuIGJyZXM7Cj4gKwlpZiAoZHJtX21vZGVf ZXF1YWxfbm9fY2xvY2tzKGRlZiwgYWx0KSkgewo+ICsJCWludCBjbG9jazsKPiArCj4gKwkJaWYg KCFkcm1fbW9kZV9lcXVhbF9ub19jbG9ja3MocmVxLCBkZWYpKQo+ICsJCQlyZXR1cm4gZGVmOwo+ ICsKPiArCQljbG9jayA9IGRlZi0+Y2xvY2sgLyAyICsgYWx0LT5jbG9jayAvIDI7Cj4gKwo+ICsJ CXJldHVybiByZXEtPmNsb2NrID4gY2xvY2sgPyBkZWYgOiBhbHQ7Cj4gKwl9IGVsc2UKPiArCQly ZXR1cm4gZHJtX21vZGVfZXF1YWxfbm9fY2xvY2tzKHJlcSwgYWx0KSA/IGFsdCA6IGRlZjsKClNl ZW1zIGEgYml0IGNvbnZvbHV0ZWQgdG8gbWUuCgpyZXR1cm4gdXNlcl9tb2RlLT52cmVmcmVzaCA+ IGFsdF9tb2RlLT52cmVmcmVzaCA/CglmaXhlZF9tb2RlIDogYWx0X21vZGU7CgptYXliZT8KClRo b3VnaCB3ZSBkb24ndCBzZWVtIHRvIHRyeSB2ZXJ5IGhhcmQgdG8gbWFrZSB2cmVmcmVzaCBhY2N1 cmF0ZSBzbyBub3QKMTAwJSB0aGlzIGlzIGdvaW5nIHRvIHdvcmsgcGVyZmVjdGx5LgoKSSBndWVz cyB3ZSBjb3VsZCBnbyB3aXRoIHRoZSAicGljayB0aGUgY2xvc2VzdCIgdnJlZnJlc2ggYXBwcm9h Y2gKaW5zdGVhZC4gSSdtIHRoaW5raW5nIHdlIHNob3VsZCBhY3R1YWxseSBiZSByZWplY3Rpbmcg dGhlIHVzZXIgbW9kZQplbnRpcmVseSBpZiBpdCBpc24ndCBjbG9zZXRvIGVpdGhlciByZWZyZXNo IHJhdGUuCgo+ICB9Cj4gIAo+ICBib29sCj4gQEAgLTE3MzQsMTIgKzE3MzgsMTEgQEAgaW50ZWxf ZHBfY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCj4gIAkJcGlw ZV9jb25maWctPmhhc19hdWRpbyA9IGludGVsX2Nvbm5fc3RhdGUtPmZvcmNlX2F1ZGlvID09IEhE TUlfQVVESU9fT047Cj4gIAo+ICAJaWYgKGludGVsX2RwX2lzX2VkcChpbnRlbF9kcCkgJiYgaW50 ZWxfY29ubmVjdG9yLT5wYW5lbC5maXhlZF9tb2RlKSB7Cj4gLQkJc3RydWN0IGRybV9kaXNwbGF5 X21vZGUgKnBhbmVsX21vZGUgPQo+IC0JCQlpbnRlbF9jb25uZWN0b3ItPnBhbmVsLmFsdF9maXhl ZF9tb2RlOwo+IC0JCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpyZXFfbW9kZSA9ICZwaXBlX2Nv bmZpZy0+YmFzZS5tb2RlOwo+ICsJCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpwYW5l bF9tb2RlOwo+ICAKPiAtCQlpZiAoIWludGVsX2VkcF9jb21wYXJlX2FsdF9tb2RlKHJlcV9tb2Rl LCBwYW5lbF9tb2RlKSkKPiAtCQkJcGFuZWxfbW9kZSA9IGludGVsX2Nvbm5lY3Rvci0+cGFuZWwu Zml4ZWRfbW9kZTsKPiArCQlwYW5lbF9tb2RlID0gaW50ZWxfZWRwX2Nob29zZV9tb2RlKCZwaXBl X2NvbmZpZy0+YmFzZS5tb2RlLAo+ICsJCQkJCQkgICBpbnRlbF9jb25uZWN0b3ItPnBhbmVsLmZp eGVkX21vZGUsCj4gKwkJCQkJCSAgIGludGVsX2Nvbm5lY3Rvci0+cGFuZWwuYWx0X2ZpeGVkX21v ZGUpOwo+ICAKPiAgCQlkcm1fbW9kZV9kZWJ1Z19wcmludG1vZGVsaW5lKHBhbmVsX21vZGUpOwo+ ICAKPiAtLSAKPiAyLjE2LjIKCi0tIApWaWxsZSBTeXJqw6Rsw6QKSW50ZWwgT1RDCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com ([134.134.136.24]:53010 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752163AbeCMO1X (ORCPT ); Tue, 13 Mar 2018 10:27:23 -0400 Date: Tue, 13 Mar 2018 16:27:17 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Maarten Lankhorst Cc: intel-gfx@lists.freedesktop.org, David Weinehall , Rodrigo Vivi , Paulo Zanoni , Jani Nikula , Chris Wilson , Jim Bride , Joonas Lahtinen , stable@vger.kernel.org Subject: Re: [PATCH] drm/i915/dp: Fix alt mode handling. Message-ID: <20180313142717.GX5453@intel.com> References: <20180313131143.GV5453@intel.com> <20180313135235.13686-1-maarten.lankhorst@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20180313135235.13686-1-maarten.lankhorst@linux.intel.com> Sender: stable-owner@vger.kernel.org List-ID: On Tue, Mar 13, 2018 at 02:52:35PM +0100, Maarten Lankhorst wrote: > On fi-cnl-y3 we have 2 modes that differ only by crtc_clock. This means > that if we request the normal mode, we automatically get the downclocked > mode. > > This can be seen during boot: > [drm:drm_helper_probe_single_connector_modes] [CONNECTOR:101:eDP-1] probed modes : > [drm:drm_mode_debug_printmodeline] Modeline 102:"3840x2160" 60 533250 3840 3888 3920 4000 2160 2163 2168 2222 0x48 0xa > [drm:drm_mode_debug_printmodeline] Modeline 103:"3840x2160" 48 426600 3840 3888 3920 4000 2160 2163 2168 2222 0x40 0xa > ... > [drm:intel_dump_pipe_config [i915]] [CRTC:51:pipe A][modeset] > [drm:intel_dump_pipe_config [i915]] output_types: EDP (0x100) > [drm:intel_dump_pipe_config [i915]] cpu_transcoder: EDP, pipe bpp: 24, dithering: 0 > [drm:intel_dump_pipe_config [i915]] dp m_n: lanes: 4; gmch_m: 4970250, gmch_n: 8388608, link_m: 828375, link_n: 1048576, tu: 64 > [drm:intel_dump_pipe_config [i915]] dp m2_n2: lanes: 4; gmch_m: 4970250, gmch_n: 8388608, link_m: 828375, link_n: 1048576, tu: 64 > [drm:intel_dump_pipe_config [i915]] audio: 0, infoframes: 0 > [drm:intel_dump_pipe_config [i915]] requested mode: > [drm:drm_mode_debug_printmodeline] Modeline 0:"3840x2160" 60 533250 3840 3888 3920 4000 2160 2163 2168 2222 0x48 0xa > [drm:intel_dump_pipe_config [i915]] adjusted mode: > [drm:drm_mode_debug_printmodeline] Modeline 0:"3840x2160" 48 426600 3840 3888 3920 4000 2160 2163 2168 2222 0x40 0xa > > Add a intel_edp_choose_mode helper that picks the mode. > > If there is no alt mode, it always picks the default mode. > If the alt mode is identical to the default mode, it picks the mode > based on what mode is closest to the request clock. > If the alt mode differs, it only picks the alt mode on exact match. > > Testcase: kms_panel_fitting.atomic-fastset > Signed-off-by: Maarten Lankhorst > Fixes: dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for eDP if available.") > Cc: David Weinehall > Cc: Rodrigo Vivi > Cc: Paulo Zanoni > Cc: Jani Nikula > Cc: Chris Wilson > Cc: Jim Bride > Cc: Joonas Lahtinen > Cc: # v4.14+ > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105469 > References: https://bugs.freedesktop.org/show_bug.cgi?id=105456 > --- > drivers/gpu/drm/i915/intel_dp.c | 39 +++++++++++++++++++++------------------ > 1 file changed, 21 insertions(+), 18 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 9a4a51e79fa1..075981842a7f 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -1671,21 +1671,25 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp, > return bpp; > } > > -static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1, > - struct drm_display_mode *m2) > +static const struct drm_display_mode * > +intel_edp_choose_mode(const struct drm_display_mode *req, > + const struct drm_display_mode *def, > + const struct drm_display_mode *alt) > { > - bool bres = false; > + if (!alt) > + return def; > > - if (m1 && m2) > - bres = (m1->hdisplay == m2->hdisplay && > - m1->hsync_start == m2->hsync_start && > - m1->hsync_end == m2->hsync_end && > - m1->htotal == m2->htotal && > - m1->vdisplay == m2->vdisplay && > - m1->vsync_start == m2->vsync_start && > - m1->vsync_end == m2->vsync_end && > - m1->vtotal == m2->vtotal); > - return bres; > + if (drm_mode_equal_no_clocks(def, alt)) { > + int clock; > + > + if (!drm_mode_equal_no_clocks(req, def)) > + return def; > + > + clock = def->clock / 2 + alt->clock / 2; > + > + return req->clock > clock ? def : alt; > + } else > + return drm_mode_equal_no_clocks(req, alt) ? alt : def; Seems a bit convoluted to me. return user_mode->vrefresh > alt_mode->vrefresh ? fixed_mode : alt_mode; maybe? Though we don't seem to try very hard to make vrefresh accurate so not 100% this is going to work perfectly. I guess we could go with the "pick the closest" vrefresh approach instead. I'm thinking we should actually be rejecting the user mode entirely if it isn't closeto either refresh rate. > } > > bool > @@ -1734,12 +1738,11 @@ intel_dp_compute_config(struct intel_encoder *encoder, > pipe_config->has_audio = intel_conn_state->force_audio == HDMI_AUDIO_ON; > > if (intel_dp_is_edp(intel_dp) && intel_connector->panel.fixed_mode) { > - struct drm_display_mode *panel_mode = > - intel_connector->panel.alt_fixed_mode; > - struct drm_display_mode *req_mode = &pipe_config->base.mode; > + const struct drm_display_mode *panel_mode; > > - if (!intel_edp_compare_alt_mode(req_mode, panel_mode)) > - panel_mode = intel_connector->panel.fixed_mode; > + panel_mode = intel_edp_choose_mode(&pipe_config->base.mode, > + intel_connector->panel.fixed_mode, > + intel_connector->panel.alt_fixed_mode); > > drm_mode_debug_printmodeline(panel_mode); > > -- > 2.16.2 -- Ville Syrj�l� Intel OTC