From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932448AbcGLKuu (ORCPT ); Tue, 12 Jul 2016 06:50:50 -0400 Received: from mga04.intel.com ([192.55.52.120]:34730 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932213AbcGLKus (ORCPT ); Tue, 12 Jul 2016 06:50:48 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,351,1464678000"; d="scan'208";a="733015598" Subject: Re: [PATCH] drm/i915: Fix legacy gamma lut updates in Linux 4.7-rc6 To: Mario Kleiner , dri-devel@lists.freedesktop.org References: <1468319586-8509-1-git-send-email-mario.kleiner.de@gmail.com> Cc: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maarten Lankhorst , Daniel Vetter From: Lionel Landwerlin Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ Message-ID: <15be51a4-74e2-2390-5a18-2172a7eae8ce@intel.com> Date: Tue, 12 Jul 2016 11:50:40 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.2 MIME-Version: 1.0 In-Reply-To: <1468319586-8509-1-git-send-email-mario.kleiner.de@gmail.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 Hi Mario, There was a couple of patch to fix this issue : https://patchwork.freedesktop.org/series/5467/ https://patchwork.freedesktop.org/series/5466/ I tested this late last week on drm-intel-nightly, it seems a series of revert fixed most of the issues. 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))