| Message ID | 20240212103833.138263-1-thomas.hellstrom@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [drm-misc-next] drm/xe: Fix a missing argument to drm_err_printer | expand |
On Mon, Feb 12, 2024 at 11:38:33AM +0100, Thomas Hellström wrote: > The indicated commit below added a device argument to the > function, but there was a call in the xe driver that was > not properly changed. > > Fixes: 5e0c04c8c40b ("drm/print: make drm_err_printer() device specific by using drm_err()") > Cc: Jani Nikula <jani.nikula@intel.com> > Cc: Luca Coelho <luciano.coelho@intel.com> > Cc: Maxime Ripard <mripard@kernel.org> > Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Acked-by: Maxime Ripard <mripard@kernel.org> Maxime
On Mon, 12 Feb 2024, Thomas Hellström <thomas.hellstrom@linux.intel.com> wrote: > The indicated commit below added a device argument to the > function, but there was a call in the xe driver that was > not properly changed. Aww, crap. Looks like my drm-misc-next configs don't have xe enabled. Reviewed-by: Jani Nikula <jani.nikula@intel.com> > Fixes: 5e0c04c8c40b ("drm/print: make drm_err_printer() device specific by using drm_err()") > Cc: Jani Nikula <jani.nikula@intel.com> > Cc: Luca Coelho <luciano.coelho@intel.com> > Cc: Maxime Ripard <mripard@kernel.org> > Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> > --- > drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c > index 7eef23a00d77..d42645fdfc02 100644 > --- a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c > +++ b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c > @@ -314,7 +314,7 @@ int xe_gt_tlb_invalidation_wait(struct xe_gt *gt, int seqno) > { > struct xe_device *xe = gt_to_xe(gt); > struct xe_guc *guc = >->uc.guc; > - struct drm_printer p = drm_err_printer(__func__); > + struct drm_printer p = drm_err_printer(&xe->drm, __func__); > int ret; > > /*
On Mon, Feb 12, 2024 at 12:53:05PM +0200, Jani Nikula wrote: > On Mon, 12 Feb 2024, Thomas Hellström <thomas.hellstrom@linux.intel.com> wrote: > > The indicated commit below added a device argument to the > > function, but there was a call in the xe driver that was > > not properly changed. > > Aww, crap. Looks like my drm-misc-next configs don't have xe enabled. FTR, there's defconfigs in the drm-rerere repo that are fairly well maintained. Maxime
On Tue, 13 Feb 2024, Maxime Ripard <mripard@kernel.org> wrote: > On Mon, Feb 12, 2024 at 12:53:05PM +0200, Jani Nikula wrote: >> On Mon, 12 Feb 2024, Thomas Hellström <thomas.hellstrom@linux.intel.com> wrote: >> > The indicated commit below added a device argument to the >> > function, but there was a call in the xe driver that was >> > not properly changed. >> >> Aww, crap. Looks like my drm-misc-next configs don't have xe enabled. > > FTR, there's defconfigs in the drm-rerere repo that are fairly well maintained. None of them have CONFIG_DRM_XE enabled. What's the procedure for updating the defconfigs? Do we have it documented somewhere? BR, Jani.
On Tue, Feb 13, 2024 at 04:40:19PM +0200, Jani Nikula wrote: > On Tue, 13 Feb 2024, Maxime Ripard <mripard@kernel.org> wrote: > > On Mon, Feb 12, 2024 at 12:53:05PM +0200, Jani Nikula wrote: > >> On Mon, 12 Feb 2024, Thomas Hellström <thomas.hellstrom@linux.intel.com> wrote: > >> > The indicated commit below added a device argument to the > >> > function, but there was a call in the xe driver that was > >> > not properly changed. > >> > >> Aww, crap. Looks like my drm-misc-next configs don't have xe enabled. > > > > FTR, there's defconfigs in the drm-rerere repo that are fairly well maintained. > > None of them have CONFIG_DRM_XE enabled. > > What's the procedure for updating the defconfigs? Do we have it > documented somewhere? I'm not sure there's a procedure, everytime I needed it I just changed the defconfig, committed and pushed. Maxime
diff --git a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c index 7eef23a00d77..d42645fdfc02 100644 --- a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c +++ b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c @@ -314,7 +314,7 @@ int xe_gt_tlb_invalidation_wait(struct xe_gt *gt, int seqno) { struct xe_device *xe = gt_to_xe(gt); struct xe_guc *guc = >->uc.guc; - struct drm_printer p = drm_err_printer(__func__); + struct drm_printer p = drm_err_printer(&xe->drm, __func__); int ret; /*
The indicated commit below added a device argument to the function, but there was a call in the xe driver that was not properly changed. Fixes: 5e0c04c8c40b ("drm/print: make drm_err_printer() device specific by using drm_err()") Cc: Jani Nikula <jani.nikula@intel.com> Cc: Luca Coelho <luciano.coelho@intel.com> Cc: Maxime Ripard <mripard@kernel.org> Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> --- drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)