xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915/lspcon: Get DDC adapter via container_of() instead of cached ptr

Browse Source 
We can use the container_of() magic to get to the DDC adapter, so no
need for caching a pointer to it. We'll also need to get at the intel_dp
ptr in the following patch, so add a helper that can be used for both
purposes.

Cc: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1477326811-30431-8-git-send-email-imre.deak@intel.com
This commit is contained in:
Imre Deak
2016-10-24 19:33:30 +03:00
parent 12a47a4228
commit a5d94b83ec
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/i915/intel_drv.h
View File

@@ -974,7 +974,6 @@ struct intel_dp {
struct intel_lspcon { struct intel_lspcon {
bool active; bool active;
enum drm_lspcon_mode mode; enum drm_lspcon_mode mode;
struct drm_dp_aux *aux;
}; };
struct intel_digital_port { struct intel_digital_port {

15
drivers/gpu/drm/i915/intel_lspcon.c
View File

@@ -27,10 +27,18 @@
#include <drm/drm_dp_dual_mode_helper.h> #include <drm/drm_dp_dual_mode_helper.h>
#include "intel_drv.h" #include "intel_drv.h"
static struct intel_dp *lspcon_to_intel_dp(struct intel_lspcon *lspcon)
{
struct intel_digital_port *dig_port =
container_of(lspcon, struct intel_digital_port, lspcon);
return &dig_port->dp;
}
static enum drm_lspcon_mode lspcon_get_current_mode(struct intel_lspcon *lspcon) static enum drm_lspcon_mode lspcon_get_current_mode(struct intel_lspcon *lspcon)
{ {
enum drm_lspcon_mode current_mode = DRM_LSPCON_MODE_INVALID; enum drm_lspcon_mode current_mode = DRM_LSPCON_MODE_INVALID;
struct i2c_adapter *adapter = &lspcon->aux->ddc; struct i2c_adapter *adapter = &lspcon_to_intel_dp(lspcon)->aux.ddc;
if (drm_lspcon_get_mode(adapter, &current_mode)) if (drm_lspcon_get_mode(adapter, &current_mode))
DRM_ERROR("Error reading LSPCON mode\n"); DRM_ERROR("Error reading LSPCON mode\n");
@@ -45,7 +53,7 @@ static int lspcon_change_mode(struct intel_lspcon *lspcon,
{ {
int err; int err;
enum drm_lspcon_mode current_mode; enum drm_lspcon_mode current_mode;
struct i2c_adapter *adapter = &lspcon->aux->ddc; struct i2c_adapter *adapter = &lspcon_to_intel_dp(lspcon)->aux.ddc;
err = drm_lspcon_get_mode(adapter, &current_mode); err = drm_lspcon_get_mode(adapter, &current_mode);
if (err) { if (err) {
@@ -72,7 +80,7 @@ static int lspcon_change_mode(struct intel_lspcon *lspcon,
static bool lspcon_probe(struct intel_lspcon *lspcon) static bool lspcon_probe(struct intel_lspcon *lspcon)
{ {
enum drm_dp_dual_mode_type adaptor_type; enum drm_dp_dual_mode_type adaptor_type;
struct i2c_adapter *adapter = &lspcon->aux->ddc; struct i2c_adapter *adapter = &lspcon_to_intel_dp(lspcon)->aux.ddc;
/* Lets probe the adaptor and check its type */ /* Lets probe the adaptor and check its type */
adaptor_type = drm_dp_dual_mode_detect(adapter); adaptor_type = drm_dp_dual_mode_detect(adapter);
@@ -111,7 +119,6 @@ bool lspcon_init(struct intel_digital_port *intel_dig_port)
lspcon->active = false; lspcon->active = false;
lspcon->mode = DRM_LSPCON_MODE_INVALID; lspcon->mode = DRM_LSPCON_MODE_INVALID;
lspcon->aux = &dp->aux;
if (!lspcon_probe(lspcon)) { if (!lspcon_probe(lspcon)) {
DRM_ERROR("Failed to probe lspcon\n"); DRM_ERROR("Failed to probe lspcon\n");