| Message ID | 20231115090719.3210079-3-jouni.hogander@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Prepare intel_fbdev for Xe | expand |
On Wed, 2023-11-15 at 11:07 +0200, Jouni Högander wrote: > We are preparing for Xe driver. I915 and Xe object implementation are > differing. Do not use i915_gem_object->base directly. Instead use > intel_bo_to_drm_bo. > > Signed-off-by: Jouni Högander <jouni.hogander@intel.com> > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_fbdev.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Vinod Govindapillai <vinod.govindapillai@intel.com> > > diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c > b/drivers/gpu/drm/i915/display/intel_fbdev.c > index b7e4b7830e45..99894a855ef0 100644 > --- a/drivers/gpu/drm/i915/display/intel_fbdev.c > +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c > @@ -332,12 +332,12 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, > continue; > } > > - if (obj->base.size > max_size) { > + if (intel_bo_to_drm_bo(obj)->size > max_size) { > drm_dbg_kms(&i915->drm, > "found possible fb from [PLANE:%d:%s]\n", > plane->base.base.id, plane->base.name); > fb = to_intel_framebuffer(plane_state->uapi.fb); > - max_size = obj->base.size; > + max_size = intel_bo_to_drm_bo(obj)->size; > } > } >
On Fri, 2023-12-01 at 13:55 +0000, Govindapillai, Vinod wrote: > On Wed, 2023-11-15 at 11:07 +0200, Jouni Högander wrote: > > We are preparing for Xe driver. I915 and Xe object implementation > > are > > differing. Do not use i915_gem_object->base directly. Instead use > > intel_bo_to_drm_bo. > > > > Signed-off-by: Jouni Högander <jouni.hogander@intel.com> > > Signed-off-by: Maarten Lankhorst > > <maarten.lankhorst@linux.intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_fbdev.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > Reviewed-by: Vinod Govindapillai <vinod.govindapillai@intel.com> Thank you Vinod for your review. These are now pushed to drm-intel- next. BR, Jouni Högander > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c > > b/drivers/gpu/drm/i915/display/intel_fbdev.c > > index b7e4b7830e45..99894a855ef0 100644 > > --- a/drivers/gpu/drm/i915/display/intel_fbdev.c > > +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c > > @@ -332,12 +332,12 @@ static bool intel_fbdev_init_bios(struct > > drm_device *dev, > > continue; > > } > > > > - if (obj->base.size > max_size) { > > + if (intel_bo_to_drm_bo(obj)->size > max_size) { > > drm_dbg_kms(&i915->drm, > > "found possible fb from > > [PLANE:%d:%s]\n", > > plane->base.base.id, plane- > > >base.name); > > fb = to_intel_framebuffer(plane_state- > > >uapi.fb); > > - max_size = obj->base.size; > > + max_size = intel_bo_to_drm_bo(obj)->size; > > } > > } > > >
diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c index b7e4b7830e45..99894a855ef0 100644 --- a/drivers/gpu/drm/i915/display/intel_fbdev.c +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c @@ -332,12 +332,12 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, continue; } - if (obj->base.size > max_size) { + if (intel_bo_to_drm_bo(obj)->size > max_size) { drm_dbg_kms(&i915->drm, "found possible fb from [PLANE:%d:%s]\n", plane->base.base.id, plane->base.name); fb = to_intel_framebuffer(plane_state->uapi.fb); - max_size = obj->base.size; + max_size = intel_bo_to_drm_bo(obj)->size; } }