FBC bikesheds
Subsystems (2)
cover FBC bikesheds
From: Paulo Zanoni <[email protected]>
Before I continue sending fixes, let's just do some small adjustments to the codebase. I really think these changes make the code better to work with, but maybe not everybody agrees. Let's find out :)
Paulo Zanoni (6):
drm/i915: move FBC vfuncs to struct i915_fbc
drm/i915: use dev_priv for the FBC functions
drm/i915: use intel_crtc for the FBC functions
drm/i915: add FBC_IN_DBG_MASTER no_fbc_reason
drm/i915: extract FBC_MULTIPLE_PIPES check
drm/i915: move set_no_fbc_reason() call out of intel_fbc_find_crtc()
drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_dma.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 10 +- drivers/gpu/drm/i915/i915_suspend.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 16 +- drivers/gpu/drm/i915/intel_drv.h | 8 +- drivers/gpu/drm/i915/intel_fbc.c | 311 +++++++++++++++++------------------ drivers/gpu/drm/i915/intel_pm.c | 4 +- 8 files changed, 173 insertions(+), 182 deletions(-)
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/6 drm/i915: move FBC vfuncs to struct i915_fbc
From: Paulo Zanoni <[email protected]>
Because it makes more sense there, IMHO.
--- drivers/gpu/drm/i915/i915_drv.h | 7 +++--- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_fbc.c | 44 ++++++++++++++++++------------------ 3 files changed, 28 insertions(+), 27 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +4 -3
@@ -598,9 +598,6 @@ struct intel_limit;struct dpll ;struct drm_i915_display_funcs { -bool (*fbc_enabled)(struct drm_device *dev); -void (*enable_fbc)(struct drm_crtc *crtc); -void (*disable_fbc)(struct drm_device *dev);int (*get_display_clock_speed)(struct drm_device *dev);int (*get_fifo_size)(struct drm_device *dev,int plane);/**
@@ -939,6 +936,10 @@ struct i915_fbc {FBC_CHIP_DEFAULT ,/* disabled by default on this chip */ FBC_ROTATION ,/* rotation is not supported */ } no_fbc_reason; + +bool (*fbc_enabled)(struct drm_device *dev); +void (*enable_fbc)(struct drm_crtc *crtc); +void (*disable_fbc)(struct drm_device *dev); };/**
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -3134,8 +3134,8 @@ intel_pipe_set_base_atomic(struct drm_crtc *crtc, struct drm_framebuffer *fb,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv = dev->dev_private; -if (dev_priv->display.disable_fbc) - dev_priv->display.disable_fbc (dev); +if (dev_priv->fbc.disable_fbc) + dev_priv->fbc.disable_fbc (dev); dev_priv->display.update_primary_plane (crtc, fb, x, y);
drivers/gpu/drm/i915/intel_fbc.c +22 -22
110 lines not on this page · raw message
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/6 drm/i915: use dev_priv for the FBC functions
In reply to Paulo ZanoniFrom: Paulo Zanoni <[email protected]>
Because the cool kids use dev_priv and FBC wants to be cool too.
We've been historically using struct drm_device on the FBC function arguments, but we only really need it for intel_vgpu_active(): we can use dev_priv everywhere else. So let's fully switch to dev_priv since I'm getting tired of adding "struct drm_device *dev = dev_priv->dev" everywhere.
If I get a NACK here I'll propose the opposite: convert all the functions that currently take dev_priv to take dev.
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_dma.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_suspend.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 14 ++-- drivers/gpu/drm/i915/intel_drv.h | 8 +- drivers/gpu/drm/i915/intel_fbc.c | 154 ++++++++++++++--------------------- drivers/gpu/drm/i915/intel_pm.c | 4 +- 8 files changed, 80 insertions(+), 110 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -1635,7 +1635,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused)intel_runtime_pm_get (dev_priv);mutex_lock (&dev_priv->fbc.lock); -if (intel_fbc_enabled (dev)) +if (intel_fbc_enabled (dev_priv))seq_puts (m,"FBC enabled\n" );else seq_printf(m, "FBC disabled: %s\n",
drivers/gpu/drm/i915/i915_dma.c +1 -1
@@ -1123,7 +1123,7 @@ int i915_driver_unload(struct drm_device *dev)i915_gem_cleanup_ringbuffer (dev);i915_gem_context_fini (dev);mutex_unlock (&dev->struct_mutex); -intel_fbc_cleanup_cfb (dev); +intel_fbc_cleanup_cfb (dev_priv);i915_gem_cleanup_stolen (dev);intel_csr_ucode_fini (dev);
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -937,9 +937,9 @@ struct i915_fbc {FBC_ROTATION ,/* rotation is not supported */ } no_fbc_reason; -bool (*fbc_enabled)(struct drm_device *dev); +bool (*fbc_enabled)(struct drm_i915_private *dev_priv);void (*enable_fbc)(struct drm_crtc *crtc); -void (*disable_fbc)(struct drm_device *dev); +void (*disable_fbc)(struct drm_i915_private *dev_priv); };/**
drivers/gpu/drm/i915/i915_suspend.c +1 -1
@@ -92,7 +92,7 @@ static void i915_restore_display(struct drm_device *dev) }/* only restore FBC info on the platform that supports FBC*/ -intel_fbc_disable (dev); +intel_fbc_disable (dev_priv);/* restore FBC interval */ if (HAS_FBC (dev) &&INTEL_INFO (dev)->gen <=4 && !IS_G4X (dev))
drivers/gpu/drm/i915/intel_display.c +8 -6
@@ -3135,7 +3135,7 @@ intel_pipe_set_base_atomic(struct drm_crtc *crtc, struct drm_framebuffer *fb,struct drm_i915_private *dev_priv = dev->dev_private;if (dev_priv->fbc.disable_fbc) - dev_priv->fbc.disable_fbc (dev); + dev_priv->fbc.disable_fbc (dev_priv); dev_priv->display.update_primary_plane (crtc, fb, x, y);
@@ -4734,6 +4734,7 @@ static void intel_post_plane_update(struct intel_crtc *crtc) {struct intel_crtc_atomic_commit *atomic = &crtc->atomic;struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private;struct drm_plane *plane;if (atomic->wait_vblank)
@@ -4748,7 +4749,7 @@ static void intel_post_plane_update(struct intel_crtc *crtc)intel_update_watermarks (&crtc->base);if (atomic->update_fbc) -intel_fbc_update (dev); +intel_fbc_update (dev_priv);if (atomic->post_enable_primary)intel_post_enable_primary (&crtc->base);
@@ -10688,13 +10689,14 @@ static void intel_unpin_work_fn(struct work_struct *__work) container_of(__work, struct intel_unpin_work, work);struct intel_crtc *crtc =to_intel_crtc (work->crtc);struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private;struct drm_plane *primary = crtc->base.primary;mutex_lock (&dev->struct_mutex);intel_unpin_fb_obj (work->old_fb, primary->state);drm_gem_object_unreference (&work->pending_flip_obj->base); -intel_fbc_update (dev); +intel_fbc_update (dev_priv);if (work->flip_queued_req)i915_gem_request_assign (&work->flip_queued_req,NULL );
@@ -11469,7 +11471,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, to_intel_plane(primary)->frontbuffer_bit);mutex_unlock (&dev->struct_mutex); -intel_fbc_disable (dev); +intel_fbc_disable (dev_priv);intel_frontbuffer_flip_prepare (dev,to_intel_plane (primary)->frontbuffer_bit);
@@ -15045,7 +15047,7 @@ void intel_modeset_init(struct drm_device *dev)intel_setup_outputs (dev);/* Just in case the BIOS is doing something questionable. */ -intel_fbc_disable (dev); +intel_fbc_disable (dev_priv);drm_modeset_lock_all (dev);intel_modeset_setup_hw_state (dev, false);
@@ -15599,7 +15601,7 @@ void intel_modeset_cleanup(struct drm_device *dev)intel_unregister_dsm_handler (); -intel_fbc_disable (dev); +intel_fbc_disable (dev_priv);/* flush any delayed tasks or pending work */ flush_scheduled_work ();
drivers/gpu/drm/i915/intel_drv.h +4 -4
@@ -1248,10 +1248,10 @@ static inline void intel_fbdev_restore_mode(struct drm_device *dev)#endif /* intel_fbc.c */ -bool intel_fbc_enabled (struct drm_device *dev); -void intel_fbc_update (struct drm_device *dev); +bool intel_fbc_enabled (struct drm_i915_private *dev_priv); +void intel_fbc_update (struct drm_i915_private *dev_priv);void intel_fbc_init (struct drm_i915_private *dev_priv); -void intel_fbc_disable (struct drm_device *dev); +void intel_fbc_disable (struct drm_i915_private *dev_priv);void intel_fbc_disable_crtc (struct intel_crtc *crtc); void intel_fbc_invalidate(struct drm_i915_private *dev_priv, unsigned int frontbuffer_bits,
@@ -1259,7 +1259,7 @@ void intel_fbc_invalidate(struct drm_i915_private *dev_priv,void intel_fbc_flush (struct drm_i915_private *dev_priv,unsigned int frontbuffer_bits);const char *intel_no_fbc_reason_str (enum no_fbc_reason reason); -void intel_fbc_cleanup_cfb (struct drm_device *dev); +void intel_fbc_cleanup_cfb (struct drm_i915_private *dev_priv);/* intel_hdmi.c */ void intel_hdmi_init (struct drm_device *dev,int hdmi_reg,enum port port);
drivers/gpu/drm/i915/intel_fbc.c +60 -94
482 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.c +3 -1
@@ -2479,6 +2479,7 @@ static void ilk_wm_merge(struct drm_device *dev,const struct ilk_wm_maximums *max, struct intel_pipe_wm *merged) { + struct drm_i915_private *dev_priv = dev->dev_private;int level, max_level =ilk_wm_max_level (dev);int last_enabled_level = max_level;
@@ -2519,7 +2520,8 @@ static void ilk_wm_merge(struct drm_device *dev,* What we should check here is whether FBC can be * enabled sometime later. */ -if (IS_GEN5 (dev) && !merged->fbc_wm_enabled &&intel_fbc_enabled (dev)) { +if (IS_GEN5 (dev) && !merged->fbc_wm_enabled && +intel_fbc_enabled (dev_priv)) {for (level =2 ; level <= max_level; level++) {struct intel_wm_level *wm = &merged->wm[level];
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/6] drm/i915: use dev_priv for the FBC functions
Quoted 6 lines · Paulo Zanoni
From: Paulo Zanoni <[email protected]>
Because the cool kids use
dev_privand FBC wants to be cool too.We've been historically using struct
drm_deviceon the FBC function arguments, but we only really need it forintel_vgpu_active():
static inline bool intel_vgpu_active(struct drm_device *dev)
{
return to_i915(dev)->vgpu.active;
}Hah! Just out of scope for this patch. Or you could do a quick
#define intel_vgpu_active(P) (__I915__(P)->vgpu->active)
and then magically use dev_priv as convenient.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/6 drm/i915: use intel_crtc for the FBC functions
In reply to Paulo ZanoniFrom: Paulo Zanoni <[email protected]>
This is all internal i915.ko work, let's start using intel_crtc for everything.
--- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/intel_fbc.c | 79 +++++++++++++++++++--------------------- 2 files changed, 40 insertions(+), 43 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -918,7 +918,7 @@ struct i915_fbc {struct intel_fbc_work {struct delayed_work work; -struct drm_crtc *crtc; +struct intel_crtc *crtc;struct drm_framebuffer *fb; } *fbc_work;
@@ -938,7 +938,7 @@ struct i915_fbc { } no_fbc_reason;bool (*fbc_enabled)(struct drm_i915_private *dev_priv); -void (*enable_fbc)(struct drm_crtc *crtc); +void (*enable_fbc)(struct intel_crtc *crtc);void (*disable_fbc)(struct drm_i915_private *dev_priv); };
drivers/gpu/drm/i915/intel_fbc.c +38 -41
219 lines not on this page · raw message
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/6 drm/i915: add FBC_IN_DBG_MASTER no_fbc_reason
In reply to Paulo ZanoniFrom: Paulo Zanoni <[email protected]>
The poor in_dbg_master() check was the only one without a reason string. Give it a reason string so it won't feel excluded.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_fbc.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -935,6 +935,7 @@ struct i915_fbc {FBC_MODULE_PARAM ,FBC_CHIP_DEFAULT ,/* disabled by default on this chip */ FBC_ROTATION ,/* rotation is not supported */ +FBC_IN_DBG_MASTER ,/* kernel debugger is active */ } no_fbc_reason;bool (*fbc_enabled)(struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_fbc.c +5 -1
@@ -471,6 +471,8 @@ const char *intel_no_fbc_reason_str(enum no_fbc_reason reason)return "disabled per chip default" ;case FBC_ROTATION :return "rotation unsupported" ; +case FBC_IN_DBG_MASTER : +return "Kernel debugger is active" ;default :MISSING_CASE (reason);return "unknown reason" ;
@@ -755,8 +757,10 @@ static void __intel_fbc_update(struct drm_i915_private *dev_priv) }/* If the kernel debugger is active, always disable compression */ -if (in_dbg_master ()) +if (in_dbg_master ()) { +set_no_fbc_reason (dev_priv,FBC_IN_DBG_MASTER ); goto out_disable; + }if (intel_fbc_setup_cfb (dev_priv, obj->base.size,drm_format_plane_cpp (fb->pixel_format,0 ))) {
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/6] drm/i915: add FBC_IN_DBG_MASTER no_fbc_reason
Quoted 16 lines · Paulo Zanoni
From: Paulo Zanoni <[email protected]>
The poor
in_dbg_master()check was the only one without a reason string. Give it a reason string so it won't feel excluded.Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_fbc.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +0
-0
drivers/gpu/drm/i915/i915_drv.h struct i915_fbc { · line 938
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -935,6 +935,7 @@ struct i915_fbc {FBC_MODULE_PARAM ,FBC_CHIP_DEFAULT ,/* disabled by default on this chip */ FBC_ROTATION ,/* rotation is not supported */ + FBC_IN_DBG_MASTER, /* kernel debugger is active */
Oh dear this is dead code. kdbg uses the fbcon, which always uses untiled, which means fbc will never be enabled. Also we have 0 users and 0 test coverage for kdbg on top of i915 (Jesse implemented it for fun years back). Imo just remove all this code.
-Daniel
Quoted 35 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0} no_fbc_reason;bool (*fbc_enabled)(struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/intel_fbc.c +5
-1@@ -471,6 +471,8 @@ const char *intel_no_fbc_reason_str(enum no_fbc_reason reason)return "disabled per chip default" ;case FBC_ROTATION :return "rotation unsupported" ; +case FBC_IN_DBG_MASTER : +return "Kernel debugger is active" ;default :MISSING_CASE (reason);return "unknown reason" ;@@ -755,8 +757,10 @@ static void __intel_fbc_update(struct drm_i915_private *dev_priv) }/* If the kernel debugger is active, always disable compression */ -if (in_dbg_master ()) +if (in_dbg_master ()) { +set_no_fbc_reason (dev_priv,FBC_IN_DBG_MASTER ); goto out_disable; + }if (intel_fbc_setup_cfb (dev_priv, obj->base.size,drm_format_plane_cpp (fb->pixel_format,0 ))) {Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/6] drm/i915: add FBC_IN_DBG_MASTER no_fbc_reason
Quoted 12 lines · Daniel Vetter
Quoted 11 lines · Paulo Zanoni
From: Paulo Zanoni <[email protected]>
The poor
in_dbg_master()check was the only one without a reason string. Give it a reason string so it won't feel excluded.Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_fbc.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-)
Quoted 14 lines
drivers/gpu/drm/i915/i915_drv.h struct i915_fbc { · line 938
Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -935,6 +935,7 @@ struct i915_fbc {FBC_MODULE_PARAM ,FBC_CHIP_DEFAULT ,/* disabled by default on this chip */ FBC_ROTATION ,/* rotation is not supported */ + FBC_IN_DBG_MASTER, /* kernel debugger is active */Oh dear this is dead code. kdbg uses the fbcon, which always uses untiled, which means fbc will never be enabled. Also we have 0 users and 0 test coverage for kdbg on top of i915 (Jesse implemented it for fun years back). Imo just remove all this code.
A good kdbg integration would allow us to do allsorts of kprobes debugging and igt fun. Ok, we could probably use kprobes...
* hatches evil plan to learn kprobes
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/6 drm/i915: extract FBC_MULTIPLE_PIPES check
In reply to Paulo ZanoniFrom: Paulo Zanoni <[email protected]>
I have two separate refactor ideas that require extracting this to a separate function. I'm not sure which idea I'll end choosing, but since both will require extracting this function, let's do this now.
Notice that this is just code moving. Any possible problems with the current multiple pipes check should be fixed in later commits.
--- drivers/gpu/drm/i915/intel_fbc.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_fbc.c +27 -9
@@ -493,24 +493,17 @@ static struct drm_crtc *intel_fbc_find_crtc(struct drm_i915_private *dev_priv) {struct drm_crtc *crtc =NULL , *tmp_crtc;enum pipe pipe; -bool pipe_a_only = false, one_pipe_only = false; +bool pipe_a_only = false;if (IS_HASWELL (dev_priv) ||INTEL_INFO (dev_priv)->gen >=8 ) pipe_a_only = true; -else if (INTEL_INFO (dev_priv)->gen <=4 ) - one_pipe_only = true;for_each_pipe (dev_priv, pipe) { tmp_crtc = dev_priv->pipe_to_crtc_mapping[pipe];if (intel_crtc_active (tmp_crtc) && -to_intel_plane_state (tmp_crtc->primary->state)->visible) { -if (one_pipe_only && crtc) { -set_no_fbc_reason (dev_priv,FBC_MULTIPLE_PIPES ); -return NULL ; - } +to_intel_plane_state (tmp_crtc->primary->state)->visible) crtc = tmp_crtc; - }if (pipe_a_only)break ;
@@ -524,6 +517,26 @@ static struct drm_crtc *intel_fbc_find_crtc(struct drm_i915_private *dev_priv)return crtc; } +static bool multiple_pipes_ok (struct drm_i915_private *dev_priv) +{ +enum pipe pipe; +int n_pipes =0 ; +struct drm_crtc *crtc; + +if (INTEL_INFO (dev_priv)->gen >4 ) +return true; + +for_each_pipe (dev_priv, pipe) { + crtc = dev_priv->pipe_to_crtc_mapping[pipe]; + +if (intel_crtc_active (crtc) && +to_intel_plane_state (crtc->primary->state)->visible) + n_pipes++; + } + +return (n_pipes <2 ); +} + static int find_compression_threshold(struct drm_i915_private *dev_priv, struct drm_mm_node *node, int size,
@@ -710,6 +723,11 @@ static void __intel_fbc_update(struct drm_i915_private *dev_priv)if (!crtc) goto out_disable; +if (!multiple_pipes_ok (dev_priv)) { +set_no_fbc_reason (dev_priv,FBC_MULTIPLE_PIPES ); + goto out_disable; + } + intel_crtc =to_intel_crtc (crtc); fb = crtc->primary->fb; obj =intel_fb_obj (fb);
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/6 drm/i915: move set_no_fbc_reason() call out of intel_fbc_find_crtc()
In reply to Paulo ZanoniFrom: Paulo Zanoni <[email protected]>
So now all the calls are inside __intel_fbc_update(). Consistency!
--- drivers/gpu/drm/i915/intel_fbc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_fbc.c +4 -4
@@ -509,10 +509,8 @@ static struct drm_crtc *intel_fbc_find_crtc(struct drm_i915_private *dev_priv)break ; } -if (!crtc || crtc->primary->fb ==NULL ) { -set_no_fbc_reason (dev_priv,FBC_NO_OUTPUT ); +if (!crtc || crtc->primary->fb ==NULL )return NULL ; - }return crtc; }
@@ -720,8 +718,10 @@ static void __intel_fbc_update(struct drm_i915_private *dev_priv)* - going to an unsupported config (interlace, pixel multiply, etc.) */ crtc =intel_fbc_find_crtc (dev_priv); -if (!crtc) +if (!crtc) { +set_no_fbc_reason (dev_priv,FBC_NO_OUTPUT ); goto out_disable; + }if (!multiple_pipes_ok (dev_priv)) {set_no_fbc_reason (dev_priv,FBC_MULTIPLE_PIPES );
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Paulo Zanoni
From: Paulo Zanoni <[email protected]>
Before I continue sending fixes, let's just do some small adjustments to the codebase. I really think these changes make the code better to work with, but maybe not everybody agrees. Let's find out :)
Quoted 7 lines
Paulo Zanoni (6):
drm/i915: move FBC vfuncs to structi915_fbc
drm/i915: usedev_privfor the FBC functions
drm/i915: useintel_crtcfor the FBC functions
drm/i915: addFBC_IN_DBG_MASTERno_fbc_reason
drm/i915: extractFBC_MULTIPLE_PIPEScheck
drm/i915: moveset_no_fbc_reason()call out ofintel_fbc_find_crtc()
Bikeshed to your bikeshed on 2, don't be chicken :-p -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 15 lines · Chris Wilson
Quoted 6 lines · Paulo Zanoni
From: Paulo Zanoni <[email protected]>
Before I continue sending fixes, let's just do some small adjustments to the codebase. I really think these changes make the code better to work with, but maybe not everybody agrees. Let's find out :)
Quoted 7 lines
Paulo Zanoni (6):
drm/i915: move FBC vfuncs to structi915_fbc
drm/i915: usedev_privfor the FBC functions
drm/i915: useintel_crtcfor the FBC functions
drm/i915: addFBC_IN_DBG_MASTERno_fbc_reason
drm/i915: extractFBC_MULTIPLE_PIPEScheck
drm/i915: moveset_no_fbc_reason()call out ofintel_fbc_find_crtc()
Quoted 1 line
Reviewed-by Chris Wilson <[email protected]>
All applied to dinq, thanks.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx