diff mbox series

drm/i915: Update bug URL to point at gitlab issues

Message ID 20191125104248.1690891-1-chris@chris-wilson.co.uk (mailing list archive)
State New, archived
Headers show
Series drm/i915: Update bug URL to point at gitlab issues | expand

Commit Message

Chris Wilson Nov. 25, 2019, 10:42 a.m. UTC
We are moving our issue tracking over from bugs.fd.o to gitlab.fd.o, so
update the user instructions accordingly.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Martin Peres <martin.peres@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: stable@vger.kernel.org
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
 drivers/gpu/drm/i915/i915_utils.c     | 3 +--
 drivers/gpu/drm/i915/i915_utils.h     | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

Comments

Jani Nikula Dec. 2, 2019, 10:30 a.m. UTC | #1
On Mon, 25 Nov 2019, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> We are moving our issue tracking over from bugs.fd.o to gitlab.fd.o, so
> update the user instructions accordingly.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Martin Peres <martin.peres@linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: stable@vger.kernel.org
> ---
>  drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
>  drivers/gpu/drm/i915/i915_utils.c     | 3 +--
>  drivers/gpu/drm/i915/i915_utils.h     | 2 ++
>  3 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> index 2b30a45fa25c..1cf53fd4fe66 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -1817,7 +1817,7 @@ void i915_capture_error_state(struct drm_i915_private *i915,
>  	if (!xchg(&warned, true) &&
>  	    ktime_get_real_seconds() - DRIVER_TIMESTAMP < DAY_AS_SECONDS(180)) {
>  		pr_info("GPU hangs can indicate a bug anywhere in the entire gfx stack, including userspace.\n");
> -		pr_info("Please file a _new_ bug report on bugs.freedesktop.org against DRI -> DRM/Intel\n");
> +		pr_info("Please file a _new_ bug report on " FDO_BUG_URL "\n");
>  		pr_info("drm/i915 developers can then reassign to the right component if it's not a kernel issue.\n");
>  		pr_info("The GPU crash dump is required to analyze GPU hangs, so please always attach it.\n");
>  		pr_info("GPU crash dump saved to /sys/class/drm/card%d/error\n",
> diff --git a/drivers/gpu/drm/i915/i915_utils.c b/drivers/gpu/drm/i915/i915_utils.c
> index c47261ae86ea..9b68b21becf1 100644
> --- a/drivers/gpu/drm/i915/i915_utils.c
> +++ b/drivers/gpu/drm/i915/i915_utils.c
> @@ -8,8 +8,7 @@
>  #include "i915_drv.h"
>  #include "i915_utils.h"
>  
> -#define FDO_BUG_URL "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI"
> -#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL " against DRM/Intel " \
> +#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL \
>  		    "providing the dmesg log by booting with drm.debug=0xf"

Space between URL and "providing"?

>  
>  void
> diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h
> index 04139ba1191e..13674b016092 100644
> --- a/drivers/gpu/drm/i915/i915_utils.h
> +++ b/drivers/gpu/drm/i915/i915_utils.h
> @@ -34,6 +34,8 @@
>  struct drm_i915_private;
>  struct timer_list;
>  
> +#define FDO_BUG_URL "https://gitlab.freedesktop.org/drm/intel/issues/new?"

Do we really need the question mark?

BR,
Jani.

> +
>  #undef WARN_ON
>  /* Many gcc seem to no see through this and fall over :( */
>  #if 0
Peres, Martin Dec. 2, 2019, 11:26 a.m. UTC | #2
On 02/12/2019 12:30, Jani Nikula wrote:
> On Mon, 25 Nov 2019, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>> We are moving our issue tracking over from bugs.fd.o to gitlab.fd.o, so
>> update the user instructions accordingly.
>>
>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: Martin Peres <martin.peres@linux.intel.com>
>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Cc: Jani Nikula <jani.nikula@intel.com>
>> Cc: stable@vger.kernel.org
>> ---
>>  drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
>>  drivers/gpu/drm/i915/i915_utils.c     | 3 +--
>>  drivers/gpu/drm/i915/i915_utils.h     | 2 ++
>>  3 files changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
>> index 2b30a45fa25c..1cf53fd4fe66 100644
>> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
>> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
>> @@ -1817,7 +1817,7 @@ void i915_capture_error_state(struct drm_i915_private *i915,
>>  	if (!xchg(&warned, true) &&
>>  	    ktime_get_real_seconds() - DRIVER_TIMESTAMP < DAY_AS_SECONDS(180)) {
>>  		pr_info("GPU hangs can indicate a bug anywhere in the entire gfx stack, including userspace.\n");
>> -		pr_info("Please file a _new_ bug report on bugs.freedesktop.org against DRI -> DRM/Intel\n");
>> +		pr_info("Please file a _new_ bug report on " FDO_BUG_URL "\n");
>>  		pr_info("drm/i915 developers can then reassign to the right component if it's not a kernel issue.\n");
>>  		pr_info("The GPU crash dump is required to analyze GPU hangs, so please always attach it.\n");
>>  		pr_info("GPU crash dump saved to /sys/class/drm/card%d/error\n",
>> diff --git a/drivers/gpu/drm/i915/i915_utils.c b/drivers/gpu/drm/i915/i915_utils.c
>> index c47261ae86ea..9b68b21becf1 100644
>> --- a/drivers/gpu/drm/i915/i915_utils.c
>> +++ b/drivers/gpu/drm/i915/i915_utils.c
>> @@ -8,8 +8,7 @@
>>  #include "i915_drv.h"
>>  #include "i915_utils.h"
>>  
>> -#define FDO_BUG_URL "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI"
>> -#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL " against DRM/Intel " \
>> +#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL \
>>  		    "providing the dmesg log by booting with drm.debug=0xf"
> 
> Space between URL and "providing"?

If the following comment is accepted, then we need to change this
sentence to:

Please file bugs according to the instruction found at FDO_BUG_URL.

> 
>>  
>>  void
>> diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h
>> index 04139ba1191e..13674b016092 100644
>> --- a/drivers/gpu/drm/i915/i915_utils.h
>> +++ b/drivers/gpu/drm/i915/i915_utils.h
>> @@ -34,6 +34,8 @@
>>  struct drm_i915_private;
>>  struct timer_list;
>>  
>> +#define FDO_BUG_URL "https://gitlab.freedesktop.org/drm/intel/issues/new?"
> 
> Do we really need the question mark?

We may want to point to
https://gitlab.freedesktop.org/drm/intel/wikis/How-to-file-file-i915-bugs,
don't you think?

Martin

> 
> BR,
> Jani.
> 
>> +
>>  #undef WARN_ON
>>  /* Many gcc seem to no see through this and fall over :( */
>>  #if 0
>
Jani Nikula Dec. 2, 2019, 11:36 a.m. UTC | #3
On Mon, 02 Dec 2019, "Peres, Martin" <martin.peres@intel.com> wrote:
> On 02/12/2019 12:30, Jani Nikula wrote:
>> On Mon, 25 Nov 2019, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>>> We are moving our issue tracking over from bugs.fd.o to gitlab.fd.o, so
>>> update the user instructions accordingly.
>>>
>>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>>> Cc: Martin Peres <martin.peres@linux.intel.com>
>>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>> Cc: Jani Nikula <jani.nikula@intel.com>
>>> Cc: stable@vger.kernel.org
>>> ---
>>>  drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
>>>  drivers/gpu/drm/i915/i915_utils.c     | 3 +--
>>>  drivers/gpu/drm/i915/i915_utils.h     | 2 ++
>>>  3 files changed, 4 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
>>> index 2b30a45fa25c..1cf53fd4fe66 100644
>>> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
>>> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
>>> @@ -1817,7 +1817,7 @@ void i915_capture_error_state(struct drm_i915_private *i915,
>>>  	if (!xchg(&warned, true) &&
>>>  	    ktime_get_real_seconds() - DRIVER_TIMESTAMP < DAY_AS_SECONDS(180)) {
>>>  		pr_info("GPU hangs can indicate a bug anywhere in the entire gfx stack, including userspace.\n");
>>> -		pr_info("Please file a _new_ bug report on bugs.freedesktop.org against DRI -> DRM/Intel\n");
>>> +		pr_info("Please file a _new_ bug report on " FDO_BUG_URL "\n");
>>>  		pr_info("drm/i915 developers can then reassign to the right component if it's not a kernel issue.\n");
>>>  		pr_info("The GPU crash dump is required to analyze GPU hangs, so please always attach it.\n");
>>>  		pr_info("GPU crash dump saved to /sys/class/drm/card%d/error\n",
>>> diff --git a/drivers/gpu/drm/i915/i915_utils.c b/drivers/gpu/drm/i915/i915_utils.c
>>> index c47261ae86ea..9b68b21becf1 100644
>>> --- a/drivers/gpu/drm/i915/i915_utils.c
>>> +++ b/drivers/gpu/drm/i915/i915_utils.c
>>> @@ -8,8 +8,7 @@
>>>  #include "i915_drv.h"
>>>  #include "i915_utils.h"
>>>  
>>> -#define FDO_BUG_URL "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI"
>>> -#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL " against DRM/Intel " \
>>> +#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL \
>>>  		    "providing the dmesg log by booting with drm.debug=0xf"
>> 
>> Space between URL and "providing"?
>
> If the following comment is accepted, then we need to change this
> sentence to:
>
> Please file bugs according to the instruction found at FDO_BUG_URL.
>
>> 
>>>  
>>>  void
>>> diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h
>>> index 04139ba1191e..13674b016092 100644
>>> --- a/drivers/gpu/drm/i915/i915_utils.h
>>> +++ b/drivers/gpu/drm/i915/i915_utils.h
>>> @@ -34,6 +34,8 @@
>>>  struct drm_i915_private;
>>>  struct timer_list;
>>>  
>>> +#define FDO_BUG_URL "https://gitlab.freedesktop.org/drm/intel/issues/new?"
>> 
>> Do we really need the question mark?
>
> We may want to point to
> https://gitlab.freedesktop.org/drm/intel/wikis/How-to-file-file-i915-bugs,
> don't you think?

Does gitlab let you set the URL, or is it always autogenerated from the
title? Need to at least fix the "file file" there. ;)

BR,
Jani.
Chris Wilson Dec. 2, 2019, 2:25 p.m. UTC | #4
Quoting Jani Nikula (2019-12-02 11:36:01)
> On Mon, 02 Dec 2019, "Peres, Martin" <martin.peres@intel.com> wrote:
> > On 02/12/2019 12:30, Jani Nikula wrote:
> >> On Mon, 25 Nov 2019, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> >>> We are moving our issue tracking over from bugs.fd.o to gitlab.fd.o, so
> >>> update the user instructions accordingly.
> >>>
> >>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> >>> Cc: Martin Peres <martin.peres@linux.intel.com>
> >>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> >>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> >>> Cc: Jani Nikula <jani.nikula@intel.com>
> >>> Cc: stable@vger.kernel.org
> >>> ---
> >>>  drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
> >>>  drivers/gpu/drm/i915/i915_utils.c     | 3 +--
> >>>  drivers/gpu/drm/i915/i915_utils.h     | 2 ++
> >>>  3 files changed, 4 insertions(+), 3 deletions(-)
> >>>
> >>> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> >>> index 2b30a45fa25c..1cf53fd4fe66 100644
> >>> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> >>> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> >>> @@ -1817,7 +1817,7 @@ void i915_capture_error_state(struct drm_i915_private *i915,
> >>>     if (!xchg(&warned, true) &&
> >>>         ktime_get_real_seconds() - DRIVER_TIMESTAMP < DAY_AS_SECONDS(180)) {
> >>>             pr_info("GPU hangs can indicate a bug anywhere in the entire gfx stack, including userspace.\n");
> >>> -           pr_info("Please file a _new_ bug report on bugs.freedesktop.org against DRI -> DRM/Intel\n");
> >>> +           pr_info("Please file a _new_ bug report on " FDO_BUG_URL "\n");
> >>>             pr_info("drm/i915 developers can then reassign to the right component if it's not a kernel issue.\n");
> >>>             pr_info("The GPU crash dump is required to analyze GPU hangs, so please always attach it.\n");
> >>>             pr_info("GPU crash dump saved to /sys/class/drm/card%d/error\n",
> >>> diff --git a/drivers/gpu/drm/i915/i915_utils.c b/drivers/gpu/drm/i915/i915_utils.c
> >>> index c47261ae86ea..9b68b21becf1 100644
> >>> --- a/drivers/gpu/drm/i915/i915_utils.c
> >>> +++ b/drivers/gpu/drm/i915/i915_utils.c
> >>> @@ -8,8 +8,7 @@
> >>>  #include "i915_drv.h"
> >>>  #include "i915_utils.h"
> >>>  
> >>> -#define FDO_BUG_URL "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI"
> >>> -#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL " against DRM/Intel " \
> >>> +#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL \
> >>>                 "providing the dmesg log by booting with drm.debug=0xf"
> >> 
> >> Space between URL and "providing"?
> >
> > If the following comment is accepted, then we need to change this
> > sentence to:
> >
> > Please file bugs according to the instruction found at FDO_BUG_URL.
> >
> >> 
> >>>  
> >>>  void
> >>> diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h
> >>> index 04139ba1191e..13674b016092 100644
> >>> --- a/drivers/gpu/drm/i915/i915_utils.h
> >>> +++ b/drivers/gpu/drm/i915/i915_utils.h
> >>> @@ -34,6 +34,8 @@
> >>>  struct drm_i915_private;
> >>>  struct timer_list;
> >>>  
> >>> +#define FDO_BUG_URL "https://gitlab.freedesktop.org/drm/intel/issues/new?"
> >> 
> >> Do we really need the question mark?
> >
> > We may want to point to
> > https://gitlab.freedesktop.org/drm/intel/wikis/How-to-file-file-i915-bugs,
> > don't you think?
> 
> Does gitlab let you set the URL, or is it always autogenerated from the
> title? Need to at least fix the "file file" there. ;)

Martin feel free to update the patch with the final wording and links :)
-Chris
Peres, Martin Dec. 2, 2019, 4:45 p.m. UTC | #5
On 02/12/2019 16:25, Chris Wilson wrote:
> Quoting Jani Nikula (2019-12-02 11:36:01)
>> On Mon, 02 Dec 2019, "Peres, Martin" <martin.peres@intel.com> wrote:
>>> On 02/12/2019 12:30, Jani Nikula wrote:
>>>> On Mon, 25 Nov 2019, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>>>>> We are moving our issue tracking over from bugs.fd.o to gitlab.fd.o, so
>>>>> update the user instructions accordingly.
>>>>>
>>>>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>>>>> Cc: Martin Peres <martin.peres@linux.intel.com>
>>>>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>>>>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>>>> Cc: Jani Nikula <jani.nikula@intel.com>
>>>>> Cc: stable@vger.kernel.org
>>>>> ---
>>>>>  drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
>>>>>  drivers/gpu/drm/i915/i915_utils.c     | 3 +--
>>>>>  drivers/gpu/drm/i915/i915_utils.h     | 2 ++
>>>>>  3 files changed, 4 insertions(+), 3 deletions(-)
>>>>>
>>>>> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
>>>>> index 2b30a45fa25c..1cf53fd4fe66 100644
>>>>> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
>>>>> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
>>>>> @@ -1817,7 +1817,7 @@ void i915_capture_error_state(struct drm_i915_private *i915,
>>>>>     if (!xchg(&warned, true) &&
>>>>>         ktime_get_real_seconds() - DRIVER_TIMESTAMP < DAY_AS_SECONDS(180)) {
>>>>>             pr_info("GPU hangs can indicate a bug anywhere in the entire gfx stack, including userspace.\n");
>>>>> -           pr_info("Please file a _new_ bug report on bugs.freedesktop.org against DRI -> DRM/Intel\n");
>>>>> +           pr_info("Please file a _new_ bug report on " FDO_BUG_URL "\n");
>>>>>             pr_info("drm/i915 developers can then reassign to the right component if it's not a kernel issue.\n");
>>>>>             pr_info("The GPU crash dump is required to analyze GPU hangs, so please always attach it.\n");
>>>>>             pr_info("GPU crash dump saved to /sys/class/drm/card%d/error\n",
>>>>> diff --git a/drivers/gpu/drm/i915/i915_utils.c b/drivers/gpu/drm/i915/i915_utils.c
>>>>> index c47261ae86ea..9b68b21becf1 100644
>>>>> --- a/drivers/gpu/drm/i915/i915_utils.c
>>>>> +++ b/drivers/gpu/drm/i915/i915_utils.c
>>>>> @@ -8,8 +8,7 @@
>>>>>  #include "i915_drv.h"
>>>>>  #include "i915_utils.h"
>>>>>  
>>>>> -#define FDO_BUG_URL "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI"
>>>>> -#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL " against DRM/Intel " \
>>>>> +#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL \
>>>>>                 "providing the dmesg log by booting with drm.debug=0xf"
>>>>
>>>> Space between URL and "providing"?
>>>
>>> If the following comment is accepted, then we need to change this
>>> sentence to:
>>>
>>> Please file bugs according to the instruction found at FDO_BUG_URL.
>>>
>>>>
>>>>>  
>>>>>  void
>>>>> diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h
>>>>> index 04139ba1191e..13674b016092 100644
>>>>> --- a/drivers/gpu/drm/i915/i915_utils.h
>>>>> +++ b/drivers/gpu/drm/i915/i915_utils.h
>>>>> @@ -34,6 +34,8 @@
>>>>>  struct drm_i915_private;
>>>>>  struct timer_list;
>>>>>  
>>>>> +#define FDO_BUG_URL "https://gitlab.freedesktop.org/drm/intel/issues/new?"
>>>>
>>>> Do we really need the question mark?
>>>
>>> We may want to point to
>>> https://gitlab.freedesktop.org/drm/intel/wikis/How-to-file-file-i915-bugs,
>>> don't you think?
>>
>> Does gitlab let you set the URL, or is it always autogenerated from the
>> title? Need to at least fix the "file file" there. ;)
> 
> Martin feel free to update the patch with the final wording and links :)
> -Chris
> 

Darn it, do I need to break my almost 5 year streak of not having a
single i915 patch :o?

Well, I guess now is a good time for this, I had a patch series I wanted
to contribute anyway.

Martin
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 2b30a45fa25c..1cf53fd4fe66 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1817,7 +1817,7 @@  void i915_capture_error_state(struct drm_i915_private *i915,
 	if (!xchg(&warned, true) &&
 	    ktime_get_real_seconds() - DRIVER_TIMESTAMP < DAY_AS_SECONDS(180)) {
 		pr_info("GPU hangs can indicate a bug anywhere in the entire gfx stack, including userspace.\n");
-		pr_info("Please file a _new_ bug report on bugs.freedesktop.org against DRI -> DRM/Intel\n");
+		pr_info("Please file a _new_ bug report on " FDO_BUG_URL "\n");
 		pr_info("drm/i915 developers can then reassign to the right component if it's not a kernel issue.\n");
 		pr_info("The GPU crash dump is required to analyze GPU hangs, so please always attach it.\n");
 		pr_info("GPU crash dump saved to /sys/class/drm/card%d/error\n",
diff --git a/drivers/gpu/drm/i915/i915_utils.c b/drivers/gpu/drm/i915/i915_utils.c
index c47261ae86ea..9b68b21becf1 100644
--- a/drivers/gpu/drm/i915/i915_utils.c
+++ b/drivers/gpu/drm/i915/i915_utils.c
@@ -8,8 +8,7 @@ 
 #include "i915_drv.h"
 #include "i915_utils.h"
 
-#define FDO_BUG_URL "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI"
-#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL " against DRM/Intel " \
+#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL \
 		    "providing the dmesg log by booting with drm.debug=0xf"
 
 void
diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h
index 04139ba1191e..13674b016092 100644
--- a/drivers/gpu/drm/i915/i915_utils.h
+++ b/drivers/gpu/drm/i915/i915_utils.h
@@ -34,6 +34,8 @@ 
 struct drm_i915_private;
 struct timer_list;
 
+#define FDO_BUG_URL "https://gitlab.freedesktop.org/drm/intel/issues/new?"
+
 #undef WARN_ON
 /* Many gcc seem to no see through this and fall over :( */
 #if 0