diff mbox

drm/i915: make unsupported fb modifier message DRM_DEBUG

Message ID 1427139830-18720-1-git-send-email-jbarnes@virtuousgeek.org (mailing list archive)
State New, archived
Headers show

Commit Message

Jesse Barnes March 23, 2015, 7:43 p.m. UTC
Or users can just spam the log all they want.

References: https://bugs.freedesktop.org/show_bug.cgi?id=89628
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
 drivers/gpu/drm/i915/intel_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jani Nikula March 24, 2015, 8:19 a.m. UTC | #1
On Mon, 23 Mar 2015, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> Or users can just spam the log all they want.
>
> References: https://bugs.freedesktop.org/show_bug.cgi?id=89628
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>


> ---
>  drivers/gpu/drm/i915/intel_display.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 589addf..c48e2d7 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -12831,8 +12831,8 @@ static int intel_framebuffer_init(struct drm_device *dev,
>  	case I915_FORMAT_MOD_X_TILED:
>  		break;
>  	default:
> -		DRM_ERROR("Unsupported fb modifier 0x%llx!\n",
> -				mode_cmd->modifier[0]);
> +		DRM_DEBUG("Unsupported fb modifier 0x%llx!\n",
> +			  mode_cmd->modifier[0]);
>  		return -EINVAL;
>  	}
>  
> -- 
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin March 24, 2015, 11:23 a.m. UTC | #2
On 03/23/2015 07:43 PM, Jesse Barnes wrote:
> Or users can just spam the log all they want.
>
> References: https://bugs.freedesktop.org/show_bug.cgi?id=89628
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> ---
>   drivers/gpu/drm/i915/intel_display.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 589addf..c48e2d7 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -12831,8 +12831,8 @@ static int intel_framebuffer_init(struct drm_device *dev,
>   	case I915_FORMAT_MOD_X_TILED:
>   		break;
>   	default:
> -		DRM_ERROR("Unsupported fb modifier 0x%llx!\n",
> -				mode_cmd->modifier[0]);
> +		DRM_DEBUG("Unsupported fb modifier 0x%llx!\n",
> +			  mode_cmd->modifier[0]);
>   		return -EINVAL;
>   	}

Ooops! The one that got away.. I always think about this very issue as 
you can see from three DRM_DEBUGs just above this offender. No idea how 
this one sneaked in but thanks for fixing it!

Regards,

Tvrtko
Jesse Barnes March 24, 2015, 2:33 p.m. UTC | #3
On 03/24/2015 04:23 AM, Tvrtko Ursulin wrote:
> 
> On 03/23/2015 07:43 PM, Jesse Barnes wrote:
>> Or users can just spam the log all they want.
>>
>> References: https://bugs.freedesktop.org/show_bug.cgi?id=89628
>> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
>> ---
>>   drivers/gpu/drm/i915/intel_display.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_display.c
>> b/drivers/gpu/drm/i915/intel_display.c
>> index 589addf..c48e2d7 100644
>> --- a/drivers/gpu/drm/i915/intel_display.c
>> +++ b/drivers/gpu/drm/i915/intel_display.c
>> @@ -12831,8 +12831,8 @@ static int intel_framebuffer_init(struct
>> drm_device *dev,
>>       case I915_FORMAT_MOD_X_TILED:
>>           break;
>>       default:
>> -        DRM_ERROR("Unsupported fb modifier 0x%llx!\n",
>> -                mode_cmd->modifier[0]);
>> +        DRM_DEBUG("Unsupported fb modifier 0x%llx!\n",
>> +              mode_cmd->modifier[0]);
>>           return -EINVAL;
>>       }
> 
> Ooops! The one that got away.. I always think about this very issue as
> you can see from three DRM_DEBUGs just above this offender. No idea how
> this one sneaked in but thanks for fixing it!

Yeah no problem, we used to have a lot more but I think we're getting
better.  One sneaks in every now and then though!

Jesse
Shuang He March 25, 2015, 3:44 a.m. UTC | #4
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 6033
-------------------------------------Summary-------------------------------------
Platform          Delta          drm-intel-nightly          Series Applied
PNV                                  275/275              275/275
ILK                                  303/303              303/303
SNB                                  304/304              304/304
IVB                                  339/339              339/339
BYT                                  287/287              287/287
HSW                                  361/361              361/361
BDW                                  310/310              310/310
-------------------------------------Detailed-------------------------------------
Platform  Test                                drm-intel-nightly          Series Applied
Note: You need to pay more attention to line start with '*'
Daniel Vetter March 25, 2015, 1:28 p.m. UTC | #5
On Tue, Mar 24, 2015 at 10:19:59AM +0200, Jani Nikula wrote:
> On Mon, 23 Mar 2015, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> > Or users can just spam the log all they want.
> >
> > References: https://bugs.freedesktop.org/show_bug.cgi?id=89628
> > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> 
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>

Queued for -next, thanks for the patch. And please reference the commit
that introduce some broken code and cc author/reviewer of said commit.
We're just going through some fun because a cherry-pick broke -rc and it's
hard to find all the fixups in -next because they're not properly
referenced.
-Daniel

> 
> 
> > ---
> >  drivers/gpu/drm/i915/intel_display.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 589addf..c48e2d7 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -12831,8 +12831,8 @@ static int intel_framebuffer_init(struct drm_device *dev,
> >  	case I915_FORMAT_MOD_X_TILED:
> >  		break;
> >  	default:
> > -		DRM_ERROR("Unsupported fb modifier 0x%llx!\n",
> > -				mode_cmd->modifier[0]);
> > +		DRM_DEBUG("Unsupported fb modifier 0x%llx!\n",
> > +			  mode_cmd->modifier[0]);
> >  		return -EINVAL;
> >  	}
> >  
> > -- 
> > 1.9.1
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Jani Nikula, Intel Open Source Technology Center
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jesse Barnes March 25, 2015, 3:47 p.m. UTC | #6
On 03/25/2015 06:28 AM, Daniel Vetter wrote:
> On Tue, Mar 24, 2015 at 10:19:59AM +0200, Jani Nikula wrote:
>> On Mon, 23 Mar 2015, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>>> Or users can just spam the log all they want.
>>>
>>> References: https://bugs.freedesktop.org/show_bug.cgi?id=89628
>>> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
>>
>> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> 
> Queued for -next, thanks for the patch. And please reference the commit
> that introduce some broken code and cc author/reviewer of said commit.
> We're just going through some fun because a cherry-pick broke -rc and it's
> hard to find all the fixups in -next because they're not properly
> referenced.

In case you still want to update the log:

commit 9a8f0a1290993c86c4e35756a2624bfe461f9036
Author: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Date:   Fri Feb 27 11:15:24 2015 +0000

    drm/i915/skl: Allow Y (and Yf) frame buffer creation

Tvrtko already saw it though, this one just happened to slip through
when he converted the errors to debug once he was done debugging.

Jesse
Daniel Vetter March 25, 2015, 5:24 p.m. UTC | #7
On Wed, Mar 25, 2015 at 08:47:59AM -0700, Jesse Barnes wrote:
> On 03/25/2015 06:28 AM, Daniel Vetter wrote:
> > On Tue, Mar 24, 2015 at 10:19:59AM +0200, Jani Nikula wrote:
> >> On Mon, 23 Mar 2015, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> >>> Or users can just spam the log all they want.
> >>>
> >>> References: https://bugs.freedesktop.org/show_bug.cgi?id=89628
> >>> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> >>
> >> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> > 
> > Queued for -next, thanks for the patch. And please reference the commit
> > that introduce some broken code and cc author/reviewer of said commit.
> > We're just going through some fun because a cherry-pick broke -rc and it's
> > hard to find all the fixups in -next because they're not properly
> > referenced.
> 
> In case you still want to update the log:
> 
> commit 9a8f0a1290993c86c4e35756a2624bfe461f9036
> Author: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Date:   Fri Feb 27 11:15:24 2015 +0000
> 
>     drm/i915/skl: Allow Y (and Yf) frame buffer creation

Commit message updated, thanks.
-Daniel
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 589addf..c48e2d7 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12831,8 +12831,8 @@  static int intel_framebuffer_init(struct drm_device *dev,
 	case I915_FORMAT_MOD_X_TILED:
 		break;
 	default:
-		DRM_ERROR("Unsupported fb modifier 0x%llx!\n",
-				mode_cmd->modifier[0]);
+		DRM_DEBUG("Unsupported fb modifier 0x%llx!\n",
+			  mode_cmd->modifier[0]);
 		return -EINVAL;
 	}