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

[Lucas De Marchi]

On Mon, May 15, 2023 at 10:43:19AM -0400, Rodrigo Vivi wrote:
>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... :(

let's move the display up then or agree upon not moving it anymore.
There are some more nasty changes need on patches on top, with more build breakages.

Lucas De Marchi