Skip to content

Commit

Permalink
drm/i915/fbc: don't store the fb_id on reg_params
Browse files Browse the repository at this point in the history
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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453210558-7875-23-git-send-email-paulo.r.zanoni@intel.com
  • Loading branch information
Paulo Zanoni committed Jan 29, 2016
1 parent 913a3a6 commit b20d275
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
2 changes: 0 additions & 2 deletions drivers/gpu/drm/i915/i915_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -933,7 +933,6 @@ struct intel_fbc {

struct {
u64 ilk_ggtt_offset;
uint32_t id;
uint32_t pixel_format;
unsigned int stride;
int fence_reg;
Expand All @@ -950,7 +949,6 @@ struct intel_fbc {

struct {
u64 ggtt_offset;
uint32_t id;
uint32_t pixel_format;
unsigned int stride;
int fence_reg;
Expand Down
2 changes: 0 additions & 2 deletions drivers/gpu/drm/i915/intel_fbc.c
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,6 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc)
* platforms that need. */
if (dev_priv->fbc.activate == ilk_fbc_activate)
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.stride = fb->pitches[0];
cache->fb.fence_reg = obj->fence_reg;
Expand Down Expand Up @@ -858,7 +857,6 @@ static void intel_fbc_get_reg_params(struct intel_crtc *crtc,
params->crtc.plane = crtc->plane;
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.stride = cache->fb.stride;
params->fb.fence_reg = cache->fb.fence_reg;
Expand Down

0 comments on commit b20d275

Please sign in to comment.