From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: Re: [PATCH 5/7] radeon: move blit functions to radeon_asic.h Date: Mon, 29 Nov 2010 10:37:35 -0500 Message-ID: References: <1290967575-22705-1-git-send-email-daniel.vetter@ffwll.ch> <1290967575-22705-6-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-yx0-f177.google.com (mail-yx0-f177.google.com [209.85.213.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 152E69E9E2 for ; Mon, 29 Nov 2010 07:37:36 -0800 (PST) Received: by yxm34 with SMTP id 34so2282750yxm.36 for ; Mon, 29 Nov 2010 07:37:36 -0800 (PST) In-Reply-To: <1290967575-22705-6-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Daniel Vetter Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Sun, Nov 28, 2010 at 1:06 PM, Daniel Vetter wro= te: > Signed-off-by: Daniel Vetter Reviewed-by: Alex Deucher > --- > =A0drivers/gpu/drm/radeon/radeon.h =A0 =A0 =A0| =A0 13 ------------- > =A0drivers/gpu/drm/radeon/radeon_asic.h | =A0 13 +++++++++++++ > =A02 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/rad= eon.h > index 5fff6bf..942f5f2 100644 > --- a/drivers/gpu/drm/radeon/radeon.h > +++ b/drivers/gpu/drm/radeon/radeon.h > @@ -1182,19 +1182,6 @@ int radeon_device_init(struct radeon_device *rdev, > =A0void radeon_device_fini(struct radeon_device *rdev); > =A0int radeon_gpu_wait_for_idle(struct radeon_device *rdev); > > -/* r600 blit */ > -int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes); > -void r600_blit_done_copy(struct radeon_device *rdev, struct radeon_fence= *fence); > -void r600_kms_blit_copy(struct radeon_device *rdev, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 u64 src_gpu_addr, u64 dst_g= pu_addr, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 int size_bytes); > -/* evergreen blit */ > -int evergreen_blit_prepare_copy(struct radeon_device *rdev, int size_byt= es); > -void evergreen_blit_done_copy(struct radeon_device *rdev, struct radeon_= fence *fence); > -void evergreen_kms_blit_copy(struct radeon_device *rdev, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0u64 src_gpu_addr= , u64 dst_gpu_addr, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0int size_bytes); > - > =A0static inline uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32= _t reg) > =A0{ > =A0 =A0 =A0 =A0if (reg < rdev->rmmio_size) > diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeo= n/radeon_asic.h > index c7cbba3..8e75be1 100644 > --- a/drivers/gpu/drm/radeon/radeon_asic.h > +++ b/drivers/gpu/drm/radeon/radeon_asic.h > @@ -359,6 +359,12 @@ void r600_audio_fini(struct radeon_device *rdev); > =A0void r600_hdmi_init(struct drm_encoder *encoder); > =A0int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder); > =A0void r600_hdmi_update_audio_settings(struct drm_encoder *encoder); > +/* r600 blit */ > +int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes); > +void r600_blit_done_copy(struct radeon_device *rdev, struct radeon_fence= *fence); > +void r600_kms_blit_copy(struct radeon_device *rdev, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 u64 src_gpu_addr, u64 dst_g= pu_addr, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 int size_bytes); > > =A0/* > =A0* rv770,rv730,rv710,rv740 > @@ -411,5 +417,12 @@ void evergreen_post_page_flip(struct radeon_device *= rdev, int crtc); > =A0void evergreen_disable_interrupt_state(struct radeon_device *rdev); > =A0int evergreen_blit_init(struct radeon_device *rdev); > =A0void evergreen_blit_fini(struct radeon_device *rdev); > +/* evergreen blit */ > +int evergreen_blit_prepare_copy(struct radeon_device *rdev, int size_byt= es); > +void evergreen_blit_done_copy(struct radeon_device *rdev, struct radeon_= fence *fence); > +void evergreen_kms_blit_copy(struct radeon_device *rdev, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0u64 src_gpu_addr= , u64 dst_gpu_addr, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0int size_bytes); > + > > =A0#endif > -- > 1.7.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel >