From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v2] drm: Clean up the 1366x768 fixup codes Date: Thu, 26 Jan 2017 16:48:45 +0200 Message-ID: <20170126144845.GG31595@intel.com> References: <20170117164329.10551-1-tiwai@suse.de> <20170120194617.GI31595@intel.com> <20170123082352.qdebvg6a2lyohub3@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4BC806EBC7 for ; Thu, 26 Jan 2017 14:48:49 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20170123082352.qdebvg6a2lyohub3@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Takashi Iwai , dri-devel@lists.freedesktop.org, Gustavo Padovan , linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCBKYW4gMjMsIDIwMTcgYXQgMDk6MjM6NTJBTSArMDEwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKPiBPbiBGcmksIEphbiAyMCwgMjAxNyBhdCAwOTo0NjoxN1BNICswMjAwLCBWaWxsZSBT eXJqw6Rsw6Qgd3JvdGU6Cj4gPiBPbiBUdWUsIEphbiAxNywgMjAxNyBhdCAwNTo0MzoyOVBNICsw MTAwLCBUYWthc2hpIEl3YWkgd3JvdGU6Cj4gPiA+IFRoaXMgaXMganVzdCBhIGNsZWFudXAsIG5v IGZ1bmN0aW9uYWwgY2hhbmdlLgo+ID4gPiAKPiA+ID4gVGhlIGZpeHVwIGNvZGUgZm9yIDEzNjZ4 NzY4IGluIGRybV9tb2RlX2NyZWF0ZV9mcm9tX2NtZGxpbmVfbW9kZSgpIGlzCj4gPiA+IGJhc2lj YWxseSBhIGNvcHkgb2YgdGhlIGV4aXN0aW5nIGNvZGUgaW4gZHJtX2VkaWQuYy4gIE1ha2UgdGhl IGxhdHRlcgo+ID4gPiBjb2RlIHB1YmxpYyBzbyB0aGF0IGl0IGNhbiBiZSBjYWxsZWQgZnJvbSB0 aGUgZm9ybWVyIGZ1bmN0aW9uLgo+ID4gPiAKPiA+ID4gU2lnbmVkLW9mZi1ieTogVGFrYXNoaSBJ d2FpIDx0aXdhaUBzdXNlLmRlPgo+ID4gPiAtLS0KPiA+ID4gdjEtPnYyOiBGaXggdGhlIHdyb25n IGxpbmUgcmVtb3ZhbCBvZiBkcm1fbW9kZV9zZXRfY3J0Y2luZm8oKSBjYWxsCj4gPiAKPiA+IFdl IHByZWZlciB0byBpbmNsdWRlIHRoZSBjaGFuZ2Vsb2cgaW4gdGhlIGNvbW1pdCBtZXNzYWdlIHBy b3Blci4KPiA+IEJ1dCBpdCBjYW4gYmUgaG9pc3RlZCB1cCBlYXNpbHkgZW5vdWdoIHdoZW4gcHVz aGluZy4KPiA+IAo+ID4gbGd0bQo+ID4gUmV2aWV3ZWQtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmls bGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4gCj4gVmlsbGUsIGNhbiB5b3UgcGxzIGFsc28g YXBwbHkmcHVzaCB0aGlzIHRvIGRybS1taXNjLmdpdD8KClRoaXMgd291bGQgbmVlZCBhIGJhY2tt ZXJnZSBvZiB0aGUgcHJlY2VkaW5nIGZpeCBpbnRvIGRybS1taXNjLW5leHQuCgo+IAo+IFRoYW5r cywgRGFuaWVsCj4gPiAKPiA+ID4gCj4gPiA+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2NydGNfaW50 ZXJuYWwuaCB8IDMgKysrCj4gPiA+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2VkaWQuYyAgICAgICAg ICB8IDYgKysrLS0tCj4gPiA+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMgICAgICAgICB8 IDggKystLS0tLS0KPiA+ID4gIDMgZmlsZXMgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCA5IGRl bGV0aW9ucygtKQo+ID4gPiAKPiA+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1f Y3J0Y19pbnRlcm5hbC5oIGIvZHJpdmVycy9ncHUvZHJtL2RybV9jcnRjX2ludGVybmFsLmgKPiA+ ID4gaW5kZXggY2RmNjg2MGM5ZDIyLi4wMWJkZTcxMDNhZDYgMTAwNjQ0Cj4gPiA+IC0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9kcm1fY3J0Y19pbnRlcm5hbC5oCj4gPiA+ICsrKyBiL2RyaXZlcnMvZ3B1 L2RybS9kcm1fY3J0Y19pbnRlcm5hbC5oCj4gPiA+IEBAIC0xOTksMyArMTk5LDYgQEAgaW50IGRy bV9tb2RlX2N1cnNvcjJfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiA+ID4gIAkJCSAg IHZvaWQgKmRhdGEsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2KTsKPiA+ID4gIGludCBkcm1f bW9kZV9wYWdlX2ZsaXBfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiA+ID4gIAkJCSAg ICAgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpOwo+ID4gPiArCj4gPiA+ ICsvKiBkcm1fZWRpZC5jICovCj4gPiA+ICt2b2lkIGRybV9tb2RlX2ZpeHVwXzEzNjZ4NzY4KHN0 cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlKTsKPiA+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9kcm1fZWRpZC5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9lZGlkLmMKPiA+ID4gaW5k ZXggMzM2YmUzMWZmM2RlLi43MzlhMTljYjI3ZDkgMTAwNjQ0Cj4gPiA+IC0tLSBhL2RyaXZlcnMv Z3B1L2RybS9kcm1fZWRpZC5jCj4gPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZWRpZC5j Cj4gPiA+IEBAIC0yMTUyLDcgKzIxNTIsNyBAQCBkcm1fZG10X21vZGVzX2Zvcl9yYW5nZShzdHJ1 Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLCBzdHJ1Y3QgZWRpZCAqZWRpZCwKPiA+ID4gIC8q IGZpeCB1cCAxMzY2eDc2OCBtb2RlIGZyb20gMTM2OHg3Njg7Cj4gPiA+ICAgKiBHRlQvQ1ZUIGNh bid0IGV4cHJlc3MgMTM2NiB3aWR0aCB3aGljaCBpc24ndCBkaXZpZGFibGUgYnkgOAo+ID4gPiAg ICovCj4gPiA+IC1zdGF0aWMgdm9pZCBmaXh1cF9tb2RlXzEzNjZ4NzY4KHN0cnVjdCBkcm1fZGlz cGxheV9tb2RlICptb2RlKQo+ID4gPiArdm9pZCBkcm1fbW9kZV9maXh1cF8xMzY2eDc2OChzdHJ1 Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSkKPiA+ID4gIHsKPiA+ID4gIAlpZiAobW9kZS0+aGRp c3BsYXkgPT0gMTM2OCAmJiBtb2RlLT52ZGlzcGxheSA9PSA3NjgpIHsKPiA+ID4gIAkJbW9kZS0+ aGRpc3BsYXkgPSAxMzY2Owo+ID4gPiBAQCAtMjE3Niw3ICsyMTc2LDcgQEAgZHJtX2d0Zl9tb2Rl c19mb3JfcmFuZ2Uoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rvciwgc3RydWN0IGVkaWQg KmVkaWQsCj4gPiA+ICAJCWlmICghbmV3bW9kZSkKPiA+ID4gIAkJCXJldHVybiBtb2RlczsKPiA+ ID4gIAo+ID4gPiAtCQlmaXh1cF9tb2RlXzEzNjZ4NzY4KG5ld21vZGUpOwo+ID4gPiArCQlkcm1f bW9kZV9maXh1cF8xMzY2eDc2OChuZXdtb2RlKTsKPiA+ID4gIAkJaWYgKCFtb2RlX2luX3Jhbmdl KG5ld21vZGUsIGVkaWQsIHRpbWluZykgfHwKPiA+ID4gIAkJICAgICF2YWxpZF9pbmZlcnJlZF9t b2RlKGNvbm5lY3RvciwgbmV3bW9kZSkpIHsKPiA+ID4gIAkJCWRybV9tb2RlX2Rlc3Ryb3koZGV2 LCBuZXdtb2RlKTsKPiA+ID4gQEAgLTIyMDUsNyArMjIwNSw3IEBAIGRybV9jdnRfbW9kZXNfZm9y X3JhbmdlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsIHN0cnVjdCBlZGlkICplZGlk LAo+ID4gPiAgCQlpZiAoIW5ld21vZGUpCj4gPiA+ICAJCQlyZXR1cm4gbW9kZXM7Cj4gPiA+ICAK PiA+ID4gLQkJZml4dXBfbW9kZV8xMzY2eDc2OChuZXdtb2RlKTsKPiA+ID4gKwkJZHJtX21vZGVf Zml4dXBfMTM2Nng3NjgobmV3bW9kZSk7Cj4gPiA+ICAJCWlmICghbW9kZV9pbl9yYW5nZShuZXdt b2RlLCBlZGlkLCB0aW1pbmcpIHx8Cj4gPiA+ICAJCSAgICAhdmFsaWRfaW5mZXJyZWRfbW9kZShj b25uZWN0b3IsIG5ld21vZGUpKSB7Cj4gPiA+ICAJCQlkcm1fbW9kZV9kZXN0cm95KGRldiwgbmV3 bW9kZSk7Cj4gPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMKPiA+ID4gaW5kZXggZTZiMTliYzkwMjFhLi4zNWJi OTkzZWJjMzkgMTAwNjQ0Cj4gPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZXMuYwo+ ID4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMKPiA+ID4gQEAgLTE0NjEsMTIg KzE0NjEsOCBAQCBkcm1fbW9kZV9jcmVhdGVfZnJvbV9jbWRsaW5lX21vZGUoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKPiA+ID4gIAo+ID4gPiAgCW1vZGUtPnR5cGUgfD0gRFJNX01PREVfVFlQRV9V U0VSREVGOwo+ID4gPiAgCS8qIGZpeCB1cCAxMzY4eDc2ODogR0ZUL0NWVCBjYW4ndCBleHByZXNz IDEzNjYgd2lkdGggZHVlIHRvIGFsaWdubWVudCAqLwo+ID4gPiAtCWlmIChjbWQtPnhyZXMgPT0g MTM2NiAmJiBtb2RlLT5oZGlzcGxheSA9PSAxMzY4KSB7Cj4gPiA+IC0JCW1vZGUtPmhkaXNwbGF5 ID0gMTM2NjsKPiA+ID4gLQkJbW9kZS0+aHN5bmNfc3RhcnQtLTsKPiA+ID4gLQkJbW9kZS0+aHN5 bmNfZW5kLS07Cj4gPiA+IC0JCWRybV9tb2RlX3NldF9uYW1lKG1vZGUpOwo+ID4gPiAtCX0KPiA+ ID4gKwlpZiAoY21kLT54cmVzID09IDEzNjYpCj4gPiA+ICsJCWRybV9tb2RlX2ZpeHVwXzEzNjZ4 NzY4KG1vZGUpOwo+ID4gPiAgCWRybV9tb2RlX3NldF9jcnRjaW5mbyhtb2RlLCBDUlRDX0lOVEVS TEFDRV9IQUxWRV9WKTsKPiA+ID4gIAlyZXR1cm4gbW9kZTsKPiA+ID4gIH0KPiA+ID4gLS0gCj4g PiA+IDIuMTEuMAo+ID4gCj4gPiAtLSAKPiA+IFZpbGxlIFN5cmrDpGzDpAo+ID4gSW50ZWwgT1RD Cj4gCj4gLS0gCj4gRGFuaWVsIFZldHRlcgo+IFNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jw b3JhdGlvbgo+IGh0dHA6Ly9ibG9nLmZmd2xsLmNoCgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVs IE9UQwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmkt ZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752666AbdAZOsv (ORCPT ); Thu, 26 Jan 2017 09:48:51 -0500 Received: from mga05.intel.com ([192.55.52.43]:2233 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752049AbdAZOst (ORCPT ); Thu, 26 Jan 2017 09:48:49 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,289,1477983600"; d="scan'208";a="1099235420" Date: Thu, 26 Jan 2017 16:48:45 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Takashi Iwai , dri-devel@lists.freedesktop.org, Gustavo Padovan , linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] drm: Clean up the 1366x768 fixup codes Message-ID: <20170126144845.GG31595@intel.com> References: <20170117164329.10551-1-tiwai@suse.de> <20170120194617.GI31595@intel.com> <20170123082352.qdebvg6a2lyohub3@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170123082352.qdebvg6a2lyohub3@phenom.ffwll.local> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 23, 2017 at 09:23:52AM +0100, Daniel Vetter wrote: > On Fri, Jan 20, 2017 at 09:46:17PM +0200, Ville Syrjälä wrote: > > On Tue, Jan 17, 2017 at 05:43:29PM +0100, Takashi Iwai wrote: > > > This is just a cleanup, no functional change. > > > > > > The fixup code for 1366x768 in drm_mode_create_from_cmdline_mode() is > > > basically a copy of the existing code in drm_edid.c. Make the latter > > > code public so that it can be called from the former function. > > > > > > Signed-off-by: Takashi Iwai > > > --- > > > v1->v2: Fix the wrong line removal of drm_mode_set_crtcinfo() call > > > > We prefer to include the changelog in the commit message proper. > > But it can be hoisted up easily enough when pushing. > > > > lgtm > > Reviewed-by: Ville Syrjälä > > Ville, can you pls also apply&push this to drm-misc.git? This would need a backmerge of the preceding fix into drm-misc-next. > > Thanks, Daniel > > > > > > > > drivers/gpu/drm/drm_crtc_internal.h | 3 +++ > > > drivers/gpu/drm/drm_edid.c | 6 +++--- > > > drivers/gpu/drm/drm_modes.c | 8 ++------ > > > 3 files changed, 8 insertions(+), 9 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h > > > index cdf6860c9d22..01bde7103ad6 100644 > > > --- a/drivers/gpu/drm/drm_crtc_internal.h > > > +++ b/drivers/gpu/drm/drm_crtc_internal.h > > > @@ -199,3 +199,6 @@ int drm_mode_cursor2_ioctl(struct drm_device *dev, > > > void *data, struct drm_file *file_priv); > > > int drm_mode_page_flip_ioctl(struct drm_device *dev, > > > void *data, struct drm_file *file_priv); > > > + > > > +/* drm_edid.c */ > > > +void drm_mode_fixup_1366x768(struct drm_display_mode *mode); > > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > > > index 336be31ff3de..739a19cb27d9 100644 > > > --- a/drivers/gpu/drm/drm_edid.c > > > +++ b/drivers/gpu/drm/drm_edid.c > > > @@ -2152,7 +2152,7 @@ drm_dmt_modes_for_range(struct drm_connector *connector, struct edid *edid, > > > /* fix up 1366x768 mode from 1368x768; > > > * GFT/CVT can't express 1366 width which isn't dividable by 8 > > > */ > > > -static void fixup_mode_1366x768(struct drm_display_mode *mode) > > > +void drm_mode_fixup_1366x768(struct drm_display_mode *mode) > > > { > > > if (mode->hdisplay == 1368 && mode->vdisplay == 768) { > > > mode->hdisplay = 1366; > > > @@ -2176,7 +2176,7 @@ drm_gtf_modes_for_range(struct drm_connector *connector, struct edid *edid, > > > if (!newmode) > > > return modes; > > > > > > - fixup_mode_1366x768(newmode); > > > + drm_mode_fixup_1366x768(newmode); > > > if (!mode_in_range(newmode, edid, timing) || > > > !valid_inferred_mode(connector, newmode)) { > > > drm_mode_destroy(dev, newmode); > > > @@ -2205,7 +2205,7 @@ drm_cvt_modes_for_range(struct drm_connector *connector, struct edid *edid, > > > if (!newmode) > > > return modes; > > > > > > - fixup_mode_1366x768(newmode); > > > + drm_mode_fixup_1366x768(newmode); > > > if (!mode_in_range(newmode, edid, timing) || > > > !valid_inferred_mode(connector, newmode)) { > > > drm_mode_destroy(dev, newmode); > > > diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c > > > index e6b19bc9021a..35bb993ebc39 100644 > > > --- a/drivers/gpu/drm/drm_modes.c > > > +++ b/drivers/gpu/drm/drm_modes.c > > > @@ -1461,12 +1461,8 @@ drm_mode_create_from_cmdline_mode(struct drm_device *dev, > > > > > > mode->type |= DRM_MODE_TYPE_USERDEF; > > > /* fix up 1368x768: GFT/CVT can't express 1366 width due to alignment */ > > > - if (cmd->xres == 1366 && mode->hdisplay == 1368) { > > > - mode->hdisplay = 1366; > > > - mode->hsync_start--; > > > - mode->hsync_end--; > > > - drm_mode_set_name(mode); > > > - } > > > + if (cmd->xres == 1366) > > > + drm_mode_fixup_1366x768(mode); > > > drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V); > > > return mode; > > > } > > > -- > > > 2.11.0 > > > > -- > > Ville Syrjälä > > Intel OTC > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- Ville Syrjälä Intel OTC