Commit b20d2752 authored by Paulo Zanoni's avatar Paulo Zanoni

drm/i915/fbc: don't store the fb_id on reg_params

We don't actually use fb_id anywhere. We already compare all
parameters that matter to the hardware: pixel format, stride,
fence_reg and ggtt_offset. The ID shouldn't make a difference.

Besides, we already update the FBC data at every modeset/flip, so this
can't change behind our backs.
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453210558-7875-23-git-send-email-paulo.r.zanoni@intel.com
parent 913a3a6a
...@@ -933,7 +933,6 @@ struct intel_fbc { ...@@ -933,7 +933,6 @@ struct intel_fbc {
struct { struct {
u64 ilk_ggtt_offset; u64 ilk_ggtt_offset;
uint32_t id;
uint32_t pixel_format; uint32_t pixel_format;
unsigned int stride; unsigned int stride;
int fence_reg; int fence_reg;
...@@ -950,7 +949,6 @@ struct intel_fbc { ...@@ -950,7 +949,6 @@ struct intel_fbc {
struct { struct {
u64 ggtt_offset; u64 ggtt_offset;
uint32_t id;
uint32_t pixel_format; uint32_t pixel_format;
unsigned int stride; unsigned int stride;
int fence_reg; int fence_reg;
......
...@@ -735,7 +735,6 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc) ...@@ -735,7 +735,6 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc)
* platforms that need. */ * platforms that need. */
if (dev_priv->fbc.activate == ilk_fbc_activate) if (dev_priv->fbc.activate == ilk_fbc_activate)
cache->fb.ilk_ggtt_offset = i915_gem_obj_ggtt_offset(obj); cache->fb.ilk_ggtt_offset = i915_gem_obj_ggtt_offset(obj);
cache->fb.id = fb->base.id;
cache->fb.pixel_format = fb->pixel_format; cache->fb.pixel_format = fb->pixel_format;
cache->fb.stride = fb->pitches[0]; cache->fb.stride = fb->pitches[0];
cache->fb.fence_reg = obj->fence_reg; cache->fb.fence_reg = obj->fence_reg;
...@@ -858,7 +857,6 @@ static void intel_fbc_get_reg_params(struct intel_crtc *crtc, ...@@ -858,7 +857,6 @@ static void intel_fbc_get_reg_params(struct intel_crtc *crtc,
params->crtc.plane = crtc->plane; params->crtc.plane = crtc->plane;
params->crtc.fence_y_offset = get_crtc_fence_y_offset(crtc); params->crtc.fence_y_offset = get_crtc_fence_y_offset(crtc);
params->fb.id = cache->fb.id;
params->fb.pixel_format = cache->fb.pixel_format; params->fb.pixel_format = cache->fb.pixel_format;
params->fb.stride = cache->fb.stride; params->fb.stride = cache->fb.stride;
params->fb.fence_reg = cache->fb.fence_reg; params->fb.fence_reg = cache->fb.fence_reg;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment