[Intel-xe] [PATCH 5/7] fixup! drm/xe: Cleanup page-related defines

[Rodrigo Vivi]

On Mon, May 15, 2023 at 06:15:27AM -0700, Lucas De Marchi wrote:
> On Fri, May 12, 2023 at 02:03:11PM -0400, Rodrigo Vivi wrote:
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> > ---
> > drivers/gpu/drm/i915/display/intel_fbdev.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
> > index d89edd98e5d7..6362c4ce15b6 100644
> > --- a/drivers/gpu/drm/i915/display/intel_fbdev.c
> > +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
> > @@ -179,7 +179,7 @@ static int intelfb_alloc(struct drm_fb_helper *helper,
> > 				    DIV_ROUND_UP(sizes->surface_bpp, 8), 64);
> > #else
> > 	mode_cmd.pitches[0] = ALIGN(mode_cmd.width *
> > -				    DIV_ROUND_UP(sizes->surface_bpp, 8), GEN8_PAGE_SIZE);
> > +				    DIV_ROUND_UP(sizes->surface_bpp, 8), XE_PAGE_SIZE);
> 
> Same issue as in patch 3: it fixes it now, but it will be broken on
> rebase. If display is above b3b102692dcd ("drm/xe: Cleanup page-related defines")m
> this change here should not exist...

Yeap, I wondered about that... but ideally when that happens we fix the patches
in place again, otherwise we cannot run automated git rebase -x make
while we don't move display up... :(

> 
> Lucas De Marchi
> 
> > #endif
> > 	mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
> > 							  sizes->surface_depth);
> > @@ -363,7 +363,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
> > 		else
> > 			info->fix.smem_start =
> > 				pci_resource_start(pdev, 2) +
> > -				xe_bo_addr(obj, 0, GEN8_PAGE_SIZE, &lmem);
> > +				xe_bo_addr(obj, 0, XE_PAGE_SIZE, &lmem);
> > 
> > 		info->fix.smem_len = obj->ttm.base.size;
> > 	} else {
> > -- 
> > 2.39.2
> >