[Intel-xe] [PATCH 2/6] fixup! drm/i915/display: Remaining changes to make xe compile

[Lucas De Marchi]

On Thu, Apr 13, 2023 at 10:19:19AM +0300, Jani Nikula wrote:
>On Thu, 13 Apr 2023, Jani Nikula <jani.nikula at linux.intel.com> wrote:
>> On Wed, 12 Apr 2023, Lucas De Marchi <lucas.demarchi at intel.com> wrote:
>>> ---
>>>  drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
>>> index ed996546edfc..46447dd58f3f 100644
>>> --- a/drivers/gpu/drm/i915/display/intel_fbdev.c
>>> +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
>>> @@ -165,7 +165,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);
>>
>> Won't that break i915 build?
>
>Won't, -ENOCOFFEE.

:)

with the additional cleanups we pile up, maybe this part will go away or
become a function call to i915/xe. This patch series concentrates mostly
on the renames.

Lucas De Marchi

>
>>
>>>  #endif
>>>  	mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
>>>  							  sizes->surface_depth);
>
>-- 
>Jani Nikula, Intel Open Source Graphics Center