| Message ID | 1401907633-1766-1-git-send-email-rodrigo.vivi@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
This is breaking -nightly build! On Wed, Jun 4, 2014 at 11:47 AM, Rodrigo Vivi <rodrigo.vivi@gmail.com> wrote: > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> > --- > drivers/gpu/drm/i915/intel_fbdev.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_fbdev.c > b/drivers/gpu/drm/i915/intel_fbdev.c > index e768207..b5448d8 100644 > --- a/drivers/gpu/drm/i915/intel_fbdev.c > +++ b/drivers/gpu/drm/i915/intel_fbdev.c > @@ -390,7 +390,7 @@ static bool intel_fb_initial_config(struct > drm_fb_helper *fb_helper, > /* No preferred mode marked by the EDID? Are there any > modes? */ > if (!modes[i] && !list_empty(&connector->modes)) { > DRM_DEBUG_KMS("using first mode listed on > connector %s\n", > - drm_get_connector_name(connector)); > + connector->name); > modes[i] = list_first_entry(&connector->modes, > struct > drm_display_mode, > head); > -- > 1.9.3 > >
2014-06-04 15:47 GMT-03:00 Rodrigo Vivi <rodrigo.vivi@gmail.com>: > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> Yeah, this seems to make -nightly compile. Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> > --- > drivers/gpu/drm/i915/intel_fbdev.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c > index e768207..b5448d8 100644 > --- a/drivers/gpu/drm/i915/intel_fbdev.c > +++ b/drivers/gpu/drm/i915/intel_fbdev.c > @@ -390,7 +390,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, > /* No preferred mode marked by the EDID? Are there any modes? */ > if (!modes[i] && !list_empty(&connector->modes)) { > DRM_DEBUG_KMS("using first mode listed on connector %s\n", > - drm_get_connector_name(connector)); > + connector->name); > modes[i] = list_first_entry(&connector->modes, > struct drm_display_mode, > head); > -- > 1.9.3 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Wed, Jun 04, 2014 at 04:55:20PM -0300, Paulo Zanoni wrote: > 2014-06-04 15:47 GMT-03:00 Rodrigo Vivi <rodrigo.vivi@gmail.com>: > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> > > Yeah, this seems to make -nightly compile. > > Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Sorry my script for fixing up the -nightly build failed. I've spotted this but then lost the manual fixup patch again :( Should work now correctly and Dave is doing a backport of drm-fixes into drm-next to resolve this. My apologies for the mess I've caused here. -Daniel > > > --- > > drivers/gpu/drm/i915/intel_fbdev.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c > > index e768207..b5448d8 100644 > > --- a/drivers/gpu/drm/i915/intel_fbdev.c > > +++ b/drivers/gpu/drm/i915/intel_fbdev.c > > @@ -390,7 +390,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, > > /* No preferred mode marked by the EDID? Are there any modes? */ > > if (!modes[i] && !list_empty(&connector->modes)) { > > DRM_DEBUG_KMS("using first mode listed on connector %s\n", > > - drm_get_connector_name(connector)); > > + connector->name); > > modes[i] = list_first_entry(&connector->modes, > > struct drm_display_mode, > > head); > > -- > > 1.9.3 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > > > -- > Paulo Zanoni > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Thu, Jun 05, 2014 at 11:13:58AM +0200, Daniel Vetter wrote: > On Wed, Jun 04, 2014 at 04:55:20PM -0300, Paulo Zanoni wrote: > > 2014-06-04 15:47 GMT-03:00 Rodrigo Vivi <rodrigo.vivi@gmail.com>: > > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> > > > > Yeah, this seems to make -nightly compile. > > > > Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> > > Sorry my script for fixing up the -nightly build failed. I've spotted this > but then lost the manual fixup patch again :( > > Should work now correctly and Dave is doing a backport of drm-fixes into > drm-next to resolve this. My apologies for the mess I've caused here. Forgotten to add Dave. -Daniel > > > > > --- > > > drivers/gpu/drm/i915/intel_fbdev.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c > > > index e768207..b5448d8 100644 > > > --- a/drivers/gpu/drm/i915/intel_fbdev.c > > > +++ b/drivers/gpu/drm/i915/intel_fbdev.c > > > @@ -390,7 +390,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, > > > /* No preferred mode marked by the EDID? Are there any modes? */ > > > if (!modes[i] && !list_empty(&connector->modes)) { > > > DRM_DEBUG_KMS("using first mode listed on connector %s\n", > > > - drm_get_connector_name(connector)); > > > + connector->name); > > > modes[i] = list_first_entry(&connector->modes, > > > struct drm_display_mode, > > > head); > > > -- > > > 1.9.3 > > > > > > _______________________________________________ > > > Intel-gfx mailing list > > > Intel-gfx@lists.freedesktop.org > > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > > > > > > > -- > > Paulo Zanoni > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Daniel Vetter > Software Engineer, Intel Corporation > +41 (0) 79 365 57 48 - http://blog.ffwll.ch
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index e768207..b5448d8 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -390,7 +390,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, /* No preferred mode marked by the EDID? Are there any modes? */ if (!modes[i] && !list_empty(&connector->modes)) { DRM_DEBUG_KMS("using first mode listed on connector %s\n", - drm_get_connector_name(connector)); + connector->name); modes[i] = list_first_entry(&connector->modes, struct drm_display_mode, head);
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> --- drivers/gpu/drm/i915/intel_fbdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)