* [PATCH drm-next 1/3] drm/udl: usb: Fix recursive Kconfig dependency @ 2012-08-24 22:16 Sedat Dilek 2012-08-24 22:16 ` [PATCH drm-next 2/3] drm/i915: Remove reference to drm_display_info raw_edid field Sedat Dilek 2012-08-24 22:16 ` [PATCH drm-next 3/3] drm/i915/contexts: Fixup merge with commit b6c7488df68a Sedat Dilek 0 siblings, 2 replies; 7+ messages in thread From: Sedat Dilek @ 2012-08-24 22:16 UTC (permalink / raw) To: David Airlie, dri-devel, linux-kernel; +Cc: Sedat Dilek In drivers/usb/Kconfig "config USB_ARCH_HAS_HCD" is within "if USB_SUPPORT" statement. In drivers/gpu/drm/Kconfig "config DRM_USB" depends on USB_ARCH_HAS_HCD but selects USB_SUPPORT which leads to the error for udl Kconfig: $ yes "" | make oldconfig scripts/kconfig/conf --oldconfig Kconfig drivers/gpu/drm/udl/Kconfig:1:error: recursive dependency detected! drivers/gpu/drm/udl/Kconfig:1: symbol DRM_UDL depends on USB_ARCH_HAS_HCD drivers/usb/Kconfig:76: symbol USB_ARCH_HAS_HCD depends on USB_SUPPORT drivers/usb/Kconfig:58: symbol USB_SUPPORT is selected by DRM_USB drivers/gpu/drm/Kconfig:22: symbol DRM_USB is selected by DRM_UDL Fix this by changing from select to depends on USB_SUPPORT in "config DRM_USB". This is a follow-up fix to df0b344300724e00db9fff7eb6406eb91f450b91 in Dave's drm-next GIT branch. [ v2: Restore old status, but change from select to depends on USB_SUPPORT ] [ v3: Use common prefix "drm/udl" in label ] Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> --- drivers/gpu/drm/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 3a8c683..0cbdc45 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -22,9 +22,8 @@ menuconfig DRM config DRM_USB tristate depends on DRM - depends on USB_ARCH_HAS_HCD + depends on USB_SUPPORT && USB_ARCH_HAS_HCD select USB - select USB_SUPPORT config DRM_KMS_HELPER tristate -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH drm-next 2/3] drm/i915: Remove reference to drm_display_info raw_edid field 2012-08-24 22:16 [PATCH drm-next 1/3] drm/udl: usb: Fix recursive Kconfig dependency Sedat Dilek @ 2012-08-24 22:16 ` Sedat Dilek 2012-08-26 18:39 ` Daniel Vetter 2012-08-24 22:16 ` [PATCH drm-next 3/3] drm/i915/contexts: Fixup merge with commit b6c7488df68a Sedat Dilek 1 sibling, 1 reply; 7+ messages in thread From: Sedat Dilek @ 2012-08-24 22:16 UTC (permalink / raw) To: David Airlie, dri-devel, linux-kernel; +Cc: Sedat Dilek Reported-By: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Jani Nikula <jani.nikula@intel.com> Acked-by: Dave Airlie <airlied@gmail.com> Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> --- drivers/gpu/drm/i915/intel_modes.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c index 29b7259..4bc1c0f 100644 --- a/drivers/gpu/drm/i915/intel_modes.c +++ b/drivers/gpu/drm/i915/intel_modes.c @@ -45,7 +45,6 @@ int intel_connector_update_modes(struct drm_connector *connector, drm_mode_connector_update_edid_property(connector, edid); ret = drm_add_edid_modes(connector, edid); drm_edid_to_eld(connector, edid); - connector->display_info.raw_edid = NULL; kfree(edid); return ret; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH drm-next 2/3] drm/i915: Remove reference to drm_display_info raw_edid field 2012-08-24 22:16 ` [PATCH drm-next 2/3] drm/i915: Remove reference to drm_display_info raw_edid field Sedat Dilek @ 2012-08-26 18:39 ` Daniel Vetter 2012-08-26 19:18 ` Sedat Dilek 0 siblings, 1 reply; 7+ messages in thread From: Daniel Vetter @ 2012-08-26 18:39 UTC (permalink / raw) To: Sedat Dilek; +Cc: David Airlie, dri-devel, linux-kernel On Sat, Aug 25, 2012 at 12:16:23AM +0200, Sedat Dilek wrote: > Reported-By: Stephen Rothwell <sfr@canb.auug.org.au> > Acked-by: Jani Nikula <jani.nikula@intel.com> > Acked-by: Dave Airlie <airlied@gmail.com> > Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> This doesn't apply to my drm-intel-next tree any more - we've moved around the assignement a bit. -Daniel > --- > drivers/gpu/drm/i915/intel_modes.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c > index 29b7259..4bc1c0f 100644 > --- a/drivers/gpu/drm/i915/intel_modes.c > +++ b/drivers/gpu/drm/i915/intel_modes.c > @@ -45,7 +45,6 @@ int intel_connector_update_modes(struct drm_connector *connector, > drm_mode_connector_update_edid_property(connector, edid); > ret = drm_add_edid_modes(connector, edid); > drm_edid_to_eld(connector, edid); > - connector->display_info.raw_edid = NULL; > kfree(edid); > > return ret; > -- > 1.7.9.5 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH drm-next 2/3] drm/i915: Remove reference to drm_display_info raw_edid field 2012-08-26 18:39 ` Daniel Vetter @ 2012-08-26 19:18 ` Sedat Dilek 0 siblings, 0 replies; 7+ messages in thread From: Sedat Dilek @ 2012-08-26 19:18 UTC (permalink / raw) To: Sedat Dilek, David Airlie, dri-devel, linux-kernel On Sun, Aug 26, 2012 at 8:39 PM, Daniel Vetter <daniel@ffwll.ch> wrote: > On Sat, Aug 25, 2012 at 12:16:23AM +0200, Sedat Dilek wrote: >> Reported-By: Stephen Rothwell <sfr@canb.auug.org.au> >> Acked-by: Jani Nikula <jani.nikula@intel.com> >> Acked-by: Dave Airlie <airlied@gmail.com> >> Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> > > This doesn't apply to my drm-intel-next tree any more - we've moved around > the assignement a bit. Error still exists but is in intel_ddc_get_modes() now. - Sedat - http://cgit.freedesktop.org/~danvet/drm-intel/tree/drivers/gpu/drm/i915/intel_modes.c?h=drm-intel-next#n53 > -Daniel > >> --- >> drivers/gpu/drm/i915/intel_modes.c | 1 - >> 1 file changed, 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c >> index 29b7259..4bc1c0f 100644 >> --- a/drivers/gpu/drm/i915/intel_modes.c >> +++ b/drivers/gpu/drm/i915/intel_modes.c >> @@ -45,7 +45,6 @@ int intel_connector_update_modes(struct drm_connector *connector, >> drm_mode_connector_update_edid_property(connector, edid); >> ret = drm_add_edid_modes(connector, edid); >> drm_edid_to_eld(connector, edid); >> - connector->display_info.raw_edid = NULL; >> kfree(edid); >> >> return ret; >> -- >> 1.7.9.5 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/dri-devel > > -- > Daniel Vetter > Mail: daniel@ffwll.ch > Mobile: +41 (0)79 365 57 48 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH drm-next 3/3] drm/i915/contexts: Fixup merge with commit b6c7488df68a 2012-08-24 22:16 [PATCH drm-next 1/3] drm/udl: usb: Fix recursive Kconfig dependency Sedat Dilek 2012-08-24 22:16 ` [PATCH drm-next 2/3] drm/i915: Remove reference to drm_display_info raw_edid field Sedat Dilek @ 2012-08-24 22:16 ` Sedat Dilek 2012-08-26 18:42 ` Daniel Vetter 1 sibling, 1 reply; 7+ messages in thread From: Sedat Dilek @ 2012-08-24 22:16 UTC (permalink / raw) To: David Airlie, dri-devel, linux-kernel; +Cc: Sedat Dilek This is a fixup patch for the merge of drm-next into linux-next caused by commit b6c7488df68a ("drm/i915/contexts: fix list corruption"). Reported-By: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> --- drivers/gpu/drm/i915/i915_gem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 4f6841d..e8a5cb2 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2273,11 +2273,11 @@ int i915_gpu_idle(struct drm_device *dev) /* Flush everything onto the inactive list. */ for_each_ring(ring, dev_priv, i) { - ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID); + ret = i915_ring_idle(ring); if (ret) return ret; - ret = i915_ring_idle(ring); + ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID); if (ret) return ret; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH drm-next 3/3] drm/i915/contexts: Fixup merge with commit b6c7488df68a 2012-08-24 22:16 ` [PATCH drm-next 3/3] drm/i915/contexts: Fixup merge with commit b6c7488df68a Sedat Dilek @ 2012-08-26 18:42 ` Daniel Vetter 2012-08-26 19:13 ` Sedat Dilek 0 siblings, 1 reply; 7+ messages in thread From: Daniel Vetter @ 2012-08-26 18:42 UTC (permalink / raw) To: Sedat Dilek; +Cc: David Airlie, dri-devel, linux-kernel On Sat, Aug 25, 2012 at 12:16:24AM +0200, Sedat Dilek wrote: > This is a fixup patch for the merge of drm-next into linux-next caused > by commit b6c7488df68a ("drm/i915/contexts: fix list corruption"). > > Reported-By: Stephen Rothwell <sfr@canb.auug.org.au> > Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> This is wrong, switch_context _must_ happen before ring_idle, otherwise all hell can break loose on resume. -Daniel > --- > drivers/gpu/drm/i915/i915_gem.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index 4f6841d..e8a5cb2 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -2273,11 +2273,11 @@ int i915_gpu_idle(struct drm_device *dev) > > /* Flush everything onto the inactive list. */ > for_each_ring(ring, dev_priv, i) { > - ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID); > + ret = i915_ring_idle(ring); > if (ret) > return ret; > > - ret = i915_ring_idle(ring); > + ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID); > if (ret) > return ret; > > -- > 1.7.9.5 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH drm-next 3/3] drm/i915/contexts: Fixup merge with commit b6c7488df68a 2012-08-26 18:42 ` Daniel Vetter @ 2012-08-26 19:13 ` Sedat Dilek 0 siblings, 0 replies; 7+ messages in thread From: Sedat Dilek @ 2012-08-26 19:13 UTC (permalink / raw) To: Sedat Dilek, David Airlie, dri-devel, linux-kernel On Sun, Aug 26, 2012 at 8:42 PM, Daniel Vetter <daniel@ffwll.ch> wrote: > On Sat, Aug 25, 2012 at 12:16:24AM +0200, Sedat Dilek wrote: >> This is a fixup patch for the merge of drm-next into linux-next caused >> by commit b6c7488df68a ("drm/i915/contexts: fix list corruption"). >> >> Reported-By: Stephen Rothwell <sfr@canb.auug.org.au> >> Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> > > This is wrong, switch_context _must_ happen before ring_idle, otherwise > all hell can break loose on resume. I followed what's in drm-intel-next not what was in Linus-tree. - Sedat - http://cgit.freedesktop.org/~danvet/drm-intel/tree/drivers/gpu/drm/i915/i915_gem.c?h=drm-intel-next#n2432 > -Daniel > >> --- >> drivers/gpu/drm/i915/i915_gem.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c >> index 4f6841d..e8a5cb2 100644 >> --- a/drivers/gpu/drm/i915/i915_gem.c >> +++ b/drivers/gpu/drm/i915/i915_gem.c >> @@ -2273,11 +2273,11 @@ int i915_gpu_idle(struct drm_device *dev) >> >> /* Flush everything onto the inactive list. */ >> for_each_ring(ring, dev_priv, i) { >> - ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID); >> + ret = i915_ring_idle(ring); >> if (ret) >> return ret; >> >> - ret = i915_ring_idle(ring); >> + ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID); >> if (ret) >> return ret; >> >> -- >> 1.7.9.5 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/dri-devel > > -- > Daniel Vetter > Mail: daniel@ffwll.ch > Mobile: +41 (0)79 365 57 48 ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-08-26 19:18 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-08-24 22:16 [PATCH drm-next 1/3] drm/udl: usb: Fix recursive Kconfig dependency Sedat Dilek 2012-08-24 22:16 ` [PATCH drm-next 2/3] drm/i915: Remove reference to drm_display_info raw_edid field Sedat Dilek 2012-08-26 18:39 ` Daniel Vetter 2012-08-26 19:18 ` Sedat Dilek 2012-08-24 22:16 ` [PATCH drm-next 3/3] drm/i915/contexts: Fixup merge with commit b6c7488df68a Sedat Dilek 2012-08-26 18:42 ` Daniel Vetter 2012-08-26 19:13 ` Sedat Dilek
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).