[PATCH] drm/xe/pf: Remove unused xe var in pf_get_threshold

[PATCH] drm/xe/pf: Remove unused xe var in pf_get_threshold

[Nirmoy Das]

Remove unused xe var which probably came for resolving a merge
conflict, commit 2817ef9704e7 ("Merge remote-tracking branch
'drm/drm-next' into drm-tip")

Cc: Neil Armstrong <neil.armstrong@linaro.org>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
---
 drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
index a5c9dfa1077c..694671497f6e 100644
--- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
+++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
@@ -1785,7 +1785,6 @@ static int pf_get_threshold(struct xe_gt *gt, unsigned int vfid,
 			    enum xe_guc_klv_threshold_index index)
 {
 	struct xe_gt_sriov_config *config = pf_pick_vf_config(gt, vfid);
-	struct xe_device *xe = gt_to_xe(gt);
 
 	return config->thresholds[index];
 }
-- 
2.42.0

Re: [PATCH] drm/xe/pf: Remove unused xe var in pf_get_threshold

[Imre Deak]

On Fri, Jun 28, 2024 at 10:54:57AM +0200, Nirmoy Das wrote:
> Remove unused xe var which probably came for resolving a merge
> conflict, commit 2817ef9704e7 ("Merge remote-tracking branch
> 'drm/drm-next' into drm-tip")
> 
> Cc: Neil Armstrong <neil.armstrong@linaro.org>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
> ---
>  drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
> index a5c9dfa1077c..694671497f6e 100644
> --- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
> @@ -1785,7 +1785,6 @@ static int pf_get_threshold(struct xe_gt *gt, unsigned int vfid,
>  			    enum xe_guc_klv_threshold_index index)
>  {
>  	struct xe_gt_sriov_config *config = pf_pick_vf_config(gt, vfid);
> -	struct xe_device *xe = gt_to_xe(gt);

I noticed the same issue after pushing a patch to drm-tip, afaiu the
correct way to apply these kinds of fixups is

$ cat patch | dim cat-to-fixup
$ dim rebuild-tip

as described in
https://drm.pages.freedesktop.org/maintainer-tools/drm-tip.html

I did this now for the above fixup.

>  
>  	return config->thresholds[index];
>  }
> -- 
> 2.42.0
> 

Re: [PATCH] drm/xe/pf: Remove unused xe var in pf_get_threshold

[Nirmoy Das]

On 6/28/2024 1:18 PM, Imre Deak wrote:
> On Fri, Jun 28, 2024 at 10:54:57AM +0200, Nirmoy Das wrote:
>> Remove unused xe var which probably came for resolving a merge
>> conflict, commit 2817ef9704e7 ("Merge remote-tracking branch
>> 'drm/drm-next' into drm-tip")
>>
>> Cc: Neil Armstrong <neil.armstrong@linaro.org>
>> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
>> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
>> ---
>>   drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 1 -
>>   1 file changed, 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
>> index a5c9dfa1077c..694671497f6e 100644
>> --- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
>> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
>> @@ -1785,7 +1785,6 @@ static int pf_get_threshold(struct xe_gt *gt, unsigned int vfid,
>>   			    enum xe_guc_klv_threshold_index index)
>>   {
>>   	struct xe_gt_sriov_config *config = pf_pick_vf_config(gt, vfid);
>> -	struct xe_device *xe = gt_to_xe(gt);
> I noticed the same issue after pushing a patch to drm-tip, afaiu the
> correct way to apply these kinds of fixups is
>
> $ cat patch | dim cat-to-fixup
> $ dim rebuild-tip
>
> as described in
> https://drm.pages.freedesktop.org/maintainer-tools/drm-tip.html
>
> I did this now for the above fixup.

Thanks Imre!


>
>>   
>>   	return config->thresholds[index];
>>   }
>> -- 
>> 2.42.0
>>

✗ CI.Patch_applied: failure for drm/xe/pf: Remove unused xe var in pf_get_threshold (rev2)

[Patchwork]

== Series Details ==

Series: drm/xe/pf: Remove unused xe var in pf_get_threshold (rev2)
URL   : https://patchwork.freedesktop.org/series/135512/
State : failure

== Summary ==

=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: 886eeb6d89b5 drm-tip: 2024y-06m-28d-10h-30m-43s UTC integration manifest
=== git am output follows ===
error: patch failed: drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c:1785
error: drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Applying: drm/xe/pf: Remove unused xe var in pf_get_threshold
Patch failed at 0001 drm/xe/pf: Remove unused xe var in pf_get_threshold
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".