UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amdgpu: rename static functions in amdgpu_display.c 

Add display to the name for consistency.

Signed-off-by: Samuel Li <Samuel.Li@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Samuel Li 2018-01-18 17:47:29 -05:00 committed by Alex Deucher
parent 2ee150cda7
commit 3a05dc000a
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
View File

@ -37,7 +37,8 @@
#include <drm/drm_edid.h> #include <drm/drm_edid.h>
#include <drm/drm_fb_helper.h> #include <drm/drm_fb_helper.h>
static void amdgpu_flip_callback(struct dma_fence *f, struct dma_fence_cb *cb) static void amdgpu_display_flip_callback(struct dma_fence *f,
struct dma_fence_cb *cb)
{ {
struct amdgpu_flip_work *work = struct amdgpu_flip_work *work =
container_of(cb, struct amdgpu_flip_work, cb); container_of(cb, struct amdgpu_flip_work, cb);
@ -46,8 +47,8 @@ static void amdgpu_flip_callback(struct dma_fence *f, struct dma_fence_cb *cb)
schedule_work(&work->flip_work.work); schedule_work(&work->flip_work.work);
} }
static bool amdgpu_flip_handle_fence(struct amdgpu_flip_work *work, static bool amdgpu_display_flip_handle_fence(struct amdgpu_flip_work *work,
struct dma_fence **f) struct dma_fence **f)
{ {
struct dma_fence *fence= *f; struct dma_fence *fence= *f;
@ -56,14 +57,15 @@ static bool amdgpu_flip_handle_fence(struct amdgpu_flip_work *work,
*f = NULL; *f = NULL;
if (!dma_fence_add_callback(fence, &work->cb, amdgpu_flip_callback)) if (!dma_fence_add_callback(fence, &work->cb,
amdgpu_display_flip_callback))
return true; return true;
dma_fence_put(fence); dma_fence_put(fence);
return false; return false;
} }
static void amdgpu_flip_work_func(struct work_struct *__work) static void amdgpu_display_flip_work_func(struct work_struct *__work)
{ {
struct delayed_work *delayed_work = struct delayed_work *delayed_work =
container_of(__work, struct delayed_work, work); container_of(__work, struct delayed_work, work);
@ -77,11 +79,11 @@ static void amdgpu_flip_work_func(struct work_struct *__work)
unsigned i; unsigned i;
int vpos, hpos; int vpos, hpos;
if (amdgpu_flip_handle_fence(work, &work->excl)) if (amdgpu_display_flip_handle_fence(work, &work->excl))
return; return;
for (i = 0; i < work->shared_count; ++i) for (i = 0; i < work->shared_count; ++i)
if (amdgpu_flip_handle_fence(work, &work->shared[i])) if (amdgpu_display_flip_handle_fence(work, &work->shared[i]))
return; return;
/* Wait until we're out of the vertical blank period before the one /* Wait until we're out of the vertical blank period before the one
@ -118,7 +120,7 @@ static void amdgpu_flip_work_func(struct work_struct *__work)
/* /*
* Handle unpin events outside the interrupt handler proper. * Handle unpin events outside the interrupt handler proper.
*/ */
static void amdgpu_unpin_work_func(struct work_struct *__work) static void amdgpu_display_unpin_work_func(struct work_struct *__work)
{ {
struct amdgpu_flip_work *work = struct amdgpu_flip_work *work =
container_of(__work, struct amdgpu_flip_work, unpin_work); container_of(__work, struct amdgpu_flip_work, unpin_work);
@ -163,8 +165,8 @@ int amdgpu_crtc_page_flip_target(struct drm_crtc *crtc,
if (work == NULL) if (work == NULL)
return -ENOMEM; return -ENOMEM;
INIT_DELAYED_WORK(&work->flip_work, amdgpu_flip_work_func); INIT_DELAYED_WORK(&work->flip_work, amdgpu_display_flip_work_func);
INIT_WORK(&work->unpin_work, amdgpu_unpin_work_func); INIT_WORK(&work->unpin_work, amdgpu_display_unpin_work_func);
work->event = event; work->event = event;
work->adev = adev; work->adev = adev;
@ -229,7 +231,7 @@ int amdgpu_crtc_page_flip_target(struct drm_crtc *crtc,
/* update crtc fb */ /* update crtc fb */
crtc->primary->fb = fb; crtc->primary->fb = fb;
spin_unlock_irqrestore(&crtc->dev->event_lock, flags); spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
amdgpu_flip_work_func(&work->flip_work.work); amdgpu_display_flip_work_func(&work->flip_work.work);
return 0; return 0;
pflip_cleanup: pflip_cleanup:
@ -480,7 +482,7 @@ bool amdgpu_ddc_probe(struct amdgpu_connector *amdgpu_connector,
return true; return true;
} }
static void amdgpu_user_framebuffer_destroy(struct drm_framebuffer *fb) static void amdgpu_display_user_framebuffer_destroy(struct drm_framebuffer *fb)
{ {
struct amdgpu_framebuffer *amdgpu_fb = to_amdgpu_framebuffer(fb); struct amdgpu_framebuffer *amdgpu_fb = to_amdgpu_framebuffer(fb);
@ -489,9 +491,10 @@ static void amdgpu_user_framebuffer_destroy(struct drm_framebuffer *fb)
kfree(amdgpu_fb); kfree(amdgpu_fb);
} }
static int amdgpu_user_framebuffer_create_handle(struct drm_framebuffer *fb, static int amdgpu_display_user_framebuffer_create_handle(
struct drm_file *file_priv, struct drm_framebuffer *fb,
unsigned int *handle) struct drm_file *file_priv,
unsigned int *handle)
{ {
struct amdgpu_framebuffer *amdgpu_fb = to_amdgpu_framebuffer(fb); struct amdgpu_framebuffer *amdgpu_fb = to_amdgpu_framebuffer(fb);
@ -499,8 +502,8 @@ static int amdgpu_user_framebuffer_create_handle(struct drm_framebuffer *fb,
} }
static const struct drm_framebuffer_funcs amdgpu_fb_funcs = { static const struct drm_framebuffer_funcs amdgpu_fb_funcs = {
.destroy = amdgpu_user_framebuffer_destroy, .destroy = amdgpu_display_user_framebuffer_destroy,
.create_handle = amdgpu_user_framebuffer_create_handle, .create_handle = amdgpu_display_user_framebuffer_create_handle,
}; };
uint32_t amdgpu_display_framebuffer_domains(struct amdgpu_device *adev) uint32_t amdgpu_display_framebuffer_domains(struct amdgpu_device *adev)
@ -654,7 +657,7 @@ void amdgpu_update_display_priority(struct amdgpu_device *adev)
} }
static bool is_hdtv_mode(const struct drm_display_mode *mode) static bool amdgpu_display_is_hdtv_mode(const struct drm_display_mode *mode)
{ {
/* try and guess if this is a tv or a monitor */ /* try and guess if this is a tv or a monitor */
if ((mode->vdisplay == 480 && mode->hdisplay == 720) || /* 480p */ if ((mode->vdisplay == 480 && mode->hdisplay == 720) || /* 480p */
@ -711,7 +714,7 @@ bool amdgpu_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
((amdgpu_encoder->underscan_type == UNDERSCAN_ON) || ((amdgpu_encoder->underscan_type == UNDERSCAN_ON) ||
((amdgpu_encoder->underscan_type == UNDERSCAN_AUTO) && ((amdgpu_encoder->underscan_type == UNDERSCAN_AUTO) &&
drm_detect_hdmi_monitor(amdgpu_connector_edid(connector)) && drm_detect_hdmi_monitor(amdgpu_connector_edid(connector)) &&
is_hdtv_mode(mode)))) { amdgpu_display_is_hdtv_mode(mode)))) {
if (amdgpu_encoder->underscan_hborder != 0) if (amdgpu_encoder->underscan_hborder != 0)
amdgpu_crtc->h_border = amdgpu_encoder->underscan_hborder; amdgpu_crtc->h_border = amdgpu_encoder->underscan_hborder;
else else