RE: [PATCH v3] drm/bridge: Build the panel wrapper in drm_kms_helper

[Lofstedt, Marta]

Thanks Maarten now I can build the kernel again.

/Marta

> -Original Message-
> From: dri-devel [mailto:dri-devel-boun...@lists.freedesktop.org] On Behalf
> Of Maarten Lankhorst
> Sent: Tuesday, June 6, 2017 5:32 PM
> To: Archit Taneja ; Eric Anholt ;
> Andrzej Hajda ; Laurent Pinchart
> ; Thierry Reding
> 
> Cc: linux-ker...@vger.kernel.org; dri-devel@lists.freedesktop.org
> Subject: [PATCH v3] drm/bridge: Build the panel wrapper in drm_kms_helper
> 
> This fixes the following depmod error when building drm as a module:
> depmod: ERROR: Found 6 modules in dependency cycles!
> depmod: ERROR: Cycle detected: drm -> drm_kms_helper -> drm
> 
> Fixes: 13dfc0540a57 ("drm/bridge: Refactor out the panel wrapper from the
> lvds-encoder bridge.")
> Signed-off-by: Maarten Lankhorst 
> ---
> diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index
> dc69175255b1..3999dffcd9ef 100644
> --- a/drivers/gpu/drm/Makefile
> +++ b/drivers/gpu/drm/Makefile
> @@ -24,7 +24,6 @@ drm-$(CONFIG_COMPAT) += drm_ioc32.o
>  drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o
>  drm-$(CONFIG_PCI) += ati_pcigart.o
>  drm-$(CONFIG_DRM_PANEL) += drm_panel.o
> -drm-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o
>  drm-$(CONFIG_OF) += drm_of.o
>  drm-$(CONFIG_AGP) += drm_agpsupport.o
>  drm-$(CONFIG_DEBUG_FS) += drm_debugfs.o drm_debugfs_crc.o @@ -
> 35,6 +34,7 @@ drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o
> drm_probe_helper.o \
>   drm_simple_kms_helper.o
> drm_modeset_helper.o \
>   drm_scdc_helper.o
> 
> +drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o
>  drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) +=
> drm_edid_load.o
>  drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) +=
> drm_fb_helper.o
>  drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) +=
> drm_fb_cma_helper.o
> 
> ___
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH] drm: allow changing DPMS mode for non-CRTC displays

[Lofstedt, Marta]

> -Original Message-
> From: Chris Wilson [mailto:chris at chris-wilson.co.uk]
> Sent: Thursday, December 1, 2016 4:15 PM
> To: Lofstedt, Marta 
> Cc: dri-devel at lists.freedesktop.org
> Subject: Re: [PATCH] drm: allow changing DPMS mode for non-CRTC displays
> 
> On Thu, Dec 01, 2016 at 03:30:01PM +0200, Marta Lofstedt wrote:
> > For non-CRTC displays,
> 
> A connector not attached to a CRTC works. It is the active connectors that
> were broken.
> 
> > the drm_atomic_helper_connector_dpms
> > will always set the connector back the old DPMS state before
> > returning. This makes it impossible to change DPMS state.
> >
> > fixes: 0853695c3ba46f97dfc0b5885f7b7e640ca212dd
> >
> > Signed-off-by: Marta Lofstedt 
> > ---
> >  drivers/gpu/drm/drm_atomic_helper.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_atomic_helper.c
> > b/drivers/gpu/drm/drm_atomic_helper.c
> > index 494680c..6a5acb9 100644
> > --- a/drivers/gpu/drm/drm_atomic_helper.c
> > +++ b/drivers/gpu/drm/drm_atomic_helper.c
> > @@ -2885,8 +2885,8 @@ int drm_atomic_helper_connector_dpms(struct
> > drm_connector *connector,
> >  fail:
> > if (ret == -EDEADLK)
> > goto backoff;
> > -
> > -   connector->dpms = old_mode;
> > +   if (ret != 0)
> > +   connector->dpms = old_mode;
> 
> Patch however is correct.
> 
> Fix the subject line to reflect the impact correctly, amend the fixes tag and
> add the appropriate CCs
> 
> Fixes: 0853695c3ba4 ("drm: Add reference counting to drm_atomic_state")
> Cc: Chris Wilson 
> Cc: Daniel Vetter 
> Cc: Eric Engestrom 
> Cc: Sean Paul 
> Cc: dri-devel at lists.freedesktop.org
> Cc: 
> 
> And mention if there was a testcase exercising the failure. If not please
> suggest one.


Thanks for the comments Chris.

About tests, I can't seem to find any test that is actually checking that we 
entered DPMS mode. The suggestion is to extend the kms_properties test, or 
maybe we should have a new dpms test. I CC Petri, so he can take part in such a 
discussion. 

/Marta

> -Chris
> 
> --
> Chris Wilson, Intel Open Source Technology Centre