| Message ID | 20170125101044.8956-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Chris, Thank for the patch. Acked-by: Vincent Abriou <vincent.abriou@st.com> Vincent On 01/25/2017 11:10 AM, Chris Wilson wrote: > drivers/gpu/drm/sti/sti_plane.c:76:33: error: ‘struct drm_framebuffer’ > has no member named ‘pixel_format’; did you mean ‘format’? > > I didn't look to hard at the casting to a char * and just did a > mechanical transformation of s/pixel_format/format->format/ as given in > commit 438b74a5497c ("drm: Nuke fb->pixel_format"). > > Fixes: 438b74a5497c ("drm: Nuke fb->pixel_format") > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org> > Cc: Vincent Abriou <vincent.abriou@st.com> > --- > drivers/gpu/drm/sti/sti_plane.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/sti/sti_plane.c b/drivers/gpu/drm/sti/sti_plane.c > index 699094c559b4..427d8f58c6b1 100644 > --- a/drivers/gpu/drm/sti/sti_plane.c > +++ b/drivers/gpu/drm/sti/sti_plane.c > @@ -73,7 +73,7 @@ void sti_plane_update_fps(struct sti_plane *plane, > plane->drm_plane.name, > plane->drm_plane.fb->width, > plane->drm_plane.fb->height, > - (char *)&plane->drm_plane.fb->pixel_format, > + (char *)&plane->drm_plane.fb->format->format, > fpks / 1000, fpks % 1000, > sti_plane_to_str(plane)); > } >
On Wed, Jan 25, 2017 at 10:10:44AM +0000, Chris Wilson wrote: > drivers/gpu/drm/sti/sti_plane.c:76:33: error: ‘struct drm_framebuffer’ > has no member named ‘pixel_format’; did you mean ‘format’? > > I didn't look to hard at the casting to a char * and just did a > mechanical transformation of s/pixel_format/format->format/ as given in > commit 438b74a5497c ("drm: Nuke fb->pixel_format"). lgtm Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Fixes: 438b74a5497c ("drm: Nuke fb->pixel_format") > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org> > Cc: Vincent Abriou <vincent.abriou@st.com> > --- > drivers/gpu/drm/sti/sti_plane.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/sti/sti_plane.c b/drivers/gpu/drm/sti/sti_plane.c > index 699094c559b4..427d8f58c6b1 100644 > --- a/drivers/gpu/drm/sti/sti_plane.c > +++ b/drivers/gpu/drm/sti/sti_plane.c > @@ -73,7 +73,7 @@ void sti_plane_update_fps(struct sti_plane *plane, > plane->drm_plane.name, > plane->drm_plane.fb->width, > plane->drm_plane.fb->height, > - (char *)&plane->drm_plane.fb->pixel_format, > + (char *)&plane->drm_plane.fb->format->format, > fpks / 1000, fpks % 1000, > sti_plane_to_str(plane)); > } > -- > 2.11.0
On Wed, Jan 25, 2017 at 10:10:44AM +0000, Chris Wilson wrote: > drivers/gpu/drm/sti/sti_plane.c:76:33: error: ‘struct drm_framebuffer’ > has no member named ‘pixel_format’; did you mean ‘format’? > > I didn't look to hard at the casting to a char * and just did a > mechanical transformation of s/pixel_format/format->format/ as given in > commit 438b74a5497c ("drm: Nuke fb->pixel_format"). > > Fixes: 438b74a5497c ("drm: Nuke fb->pixel_format") > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org> > Cc: Vincent Abriou <vincent.abriou@st.com> drm-misc-next builds fine, but the merge in Dave's drm-next is botched up. Dave, can you pls apply this directly? Also, another drm-misc-next pull is pending anyway ... -Daniel > --- > drivers/gpu/drm/sti/sti_plane.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/sti/sti_plane.c b/drivers/gpu/drm/sti/sti_plane.c > index 699094c559b4..427d8f58c6b1 100644 > --- a/drivers/gpu/drm/sti/sti_plane.c > +++ b/drivers/gpu/drm/sti/sti_plane.c > @@ -73,7 +73,7 @@ void sti_plane_update_fps(struct sti_plane *plane, > plane->drm_plane.name, > plane->drm_plane.fb->width, > plane->drm_plane.fb->height, > - (char *)&plane->drm_plane.fb->pixel_format, > + (char *)&plane->drm_plane.fb->format->format, > fpks / 1000, fpks % 1000, > sti_plane_to_str(plane)); > } > -- > 2.11.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/sti/sti_plane.c b/drivers/gpu/drm/sti/sti_plane.c index 699094c559b4..427d8f58c6b1 100644 --- a/drivers/gpu/drm/sti/sti_plane.c +++ b/drivers/gpu/drm/sti/sti_plane.c @@ -73,7 +73,7 @@ void sti_plane_update_fps(struct sti_plane *plane, plane->drm_plane.name, plane->drm_plane.fb->width, plane->drm_plane.fb->height, - (char *)&plane->drm_plane.fb->pixel_format, + (char *)&plane->drm_plane.fb->format->format, fpks / 1000, fpks % 1000, sti_plane_to_str(plane)); }
drivers/gpu/drm/sti/sti_plane.c:76:33: error: ‘struct drm_framebuffer’ has no member named ‘pixel_format’; did you mean ‘format’? I didn't look to hard at the casting to a char * and just did a mechanical transformation of s/pixel_format/format->format/ as given in commit 438b74a5497c ("drm: Nuke fb->pixel_format"). Fixes: 438b74a5497c ("drm: Nuke fb->pixel_format") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org> Cc: Vincent Abriou <vincent.abriou@st.com> --- drivers/gpu/drm/sti/sti_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)