Re: [PATCH v2 10/10] drm/i915/fbdev: drop dependency on display in i915 specific code

[Jani Nikula <jani.nikula@intel.com>]

On Thu, 18 Sep 2025, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Thu, Sep 18, 2025 at 11:41:00AM +0300, Jani Nikula wrote:
>> This code is in fact i915 driver core rather than display specific. Stop
>> using struct intel_display, and drop the dependency on display headers.
>> 
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>>  drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 5 +----
>>  1 file changed, 1 insertion(+), 4 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev_fb.c b/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
>> index 8af409bff0f0..56b145841473 100644
>> --- a/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
>> +++ b/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
>> @@ -8,13 +8,10 @@
>>  #include "gem/i915_gem_lmem.h"
>>  
>>  #include "i915_drv.h"
>> -#include "intel_display_core.h"
>> -#include "intel_display_types.h"
>>  #include "intel_fbdev_fb.h"
>>  
>>  struct drm_gem_object *intel_fbdev_fb_bo_create(struct drm_device *drm, int size)
>>  {
>> -	struct intel_display *display = to_intel_display(drm);
>>  	struct drm_i915_private *dev_priv = to_i915(drm);
>>  	struct drm_i915_gem_object *obj;
>>  
>> @@ -31,7 +28,7 @@ struct drm_gem_object *intel_fbdev_fb_bo_create(struct drm_device *drm, int size
>>  		 *
>>  		 * Also skip stolen on MTL as Wa_22018444074 mitigation.
>>  		 */
>> -		if (!display->platform.meteorlake && size * 2 < dev_priv->dsm.usable_size)
>> +		if (!IS_METEORLAKE(dev_priv) && size * 2 < dev_priv->dsm.usable_size)
>
> I have some old stuff [1] to rework the logic around stolen vs. not
> usage here. But I suppose I'll need to rethink some of it if/when I
> find the time to revisit that stuff...
>
> In the meantine
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Thanks a bunch for the reviews, pushed the lot to din.

BR,
Jani.

>
> [1] https://patchwork.freedesktop.org/series/135800/
>
>>  			obj = i915_gem_object_create_stolen(dev_priv, size);
>>  		if (IS_ERR(obj))
>>  			obj = i915_gem_object_create_shmem(dev_priv, size);
>> -- 
>> 2.47.3

-- 
Jani Nikula, Intel