From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mario Kleiner Subject: Re: [PATCH] drm/i915: Fix legacy gamma lut updates in Linux 4.7-rc6 Date: Tue, 12 Jul 2016 14:11:39 +0200 Message-ID: <5784DE7B.4030407@gmail.com> References: <1468319586-8509-1-git-send-email-mario.kleiner.de@gmail.com> <15be51a4-74e2-2390-5a18-2172a7eae8ce@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <15be51a4-74e2-2390-5a18-2172a7eae8ce@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Lionel Landwerlin , dri-devel@lists.freedesktop.org Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gMDcvMTIvMjAxNiAxMjo1MCBQTSwgTGlvbmVsIExhbmR3ZXJsaW4gd3JvdGU6Cj4gSGkgTWFy aW8sCj4KCkhpIExpb25lbCwKCj4gVGhlcmUgd2FzIGEgY291cGxlIG9mIHBhdGNoIHRvIGZpeCB0 aGlzIGlzc3VlIDoKPgo+IGh0dHBzOi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9zZXJpZXMv NTQ2Ny8KPiBodHRwczovL3BhdGNod29yay5mcmVlZGVza3RvcC5vcmcvc2VyaWVzLzU0NjYvCj4K Ckxvb2tpbmcgYXQgdGhlbSB0aGV5IHNob3VsZCBmaXggdGhlIGlzc3VlLCBidXQgdGhleSBzZWVt IHRvIGJlIHN0dWNrIGluIApyZXZpZXc/Cgo+IEkgdGVzdGVkIHRoaXMgbGF0ZSBsYXN0IHdlZWsg b24gZHJtLWludGVsLW5pZ2h0bHksIGl0IHNlZW1zIGEgc2VyaWVzIG9mCj4gcmV2ZXJ0IGZpeGVk IG1vc3Qgb2YgdGhlIGlzc3Vlcy4KPgoKWW91IG1lYW4gc29tZXRoaW5nIGVsc2UgaGFzIGZpeGVk IGxlZ2FjeSBnYW1tYSB1cGRhdGVzLCBhcyBpIGNhbid0IGZpbmQgCmFib3ZlIHBhdGNoZXMgYXBw bGllZCBvbiBkcm0taW50ZWwtbmlnaHRseT8KCkFyZSB0aG9zZSBmaXhlcyBzdXBwb3NlZCB0byBi ZSBhbHJlYWR5IHBhcnQgb2YgNC43LXJjNywgdGhlIGZpbmFsIHJjIGFmYWlrPwoKdGhhbmtzLAot bWFyaW8KCgo+IENoZWVycywKPgo+IC0KPiBMaW9uZWwKPgo+IE9uIDEyLzA3LzE2IDExOjMzLCBN YXJpbyBLbGVpbmVyIHdyb3RlOgo+PiBVcGRhdGluZyBsZWdhY3kgZ2FtbWEgdGFibGVzLCBlLmcu LCB2aWEgUmFuZFIgZG9lc24ndCB3b3JrIGF0IGFsbAo+PiBhcyBvZiBMaW51eCA0LjctcmM2Lgo+ Pgo+PiBSZWFzb24gc2VlbXMgdG8gYmUgdGhhdCB0aGUgcmVxdWlyZWQgY2FsbCB0bwo+PiBkcm1f YXRvbWljX2hlbHBlcl9jb21taXRfcGxhbmVzX29uX2NydGMgaXMgc2tpcHBlZCBpbgo+PiBpbnRl bF9hdG9taWNfY29tbWl0IGFmdGVyIHVzZXJzcGFjZSBzZXQgbmV3IGdhbW1hIHRhYmxlcywKPj4g YmVjYXVzZSBuZWl0aGVyIGNydGMtPnN0YXRlLT5wbGFuZXNfY2hhbmdlZCBub3IKPj4gdXBkYXRl X3BpcGUgKD0gcGlwZV9jb25maWctPnVwZGF0ZV9waXBlKSBhcmUgdHJ1ZS4KPj4KPj4gUmVtb3Zp bmcgdGhlIGNoZWNrIGZvciBwbGFuZXNfY2hhbmdlZCB8fCB1cGRhdGVfcGlwZSBmaXhlcwo+PiBn YW1tYSB0YWJsZSB1cGRhdGVzLgo+Pgo+PiBUaGUgY29kZSBmb3IgTGludXggNC44IGRybS1uZXh0 IGhhcyBjaGFuZ2VkIGEgbG90IGluIHRoYXQgYXJlYQo+PiB3cnQuIDQuNywgYnV0IHRoZSBuZXcg Y29kZSBmb3IgNC44IGFsc28gcmVtb3ZlZCB0aG9zZSBjaGVja3MKPj4gYW5kIGNhbGxzIGRybV9h dG9taWNfaGVscGVyX2NvbW1pdF9wbGFuZXNfb25fY3J0YyB1bmNvbmRpdGlvbmFsbHksCj4+IGFu ZCBsZWdhY3kgZ2FtbWEgbHV0IHVwZGF0ZXMgd29yayBvbiBkcm0tbmV4dCwgc28gdGhpcyBzZWVt cyB0byBiZQo+PiB0aGUgcmlnaHQgc29sdXRpb24uCj4+Cj4+IFRlc3RlZCBhbHNvIHNodXRkb3du L3JlYm9vdCwgc3VzcGVuZC9yZXN1bWUsICh1bi0pcGx1Z2dpbmcgZGlzcGxheXMsCj4+IG1vZGUg c3dpdGNoZXMgZm9yIHJlc29sdXRpb24vcmVmcmVzaCByYXRlLCBkaXNwbGF5IHJvdGF0aW9uLCBh bmQKPj4gcGFnZS1mbGlwcGluZy9wYWdlZmxpcCB0aW1pbmcgb24gSW50ZWwgSEQgSXJvbmxha2Ug dG8gY29uZmlybSB0aGUKPj4gZml4IGFwcGFyZW50bHkgZG9lc24ndCBicmVhayBhbnl0aGluZyB1 bmRlciBYMTEuCj4+Cj4+IFNpZ25lZC1vZmYtYnk6IE1hcmlvIEtsZWluZXIgPG1hcmlvLmtsZWlu ZXIuZGVAZ21haWwuY29tPgo+PiBDYzogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hv cnN0QGxpbnV4LmludGVsLmNvbT4KPj4gQ2M6IExpb25lbCBMYW5kd2VybGluIDxsaW9uZWwuZy5s YW5kd2VybGluQGludGVsLmNvbT4KPj4gQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJA ZmZ3bGwuY2g+Cj4+IC0tLQo+PiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyB8IDQgKy0tLQo+PiAgIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMyBkZWxldGlv bnMoLSkKPj4KPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwo+PiBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+PiBpbmRleCAw NDQ1MmNmLi5lYjhmYjM2IDEwMDY0NAo+PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKPj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j Cj4+IEBAIC0xMzY4NSw3ICsxMzY4NSw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1p dChzdHJ1Y3QKPj4gZHJtX2RldmljZSAqZGV2LAo+PiAgICAgICAgICAgYm9vbCBtb2Rlc2V0ID0g bmVlZHNfbW9kZXNldChjcnRjLT5zdGF0ZSk7Cj4+ICAgICAgICAgICBzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqcGlwZV9jb25maWcgPQo+PiAgICAgICAgICAgICAgIHRvX2ludGVsX2NydGNfc3Rh dGUoY3J0Yy0+c3RhdGUpOwo+PiAtICAgICAgICBib29sIHVwZGF0ZV9waXBlID0gIW1vZGVzZXQg JiYgcGlwZV9jb25maWctPnVwZGF0ZV9waXBlOwo+PiAgICAgICAgICAgaWYgKG1vZGVzZXQgJiYg Y3J0Yy0+c3RhdGUtPmFjdGl2ZSkgewo+PiAgICAgICAgICAgICAgIHVwZGF0ZV9zY2FubGluZV9v ZmZzZXQodG9faW50ZWxfY3J0YyhjcnRjKSk7Cj4+IEBAIC0xMzY5OSw4ICsxMzY5OCw3IEBAIHN0 YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QKPj4gZHJtX2RldmljZSAqZGV2LAo+ PiAgICAgICAgICAgICAgIGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX3BsYW5lX3N0YXRlKHN0YXRl LCBjcnRjLT5wcmltYXJ5KSkKPj4gICAgICAgICAgICAgICBpbnRlbF9mYmNfZW5hYmxlKGludGVs X2NydGMpOwo+PiAtICAgICAgICBpZiAoY3J0Yy0+c3RhdGUtPmFjdGl2ZSAmJgo+PiAtICAgICAg ICAgICAgKGNydGMtPnN0YXRlLT5wbGFuZXNfY2hhbmdlZCB8fCB1cGRhdGVfcGlwZSkpCj4+ICsg ICAgICAgIGlmIChjcnRjLT5zdGF0ZS0+YWN0aXZlKQo+PiAgICAgICAgICAgICAgIGRybV9hdG9t aWNfaGVscGVyX2NvbW1pdF9wbGFuZXNfb25fY3J0YyhvbGRfY3J0Y19zdGF0ZSk7Cj4+ICAgICAg ICAgICBpZiAocGlwZV9jb25maWctPmJhc2UuYWN0aXZlICYmIG5lZWRzX3ZibGFua193YWl0KHBp cGVfY29uZmlnKSkKPgo+Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933170AbcGLMLq (ORCPT ); Tue, 12 Jul 2016 08:11:46 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35712 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753722AbcGLMLo (ORCPT ); Tue, 12 Jul 2016 08:11:44 -0400 Subject: Re: [PATCH] drm/i915: Fix legacy gamma lut updates in Linux 4.7-rc6 To: Lionel Landwerlin , dri-devel@lists.freedesktop.org References: <1468319586-8509-1-git-send-email-mario.kleiner.de@gmail.com> <15be51a4-74e2-2390-5a18-2172a7eae8ce@intel.com> Cc: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maarten Lankhorst , Daniel Vetter From: Mario Kleiner Message-ID: <5784DE7B.4030407@gmail.com> Date: Tue, 12 Jul 2016 14:11:39 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <15be51a4-74e2-2390-5a18-2172a7eae8ce@intel.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/12/2016 12:50 PM, Lionel Landwerlin wrote: > Hi Mario, > Hi Lionel, > There was a couple of patch to fix this issue : > > https://patchwork.freedesktop.org/series/5467/ > https://patchwork.freedesktop.org/series/5466/ > Looking at them they should fix the issue, but they seem to be stuck in review? > I tested this late last week on drm-intel-nightly, it seems a series of > revert fixed most of the issues. > You mean something else has fixed legacy gamma updates, as i can't find above patches applied on drm-intel-nightly? Are those fixes supposed to be already part of 4.7-rc7, the final rc afaik? thanks, -mario > Cheers, > > - > Lionel > > On 12/07/16 11:33, Mario Kleiner wrote: >> Updating legacy gamma tables, e.g., via RandR doesn't work at all >> as of Linux 4.7-rc6. >> >> Reason seems to be that the required call to >> drm_atomic_helper_commit_planes_on_crtc is skipped in >> intel_atomic_commit after userspace set new gamma tables, >> because neither crtc->state->planes_changed nor >> update_pipe (= pipe_config->update_pipe) are true. >> >> Removing the check for planes_changed || update_pipe fixes >> gamma table updates. >> >> The code for Linux 4.8 drm-next has changed a lot in that area >> wrt. 4.7, but the new code for 4.8 also removed those checks >> and calls drm_atomic_helper_commit_planes_on_crtc unconditionally, >> and legacy gamma lut updates work on drm-next, so this seems to be >> the right solution. >> >> Tested also shutdown/reboot, suspend/resume, (un-)plugging displays, >> mode switches for resolution/refresh rate, display rotation, and >> page-flipping/pageflip timing on Intel HD Ironlake to confirm the >> fix apparently doesn't break anything under X11. >> >> Signed-off-by: Mario Kleiner >> Cc: Maarten Lankhorst >> Cc: Lionel Landwerlin >> Cc: Daniel Vetter >> --- >> drivers/gpu/drm/i915/intel_display.c | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_display.c >> b/drivers/gpu/drm/i915/intel_display.c >> index 04452cf..eb8fb36 100644 >> --- a/drivers/gpu/drm/i915/intel_display.c >> +++ b/drivers/gpu/drm/i915/intel_display.c >> @@ -13685,7 +13685,6 @@ static int intel_atomic_commit(struct >> drm_device *dev, >> bool modeset = needs_modeset(crtc->state); >> struct intel_crtc_state *pipe_config = >> to_intel_crtc_state(crtc->state); >> - bool update_pipe = !modeset && pipe_config->update_pipe; >> if (modeset && crtc->state->active) { >> update_scanline_offset(to_intel_crtc(crtc)); >> @@ -13699,8 +13698,7 @@ static int intel_atomic_commit(struct >> drm_device *dev, >> drm_atomic_get_existing_plane_state(state, crtc->primary)) >> intel_fbc_enable(intel_crtc); >> - if (crtc->state->active && >> - (crtc->state->planes_changed || update_pipe)) >> + if (crtc->state->active) >> drm_atomic_helper_commit_planes_on_crtc(old_crtc_state); >> if (pipe_config->base.active && needs_vblank_wait(pipe_config)) > >